Merge branch 'main' into fix/method-card-spacing

bolariin · web-flow · commit b2e188b28e3d · 2023-12-22T01:04:47.000-05:00
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
@@ -10,10 +10,10 @@ jobs:
   cla:
     runs-on: ubuntu-latest
     if: |
-      (github.event.issue.pull_request 
+      (github.event.issue.pull_request
         && !github.event.issue.pull_request.merged_at
         && contains(github.event.comment.body, 'signed')
-      ) 
+      )
       || (github.event.pull_request && !github.event.pull_request.merged)
     steps:
       - uses: Shopify/shopify-cla-action@v1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @shopify/discount-app-components
 
+## 2.1.2
+
+### Patch Changes
+
+- [#188](https://github.com/Shopify/discount-app-components/pull/188) [`0e366a8`](https://github.com/Shopify/discount-app-components/commit/0e366a8f9ede089de37ec4f8fcf0a86577c4711f) Thanks [@mathiusj](https://github.com/mathiusj)! - move strategy to constants
+
+## 2.1.1
+
+### Patch Changes
+
+- [#186](https://github.com/Shopify/discount-app-components/pull/186) [`4b47938`](https://github.com/Shopify/discount-app-components/commit/4b479380fb64cc4c730b9faff3baa22dc1227789) Thanks [@mathiusj](https://github.com/mathiusj)! - export strategy type from index
+
+## 2.1.0
+
+### Minor Changes
+
+- [#178](https://github.com/Shopify/discount-app-components/pull/178) [`0d67597`](https://github.com/Shopify/discount-app-components/commit/0d67597354622bd9fd616bfc7ca93dca1c013401) Thanks [@mathiusj](https://github.com/mathiusj)! - add strategy all to DiscountApplicationStrategyCard
+
 ## 2.0.0
 
 ### Major Changes
diff --git a/README.md b/README.md
@@ -5,6 +5,10 @@
 
 `@shopify/discount-app-components` provides a set of stateless discount components to help 3p app developers create [AppBridge](https://shopify.dev/apps/tools/app-bridge)-powered discounts apps.
 
+## Note on updates
+
+While we strive to keep the library updated, please note that the current version available in the Shopify admin may be different from this version. We will communicate upcoming updates as they are planned.
+
 ## App development
 
 For more information about creating apps for the Shopify App Store, see the [app development documentation](https://shopify.dev/apps).
diff --git a/locales/cs.json b/locales/cs.json
@@ -596,6 +596,10 @@
       "maximum": {
         "label": "Maximum",
         "helpText": "Uplatní se jen sleva, která nabízí maximální snížení částky."
+      },
+      "all": {
+        "label": "Vše",
+        "helpText": "Uplatní se všechny slevy za splnění příslušných podmínek."
       }
     }
   }
diff --git a/locales/da.json b/locales/da.json
@@ -576,6 +576,10 @@
       "maximum": {
         "label": "Maksimum",
         "helpText": "Anvend kun den rabat, der giver den maksimale prisnedsættelse."
+      },
+      "all": {
+        "label": "Alle",
+        "helpText": "Anvend alle rabatter med betingelser, der er opfyldt."
       }
     }
   }
diff --git a/locales/de.json b/locales/de.json
@@ -576,6 +576,10 @@
       "maximum": {
         "label": "Maximal",
         "helpText": "Nur den Rabatt verwenden, bei dem am meisten gespart wird."
+      },
+      "all": {
+        "label": "Alle",
+        "helpText": "Alle Rabatte anwenden, deren Bedingungen erfüllt sind."
       }
     }
   }
diff --git a/locales/en.json b/locales/en.json
@@ -576,6 +576,10 @@
       "maximum": {
         "label": "Maximum",
         "helpText": "Only apply the discount that offers the maximum reduction."
+      },
+      "all": {
+        "label": "All",
+        "helpText": "Apply all discounts with conditions that are satisfied."
       }
     }
   }
diff --git a/locales/es.json b/locales/es.json
@@ -586,6 +586,10 @@
       "maximum": {
         "label": "Máximo",
         "helpText": "Aplica solo el descuento que ofrezca la máxima reducción del precio."
+      },
+      "all": {
+        "label": "Todos",
+        "helpText": "Aplica todos los descuentos cuyas condiciones se cumplan."
       }
     }
   }
diff --git a/locales/fi.json b/locales/fi.json
@@ -576,6 +576,10 @@
       "maximum": {
         "label": "Enimmäistaso",
         "helpText": "Käytä vain sellaista alennusta, joka tarjoaa suurimman alennuksen."
+      },
+      "all": {
+        "label": "Kaikki",
+        "helpText": "Sovella kaikkia alennuksia ehdoilla, jotka täyttyvät."
       }
     }
   }
diff --git a/locales/fr.json b/locales/fr.json
@@ -586,6 +586,10 @@
       "maximum": {
         "label": "Maximale",
         "helpText": "Appliquer uniquement la réduction maximale."
+      },
+      "all": {
+        "label": "Tout",
+        "helpText": "Appliquez toutes les réductions dont les conditions sont satisfaites."
       }
     }
   }
diff --git a/locales/it.json b/locales/it.json
@@ -586,6 +586,10 @@
       "maximum": {
         "label": "Massimo",
         "helpText": "Applica solo lo sconto che offre la massima riduzione."
+      },
+      "all": {
+        "label": "Tutti",
+        "helpText": "Applica tutti gli sconti con le condizioni soddisfatte."
       }
     }
   }
diff --git a/locales/ja.json b/locales/ja.json
@@ -576,6 +576,10 @@
       "maximum": {
         "label": "最大",
         "helpText": "最大のディスカウントを提供するディスカウントのみを適用します。"
+      },
+      "all": {
+        "label": "すべて",
+        "helpText": "条件を満たしたすべてのディスカウントを適用します。"
       }
     }
   }
diff --git a/locales/ko.json b/locales/ko.json
@@ -576,6 +576,10 @@
       "maximum": {
         "label": "최대",
         "helpText": "차액이 가장 큰 할인만 적용합니다."
+      },
+      "all": {
+        "label": "모두",
+        "helpText": "조건을 만족하는 모든 할인에 적용합니다."
       }
     }
   }
diff --git a/locales/nb.json b/locales/nb.json
@@ -576,6 +576,10 @@
       "maximum": {
         "label": "Maksimum",
         "helpText": "Bruk bare den rabatten som gir den største reduksjonen."
+      },
+      "all": {
+        "label": "Alle",
+        "helpText": "Bruk alle rabattene med betingelsene som er oppfylt."
       }
     }
   }
diff --git a/locales/nl.json b/locales/nl.json
@@ -576,6 +576,10 @@
       "maximum": {
         "label": "Maximum",
         "helpText": "Pas alleen de korting toe die de maximale reductie biedt."
+      },
+      "all": {
+        "label": "Alle",
+        "helpText": "Pas alle kortingen toe waarbij aan de voorwaarden is voldaan."
       }
     }
   }
diff --git a/locales/pl.json b/locales/pl.json
@@ -596,6 +596,10 @@
       "maximum": {
         "label": "Maksimum",
         "helpText": "Zastosuj tylko ten rabat, który oferuje maksymalną obniżkę."
+      },
+      "all": {
+        "label": "Wszystko",
+        "helpText": "Zastosuj wszystkie rabaty, których warunki zostały spełnione."
       }
     }
   }
diff --git a/locales/pt-BR.json b/locales/pt-BR.json
@@ -586,6 +586,10 @@
       "maximum": {
         "label": "Máximo",
         "helpText": "Somente aplique o desconto que oferece a redução máxima."
+      },
+      "all": {
+        "label": "Todos",
+        "helpText": "Aplique todos os descontos se as condições forem atendidas."
       }
     }
   }
diff --git a/locales/pt-PT.json b/locales/pt-PT.json
@@ -586,6 +586,10 @@
       "maximum": {
         "label": "Máximo",
         "helpText": "Aplicar apenas o desconto que oferece a máxima redução."
+      },
+      "all": {
+        "label": "Tudo",
+        "helpText": "Aplique todos os descontos com as condições cumpridas."
       }
     }
   }
diff --git a/locales/sv.json b/locales/sv.json
@@ -576,6 +576,10 @@
       "maximum": {
         "label": "Maximum",
         "helpText": "Tillämpa bara den rabatt som erbjuder störst avdrag."
+      },
+      "all": {
+        "label": "Alla",
+        "helpText": "Tillämpa alla rabatter vars villkor uppfylls."
       }
     }
   }
diff --git a/locales/th.json b/locales/th.json
@@ -576,6 +576,10 @@
       "maximum": {
         "label": "ค่าสูงสุด",
         "helpText": "ใช้งานเฉพาะส่วนลดที่มีมูลค่าส่วนลดมากที่สุด"
+      },
+      "all": {
+        "label": "ทั้งหมด",
+        "helpText": "ใช้งานส่วนลดทั้งหมดที่ตรงตามเงื่อนไข"
       }
     }
   }
diff --git a/locales/tr.json b/locales/tr.json
@@ -576,6 +576,10 @@
       "maximum": {
         "label": "Maksimum",
         "helpText": "Yalnızca maksimum en büyük düşüş sağlayan indirimi uygulayın."
+      },
+      "all": {
+        "label": "Tümü",
+        "helpText": "Koşulları karşılanan tüm indirimleri uygulayın."
       }
     }
   }
diff --git a/locales/vi.json b/locales/vi.json
@@ -576,6 +576,10 @@
       "maximum": {
         "label": "Tối đa",
         "helpText": "Chỉ áp dụng ưu đãi giảm giá có mức khấu trừ tối đa."
+      },
+      "all": {
+        "label": "Tất cả",
+        "helpText": "Áp dụng mọi ưu đãi giảm giá có các điều kiện được thỏa mãn."
       }
     }
   }
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
@@ -576,6 +576,10 @@
       "maximum": {
         "label": "最大降幅",
         "helpText": "仅应用提供最大金额降幅的折扣。"
+      },
+      "all": {
+        "label": "全部",
+        "helpText": "应用满足条件的全部折扣。"
       }
     }
   }
diff --git a/locales/zh-TW.json b/locales/zh-TW.json
@@ -576,6 +576,10 @@
       "maximum": {
         "label": "最大值",
         "helpText": "僅套用提供最大折價的折扣。"
+      },
+      "all": {
+        "label": "全部",
+        "helpText": "僅在滿足條件的情況下，套用所有折扣。"
       }
     }
   }
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@shopify/discount-app-components",
   "description": "Shopify’s discounts component library",
-  "version": "2.0.0",
+  "version": "2.1.2",
   "author": "Shopify <dev@shopify.com>",
   "repository": "https://github.com/Shopify/discount-app-components",
   "bugs": "https://github.com/Shopify/discount-app-components/issues",
diff --git a/src/components/DiscountApplicationStrategyCard/DiscountApplicationStrategyCard.tsx b/src/components/DiscountApplicationStrategyCard/DiscountApplicationStrategyCard.tsx
@@ -2,13 +2,15 @@ import React from 'react';
 import {Box, Card, ChoiceList, Text, BlockStack} from '@shopify/polaris';
 import {useI18n} from '@shopify/react-i18n';
 
-import {DiscountApplicationStrategy, Field} from '../../types';
+import {Field} from '../../types';
+import {DiscountClass, DiscountApplicationStrategy} from '../../constants';
 
 export interface DiscountAppStrategyProps {
   /**
    * The discount application strategy.
    */
   strategy: Field<DiscountApplicationStrategy>;
+  discountClass: DiscountClass;
 }
 
 const I18N_SCOPE = {
@@ -17,12 +19,43 @@ const I18N_SCOPE = {
 
 export function DiscountApplicationStrategyCard({
   strategy,
+  discountClass,
 }: DiscountAppStrategyProps) {
   const [i18n] = useI18n();
 
   const handleChange = (strategies: DiscountApplicationStrategy[]) =>
     strategy.onChange(strategies[0]);
 
+  const isProduct = discountClass === DiscountClass.Product;
+  const isOrder = discountClass === DiscountClass.Order;
+  const isShipping = discountClass === DiscountClass.Shipping;
+
+  const choices = [
+    ...(isProduct || isOrder
+      ? [
+          {
+            value: DiscountApplicationStrategy.First,
+            label: i18n.translate('first.label', I18N_SCOPE),
+            helpText: i18n.translate('first.helpText', I18N_SCOPE),
+          },
+          {
+            value: DiscountApplicationStrategy.Maximum,
+            label: i18n.translate('maximum.label', I18N_SCOPE),
+            helpText: i18n.translate('maximum.helpText', I18N_SCOPE),
+          },
+        ]
+      : []),
+    ...(isProduct || isShipping
+      ? [
+          {
+            value: DiscountApplicationStrategy.All,
+            label: i18n.translate('all.label', I18N_SCOPE),
+            helpText: i18n.translate('all.helpText', I18N_SCOPE),
+          },
+        ]
+      : []),
+  ];
+
   return (
     <Box paddingBlockEnd="400">
       <Card padding="400">
@@ -33,18 +66,7 @@ export function DiscountApplicationStrategyCard({
           <ChoiceList
             title={i18n.translate('title', I18N_SCOPE)}
             titleHidden
-            choices={[
-              {
-                value: DiscountApplicationStrategy.First,
-                label: i18n.translate('first.label', I18N_SCOPE),
-                helpText: i18n.translate('first.helpText', I18N_SCOPE),
-              },
-              {
-                value: DiscountApplicationStrategy.Maximum,
-                label: i18n.translate('maximum.label', I18N_SCOPE),
-                helpText: i18n.translate('maximum.helpText', I18N_SCOPE),
-              },
-            ]}
+            choices={choices}
             selected={[strategy.value]}
             onChange={handleChange}
           />
diff --git a/src/components/DiscountApplicationStrategyCard/tests/DiscountApplicationStrategyCard.test.tsx b/src/components/DiscountApplicationStrategyCard/tests/DiscountApplicationStrategyCard.test.tsx
diff --git a/src/constants.ts b/src/constants.ts
diff --git a/src/index.ts b/src/index.ts
diff --git a/src/stories/patterns/DiscountApplicationStrategyCardPattern/DiscountApplicationStrategyCardPattern.stories.tsx b/src/stories/patterns/DiscountApplicationStrategyCardPattern/DiscountApplicationStrategyCardPattern.stories.tsx
diff --git a/src/stories/patterns/DiscountApplicationStrategyCardPattern/DiscountApplicationStrategyCardPattern.tsx b/src/stories/patterns/DiscountApplicationStrategyCardPattern/DiscountApplicationStrategyCardPattern.tsx
diff --git a/src/types.ts b/src/types.ts
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -596,6 +596,10 @@`
`596`	`596`	`"maximum": {`
`597`	`597`	`"label": "Maximum",`
`598`	`598`	`"helpText": "Uplatní se jen sleva, která nabízí maximální snížení částky."`
	`599`	`+ },`
	`600`	`+ "all": {`
	`601`	`+ "label": "Vše",`
	`602`	`+ "helpText": "Uplatní se všechny slevy za splnění příslušných podmínek."`
`599`	`603`	`}`
`600`	`604`	`}`
`601`	`605`	`}`
Original file line number	Diff line number	Diff line change
`@@ -576,6 +576,10 @@`
`576`	`576`	`"maximum": {`
`577`	`577`	`"label": "Maksimum",`
`578`	`578`	`"helpText": "Anvend kun den rabat, der giver den maksimale prisnedsættelse."`
	`579`	`+ },`
	`580`	`+ "all": {`
	`581`	`+ "label": "Alle",`
	`582`	`+ "helpText": "Anvend alle rabatter med betingelser, der er opfyldt."`
`579`	`583`	`}`
`580`	`584`	`}`
`581`	`585`	`}`
Original file line number	Diff line number	Diff line change
`@@ -586,6 +586,10 @@`
`586`	`586`	`"maximum": {`
`587`	`587`	`"label": "Máximo",`
`588`	`588`	`"helpText": "Aplica solo el descuento que ofrezca la máxima reducción del precio."`
	`589`	`+ },`
	`590`	`+ "all": {`
	`591`	`+ "label": "Todos",`
	`592`	`+ "helpText": "Aplica todos los descuentos cuyas condiciones se cumplan."`
`589`	`593`	`}`
`590`	`594`	`}`
`591`	`595`	`}`