Jelajahi Sumber

Fix delimiter in FormBatch, ProductEdit

ProductEdit: fix generating products (works)
ProductDto add hidden fields to fullfil compatibility
Dalibor Votruba 1 tahun lalu
induk
melakukan
94b7bb66aa

+ 3 - 3
App.config

@@ -44,9 +44,6 @@
             <setting name="OutputFileMask" serializeAs="String">
                 <value>{prod_var_type}\{order_no}_{prod_name}_{ordinal}{ext}</value>
             </setting>
-            <setting name="CSVDelimiter" serializeAs="String">
-                <value>;</value>
-            </setting>
             <setting name="MapColOrderNo" serializeAs="String">
                 <value>order_no</value>
             </setting>
@@ -77,6 +74,9 @@
             <setting name="LabelTemplate" serializeAs="String">
                 <value>^^18^**Objednávka: {order_no}**^^{cr}^^14^**{prod_cat}**^^{cr}{prod_var_type}{cr}Počet: {qty}</value>
             </setting>
+            <setting name="CSVDelimiter" serializeAs="String">
+                <value>,</value>
+            </setting>
         </qdr.app.studiou.orders2printpack.Properties.AppSettings>
     </userSettings>
 </configuration>

+ 1 - 1
FormBatch.cs

@@ -396,7 +396,7 @@ namespace qdr.app.studiou.orders2printpack
                     row.SetField(_sourceColOrdinals[CS_COL_EXTERNALORDERDATE], externalOrderDate.ToFileUtcString());
                 }
                 Log($"Generuji protokol ...");
-                CsvUtils.DataTableToCsv(_fs, _source, protocolFile, ";", (column) => { return NormalizeColumnName(column); });
+                CsvUtils.DataTableToCsv(_fs, _source, protocolFile, AppSettings.Default.CSVDelimiter, (column) => { return NormalizeColumnName(column); });
                 Log($"Protokol uložen do souboru '{protocolFile}'.");
             });
         }

+ 1 - 1
FormProductEdit.Designer.cs

@@ -864,7 +864,7 @@
             Controls.Add(ssMain);
             Icon = (Icon)resources.GetObject("$this.Icon");
             Name = "FormProductEdit";
-            Text = "FormProductEdit";
+            Text = "Editor produktů";
             ssMain.ResumeLayout(false);
             ssMain.PerformLayout();
             tsMain.ResumeLayout(false);

+ 9 - 0
FormProductEdit.cs

@@ -835,6 +835,7 @@ namespace qdr.app.studiou.orders2printpack
                         parentDto.ShortDescription = new ExtendedParametrizedString(shortDescription, tplParams, "{", "}").ToString();
                         parentDto.Description = new ExtendedParametrizedString(description, tplParams, "{", "}").ToString();
                         parentDto.Uri = new ExtendedParametrizedString(urlPrefix, tplParams, "{", "}").ToString();
+                        parentDto.VariantType = "Formát";
                     }
 
                     product = _storage.AddNewProductVariant(parentDto.Sku);
@@ -845,8 +846,16 @@ namespace qdr.app.studiou.orders2printpack
                     product.Sku = sku + "_" + _hashGenerator.NewId();
                     product.Price = 0;
                     product.VariantName = variant;
+                    product.VariantType = "Formát";
                 }
                 _storage.CheckProductVariantValidity();
+
+                foreach(var product in _storage.Products.Where(x=>!x.IsVariant))
+                {
+                    var variantString = string.Join(",", _storage.Products.Where(x => string.Equals(x.ParentName, product.Sku, StringComparison.InvariantCultureIgnoreCase)).Select(x => x.VariantName));
+                    product.VariantName = variantString;
+                }
+
             });
         }
 

+ 9 - 0
ProductStorage/ProductDto.cs

@@ -45,6 +45,15 @@ namespace qdr.app.studiou.orders2printpack.ProductStorage
         [CsvColumn("Běžná cena")]
         public decimal Price { get; set; }
 
+        [CsvColumn("Vlastnost 1 viditelnost")]
+        public int Hidden1 { get; set; } = 1;
+
+        [CsvColumn("Vlastnost 1 globální")]
+        public int Hidden2 { get; set; } = 1;
+
+        [CsvColumn("Povolit zákaznické recenze?")]
+        public int Hidden3 { get; set; } = 0;
+
         public bool IsParentValid {get;set;}
         public bool IsValid => ((IsVariant && IsParentValid) || !IsVariant) && ((IsVariant && Price > 0) || !IsVariant) && !string.IsNullOrEmpty(Sku) && !string.IsNullOrEmpty(Uri) && ((!IsVariant && !string.IsNullOrEmpty(Category)) || IsVariant) && ((IsVariant && !string.IsNullOrEmpty(VariantName)) || !IsVariant);
 

+ 12 - 12
Properties/AppSettings.Designer.cs

@@ -168,18 +168,6 @@ namespace qdr.app.studiou.orders2printpack.Properties {
             }
         }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute(";")]
-        public string CSVDelimiter {
-            get {
-                return ((string)(this["CSVDelimiter"]));
-            }
-            set {
-                this["CSVDelimiter"] = value;
-            }
-        }
-        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("order_no")]
@@ -300,5 +288,17 @@ namespace qdr.app.studiou.orders2printpack.Properties {
                 this["LabelTemplate"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute(",")]
+        public string CSVDelimiter {
+            get {
+                return ((string)(this["CSVDelimiter"]));
+            }
+            set {
+                this["CSVDelimiter"] = value;
+            }
+        }
     }
 }

+ 3 - 3
Properties/AppSettings.settings

@@ -39,9 +39,6 @@
     <Setting Name="OutputFileMask" Type="System.String" Scope="User">
       <Value Profile="(Default)">{prod_var_type}\{order_no}_{prod_name}_{ordinal}{ext}</Value>
     </Setting>
-    <Setting Name="CSVDelimiter" Type="System.String" Scope="User">
-      <Value Profile="(Default)">;</Value>
-    </Setting>
     <Setting Name="MapColOrderNo" Type="System.String" Scope="User">
       <Value Profile="(Default)">order_no</Value>
     </Setting>
@@ -72,5 +69,8 @@
     <Setting Name="LabelTemplate" Type="System.String" Scope="User">
       <Value Profile="(Default)">^^18^**Objednávka: {order_no}**^^{cr}^^14^**{prod_cat}**^^{cr}{prod_var_type}{cr}Počet: {qty}</Value>
     </Setting>
+    <Setting Name="CSVDelimiter" Type="System.String" Scope="User">
+      <Value Profile="(Default)">,</Value>
+    </Setting>
   </Settings>
 </SettingsFile>