feat(core): Add maximum coupon usage (#2331)

Closes #2330 Co-authored-by: Karics <[email protected]>
vendure-ecommerce · Aug 10, 2023 · bdd2720 · bdd2720
1 parent e197bc1
commit bdd2720
Show file tree

Hide file tree

Showing 23 changed files with 299 additions and 17 deletions.
diff --git a/packages/admin-ui/src/lib/core/src/common/generated-types.ts b/packages/admin-ui/src/lib/core/src/common/generated-types.ts
diff --git a/packages/admin-ui/src/lib/core/src/data/definitions/promotion-definitions.ts b/packages/admin-ui/src/lib/core/src/data/definitions/promotion-definitions.ts
@@ -16,6 +16,7 @@ export const PROMOTION_FRAGMENT = gql`
         enabled
         couponCode
         perCustomerUsageLimit
+        usageLimit
         startsAt
         endsAt
         conditions {

diff --git a/packages/admin-ui/src/lib/core/src/data/providers/promotion-data.service.ts b/packages/admin-ui/src/lib/core/src/data/providers/promotion-data.service.ts
@@ -30,6 +30,7 @@ export class PromotionDataService {
                 'startsAt',
                 'endsAt',
                 'perCustomerUsageLimit',
+                'usageLimit',
                 'enabled',
                 'translations',
                 'customFields',
@@ -50,6 +51,7 @@ export class PromotionDataService {
                 'startsAt',
                 'endsAt',
                 'perCustomerUsageLimit',
+                'usageLimit',
                 'enabled',
                 'translations',
                 'customFields',

diff --git a/...dmin-ui/src/lib/marketing/src/components/promotion-detail/promotion-detail.component.html b/...dmin-ui/src/lib/marketing/src/components/promotion-detail/promotion-detail.component.html
@@ -81,6 +81,7 @@
                     </vdr-form-field>
                     <vdr-form-field
                         [label]="'marketing.per-customer-limit' | translate"
+                        [tooltip]="'marketing.per-customer-limit-tooltip' | translate"
                         for="perCustomerUsageLimit"
                     >
                         <input
@@ -92,6 +93,20 @@
                             formControlName="perCustomerUsageLimit"
                         />
                     </vdr-form-field>
+                    <vdr-form-field
+                        [label]="'marketing.usage-limit' | translate"
+                        [tooltip]="'marketing.usage-limit-tooltip' | translate"
+                        for="usageLimit"
+                    >
+                        <input
+                            id="usageLimit"
+                            [readonly]="!('UpdatePromotion' | hasPermission)"
+                            type="number"
+                            min="1"
+                            max="9999999"
+                            formControlName="usageLimit"
+                        />
+                    </vdr-form-field>
                 </div>
             </vdr-card>
             <vdr-card

diff --git a/.../admin-ui/src/lib/marketing/src/components/promotion-detail/promotion-detail.component.ts b/.../admin-ui/src/lib/marketing/src/components/promotion-detail/promotion-detail.component.ts
@@ -50,6 +50,7 @@ export class PromotionDetailComponent
         enabled: true,
         couponCode: null as string | null,
         perCustomerUsageLimit: null as number | null,
+        usageLimit: null as number | null,
         startsAt: null,
         endsAt: null,
         conditions: this.formBuilder.array([]),
@@ -152,6 +153,7 @@ export class PromotionDetailComponent
                 description: '',
                 couponCode: null,
                 perCustomerUsageLimit: null,
+                usageLimit: null,
                 enabled: false,
                 conditions: [],
                 actions: [],
@@ -256,6 +258,7 @@ export class PromotionDetailComponent
             enabled: entity.enabled,
             couponCode: entity.couponCode,
             perCustomerUsageLimit: entity.perCustomerUsageLimit,
+            usageLimit: entity.usageLimit,
             startsAt: entity.startsAt,
             endsAt: entity.endsAt,
         });

diff --git a/...es/admin-ui/src/lib/marketing/src/components/promotion-list/promotion-list.component.html b/...es/admin-ui/src/lib/marketing/src/components/promotion-list/promotion-list.component.html
@@ -99,5 +99,14 @@
             {{ promotion.perCustomerUsageLimit }}
         </ng-template>
     </vdr-dt2-column>
+    <vdr-dt2-column
+        [heading]="'marketing.per-customer-limit' | translate"
+        [sort]="sorts.get('usageLimit')"
+        [hiddenByDefault]="true"
+    >
+        <ng-template let-promotion="item">
+            {{ promotion.usageLimit }}
+        </ng-template>
+    </vdr-dt2-column>
     <vdr-dt2-custom-field-column *ngFor="let customField of customFields" [customField]="customField" [sorts]="sorts" />
 </vdr-data-table-2>
diff --git a/...ages/admin-ui/src/lib/marketing/src/components/promotion-list/promotion-list.component.ts b/...ages/admin-ui/src/lib/marketing/src/components/promotion-list/promotion-list.component.ts
@@ -73,11 +73,17 @@ export class PromotionListComponent
                 filterField: 'description',
             },
             {
-                name: 'usageLimit',
+                name: 'perCustomerUsageLimit',
                 type: { kind: 'number' },
                 label: _('marketing.per-customer-limit'),
                 filterField: 'perCustomerUsageLimit',
             },
+            {
+                name: 'usageLimit',
+                type: { kind: 'number' },
+                label: _('marketing.usage-limit'),
+                filterField: 'usageLimit',
+            },
         ])
         .addCustomFieldFilters(this.customFields)
         .connectToRoute(this.route);
@@ -92,6 +98,7 @@ export class PromotionListComponent
             { name: 'name' },
             { name: 'couponCode' },
             { name: 'perCustomerUsageLimit' },
+            { name: 'usageLimit' },
         ])
         .addCustomFieldSorts(this.customFields)
         .connectToRoute(this.route);

diff --git a/packages/asset-server-plugin/e2e/graphql/generated-e2e-asset-server-plugin-types.ts b/packages/asset-server-plugin/e2e/graphql/generated-e2e-asset-server-plugin-types.ts
@@ -845,6 +845,7 @@ export type CreatePromotionInput = {
   perCustomerUsageLimit?: InputMaybe<Scalars['Int']>;
   startsAt?: InputMaybe<Scalars['DateTime']>;
   translations: Array<PromotionTranslationInput>;
+  usageLimit?: InputMaybe<Scalars['Int']>;
 };
 
 export type CreatePromotionResult = MissingConditionsError | Promotion;
@@ -4591,6 +4592,7 @@ export type Promotion = Node & {
   startsAt?: Maybe<Scalars['DateTime']>;
   translations: Array<PromotionTranslation>;
   updatedAt: Scalars['DateTime'];
+  usageLimit?: Maybe<Scalars['Int']>;
 };
 
 export type PromotionFilterParameter = {
@@ -4604,6 +4606,7 @@ export type PromotionFilterParameter = {
   perCustomerUsageLimit?: InputMaybe<NumberOperators>;
   startsAt?: InputMaybe<DateOperators>;
   updatedAt?: InputMaybe<DateOperators>;
+  usageLimit?: InputMaybe<NumberOperators>;
 };
 
 export type PromotionList = PaginatedList & {
@@ -4634,6 +4637,7 @@ export type PromotionSortParameter = {
   perCustomerUsageLimit?: InputMaybe<SortOrder>;
   startsAt?: InputMaybe<SortOrder>;
   updatedAt?: InputMaybe<SortOrder>;
+  usageLimit?: InputMaybe<SortOrder>;
 };
 
 export type PromotionTranslation = {
@@ -6114,6 +6118,7 @@ export type UpdatePromotionInput = {
   perCustomerUsageLimit?: InputMaybe<Scalars['Int']>;
   startsAt?: InputMaybe<Scalars['DateTime']>;
   translations?: InputMaybe<Array<PromotionTranslationInput>>;
+  usageLimit?: InputMaybe<Scalars['Int']>;
 };
 
 export type UpdatePromotionResult = MissingConditionsError | Promotion;

diff --git a/packages/common/src/generated-shop-types.ts b/packages/common/src/generated-shop-types.ts
@@ -2740,6 +2740,7 @@ export type Promotion = Node & {
   startsAt?: Maybe<Scalars['DateTime']>;
   translations: Array<PromotionTranslation>;
   updatedAt: Scalars['DateTime'];
+  usageLimit?: Maybe<Scalars['Int']>;
 };
 
 export type PromotionList = PaginatedList & {

diff --git a/packages/common/src/generated-types.ts b/packages/common/src/generated-types.ts
@@ -876,6 +876,7 @@ export type CreatePromotionInput = {
   perCustomerUsageLimit?: InputMaybe<Scalars['Int']>;
   startsAt?: InputMaybe<Scalars['DateTime']>;
   translations: Array<PromotionTranslationInput>;
+  usageLimit?: InputMaybe<Scalars['Int']>;
 };
 
 export type CreatePromotionResult = MissingConditionsError | Promotion;
@@ -4713,6 +4714,7 @@ export type Promotion = Node & {
   startsAt?: Maybe<Scalars['DateTime']>;
   translations: Array<PromotionTranslation>;
   updatedAt: Scalars['DateTime'];
+  usageLimit?: Maybe<Scalars['Int']>;
 };
 
 export type PromotionFilterParameter = {
@@ -4726,6 +4728,7 @@ export type PromotionFilterParameter = {
   perCustomerUsageLimit?: InputMaybe<NumberOperators>;
   startsAt?: InputMaybe<DateOperators>;
   updatedAt?: InputMaybe<DateOperators>;
+  usageLimit?: InputMaybe<NumberOperators>;
 };
 
 export type PromotionList = PaginatedList & {
@@ -4757,6 +4760,7 @@ export type PromotionSortParameter = {
   perCustomerUsageLimit?: InputMaybe<SortOrder>;
   startsAt?: InputMaybe<SortOrder>;
   updatedAt?: InputMaybe<SortOrder>;
+  usageLimit?: InputMaybe<SortOrder>;
 };
 
 export type PromotionTranslation = {
@@ -6287,6 +6291,7 @@ export type UpdatePromotionInput = {
   perCustomerUsageLimit?: InputMaybe<Scalars['Int']>;
   startsAt?: InputMaybe<Scalars['DateTime']>;
   translations?: InputMaybe<Array<PromotionTranslationInput>>;
+  usageLimit?: InputMaybe<Scalars['Int']>;
 };
 
 export type UpdatePromotionResult = MissingConditionsError | Promotion;

diff --git a/packages/core/e2e/graphql/generated-e2e-admin-types.ts b/packages/core/e2e/graphql/generated-e2e-admin-types.ts
@@ -845,6 +845,7 @@ export type CreatePromotionInput = {
   perCustomerUsageLimit?: InputMaybe<Scalars['Int']>;
   startsAt?: InputMaybe<Scalars['DateTime']>;
   translations: Array<PromotionTranslationInput>;
+  usageLimit?: InputMaybe<Scalars['Int']>;
 };
 
 export type CreatePromotionResult = MissingConditionsError | Promotion;
@@ -4591,6 +4592,7 @@ export type Promotion = Node & {
   startsAt?: Maybe<Scalars['DateTime']>;
   translations: Array<PromotionTranslation>;
   updatedAt: Scalars['DateTime'];
+  usageLimit?: Maybe<Scalars['Int']>;
 };
 
 export type PromotionFilterParameter = {
@@ -4604,6 +4606,7 @@ export type PromotionFilterParameter = {
   perCustomerUsageLimit?: InputMaybe<NumberOperators>;
   startsAt?: InputMaybe<DateOperators>;
   updatedAt?: InputMaybe<DateOperators>;
+  usageLimit?: InputMaybe<NumberOperators>;
 };
 
 export type PromotionList = PaginatedList & {
@@ -4634,6 +4637,7 @@ export type PromotionSortParameter = {
   perCustomerUsageLimit?: InputMaybe<SortOrder>;
   startsAt?: InputMaybe<SortOrder>;
   updatedAt?: InputMaybe<SortOrder>;
+  usageLimit?: InputMaybe<SortOrder>;
 };
 
 export type PromotionTranslation = {
@@ -6114,6 +6118,7 @@ export type UpdatePromotionInput = {
   perCustomerUsageLimit?: InputMaybe<Scalars['Int']>;
   startsAt?: InputMaybe<Scalars['DateTime']>;
   translations?: InputMaybe<Array<PromotionTranslationInput>>;
+  usageLimit?: InputMaybe<Scalars['Int']>;
 };
 
 export type UpdatePromotionResult = MissingConditionsError | Promotion;

diff --git a/packages/core/e2e/graphql/generated-e2e-shop-types.ts b/packages/core/e2e/graphql/generated-e2e-shop-types.ts
@@ -2649,6 +2649,7 @@ export type Promotion = Node & {
   startsAt?: Maybe<Scalars['DateTime']>;
   translations: Array<PromotionTranslation>;
   updatedAt: Scalars['DateTime'];
+  usageLimit?: Maybe<Scalars['Int']>;
 };
 
 export type PromotionList = PaginatedList & {