NEXT-1784 - Advanced prices for shipping

shopware · Mar 25, 2019 · 56da64a · 56da64a
1 parent 65c34cc
commit 56da64a
Show file tree

Hide file tree

Showing 33 changed files with 1,347 additions and 291 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -15,3 +15,6 @@ insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.json]
+indent_size = 2
diff --git a/...urces/administration/src/module/sw-product/view/sw-product-detail-context-prices/index.js b/...urces/administration/src/module/sw-product/view/sw-product-detail-context-prices/index.js
@@ -55,7 +55,7 @@ Component.register('sw-product-detail-context-prices', {
             const priceRuleGroups = {};
 
             this.product.priceRules.forEach((rule) => {
-                if (this.priceRuleStore.getById(rule.id).isDeleted === true) {
+                if (this.priceRuleStore.getById(rule.id).isDeleted) {
                     return;
                 }
 

diff --git a/...le/sw-product/view/sw-product-detail-context-prices/sw-product-detail-context-prices.scss b/...le/sw-product/view/sw-product-detail-context-prices/sw-product-detail-context-prices.scss
@@ -30,6 +30,7 @@
         .sw-context-button {
             .sw-button {
                 width: 100%;
+                height: 100%;
             }
         }
     }
@@ -47,4 +48,4 @@
         justify-items: center;
         align-items: center;
     }
-}
+}
diff --git a/...-settings-shipping/page/sw-settings-shipping-detail/sw-settings-shipping-detail.html.twig b/...-settings-shipping/page/sw-settings-shipping-detail/sw-settings-shipping-detail.html.twig
@@ -52,7 +52,8 @@
 
                         {% block sw_settings_shipping_detail_content_tabs_advanced_prices %}
                             <sw-tabs-item :route="{ name: 'sw.settings.shipping.detail.advancedPrices', params: { id: $route.params.id } }"
-                                          :title="$tc('sw-settings-shipping.detail.tabAdvancedPrices')">
+                                          :title="$tc('sw-settings-shipping.detail.tabAdvancedPrices')"
+                                          class="sw-shipping-detail-page__price-settings">
                                 {{ $tc('sw-settings-shipping.detail.tabAdvancedPrices') }}
                             </sw-tabs-item>
                         {% endblock %}

diff --git a/...dministration/Resources/administration/src/module/sw-settings-shipping/snippet/de_DE.json b/...dministration/Resources/administration/src/module/sw-settings-shipping/snippet/de_DE.json
@@ -6,7 +6,7 @@
     },
     "list": {
       "textHeadline": "Versandarten",
-      "textDeleteConfirm": "Bist Du sicher, dass du die Versandart \"{name}\" löschen möchtest?",
+      "textDeleteConfirm": "Bist Du sicher, dass Du die Versandart \"{name}\" löschen möchtest?",
       "columnName": "Name",
       "columnActive": "Aktiv",
       "columnShippingfree": "Versandkostenfrei",
@@ -29,9 +29,9 @@
       "labelBindShippingfree": "Versandkostenfrei",
       "labelMinDeliveryTime": "Minimum Lieferzeit",
       "labelMaxDeliveryTime": "Maximal Lieferzeit",
-      "placeholderName": "Namen eingeben...",
-      "placeholderDescription": "Beschreibung eingeben...",
-      "placeholderComment": "Kommentar eingeben...",
+      "placeholderName": "Namen eingeben ...",
+      "placeholderDescription": "Beschreibung eingeben ...",
+      "placeholderComment": "Kommentar eingeben ...",
       "labelCalculation": "Berechnung",
       "labelComment": "Kommentar",
       "buttonCancel": "Abbrechen",
@@ -48,6 +48,26 @@
       "weight": "Gewicht",
       "price": "Preis",
       "lineItemCount": "Anzahl Produkte"
+    },
+    "priceRules": {
+      "cardTitlePriceRule": "Neue Preisregel",
+      "placeholderRule": "Bitte wählen ...",
+      "placeholderQuantityEnd": "Unendlich",
+      "buttonPriceRuleDelete": "Preisregel löschen",
+      "buttonPriceRuleDuplicate": "Preisregel duplizieren",
+      "buttonPriceRuleCurrencyAdd": "Währung hinzufügen",
+      "buttonAddAdditionalPriceRule": "Weitere Preisregel hinzufügen",
+      "textCurrencyDefault": "(Standard)",
+      "textPriceRuleForCurrency": "Preisregel für Währung",
+      "columnQuantityStart": "Menge von",
+      "columnQuantityEnd": "Menge bis",
+      "columnWeightStart": "Gewicht von",
+      "columnWeightEnd": "Gewicht bis",
+      "columnPriceStart": "Preis von",
+      "columnPriceEnd": "Preis bis",
+      "columnPrice": "Preis (Brutto)",
+      "contextMenuDuplicate": "Duplizieren",
+      "contextMenuDelete": "Löschen"
     }
   }
-}
+}
diff --git a/...dministration/Resources/administration/src/module/sw-settings-shipping/snippet/en_GB.json b/...dministration/Resources/administration/src/module/sw-settings-shipping/snippet/en_GB.json
@@ -26,8 +26,8 @@
       "labelName": "Name",
       "labelActive": "Active",
       "labelBindShippingfree": "Free shipping",
-      "labelMinDeliveryTime": "min deliverytime",
-      "labelMaxDeliveryTime": "max deliverytime",
+      "labelMinDeliveryTime": "Min. delivery time",
+      "labelMaxDeliveryTime": "Max. delivery time",
       "placeholderName": "Enter name",
       "placeholderDescription": "Enter description",
       "placeholderComment": "Enter comment",
@@ -48,6 +48,26 @@
       "weight": "Weight",
       "price": "Price",
       "lineItemCount": "Line item count"
+    },
+    "priceRules": {
+      "cardTitlePriceRule": "New price rule",
+      "placeholderRule": "Please choose ...",
+      "placeholderQuantityEnd": "Infinite",
+      "buttonPriceRuleDelete": "Delete price rule",
+      "buttonPriceRuleDuplicate": "Duplicate price rule",
+      "buttonPriceRuleCurrencyAdd": "Add currency",
+      "buttonAddAdditionalPriceRule": "Add additionally price rule",
+      "textCurrencyDefault": "(Default)",
+      "textPriceRuleForCurrency": "Price rule for currency",
+      "columnQuantityStart": "Amount from",
+      "columnQuantityEnd": "Amount to",
+      "columnWeightStart": "Weight from",
+      "columnWeightEnd": "Weight to",
+      "columnPriceStart": "Price from",
+      "columnPriceEnd": "Price to",
+      "columnPrice": "Price (Gross)",
+      "contextMenuDuplicate": "Duplicate",
+      "contextMenuDelete": "Delete"
     }
   }
 }