merge develop

2021-10-15 20:09:31 +02:00
parent 10c87e8d5a
commit 4fd361fddd
207 changed files with 8699 additions and 4124 deletions
@@ -1,9 +0,0 @@
-{
-  "plugins": ["prettier"],
-  "extends": ["prettier"],
-  "rules": {
-    "prettier/prettier": "error",
-    "semi": "error",
-    "no-unused-expressions": "true"
-  }
-}
@@ -1,7 +0,0 @@
-{
-  "endOfLine": "lf",
-  "semi": false,
-  "singleQuote": false,
-  "tabWidth": 2,
-  "trailingComma": "es5"
-}
@@ -44,6 +44,8 @@ class OrderSubscriber {
            "billing_address",
            "shipping_address",
            "discounts",
+            "discounts.rule",
+            "discounts.rule.valid_for",
            "shipping_methods",
            "payments",
            "fulfillments",
@@ -146,6 +148,8 @@ class OrderSubscriber {
            "billing_address",
            "shipping_address",
            "discounts",
+            "discounts.rule",
+            "discounts.rule.valid_for",
            "shipping_methods",
            "payments",
            "fulfillments",
@@ -253,6 +257,8 @@ class OrderSubscriber {
          "billing_address",
          "shipping_address",
          "discounts",
+          "discounts.rule",
+          "discounts.rule.valid_for",
          "shipping_methods",
          "payments",
          "fulfillments",