From 538938aa67c0f69496e9dbebc49ae3422273e7e2 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Sat, 15 Apr 2023 02:22:06 +0000
Subject: [PATCH] case 4504

---
 src/views/biz-subscription.vue | 91 ++++++++++++++++++++++++++--------
 1 file changed, 70 insertions(+), 21 deletions(-)

diff --git a/src/views/biz-subscription.vue b/src/views/biz-subscription.vue
index ed9ebd0..9ed56ca 100644
--- a/src/views/biz-subscription.vue
+++ b/src/views/biz-subscription.vue
@@ -269,6 +269,7 @@
                             `Items[${editItemIndex}].expireDate`
                           )
                         "
+                        :rules="[form().required(this, 'Items.expireDate')]"
                         @input="
                           fieldValueChanged(
                             `Items[${editItemIndex}].expireDate`
@@ -276,27 +277,71 @@
                         "
                       ></gz-date-time-picker>
                     </v-col>
-
-                    <v-col cols="12" sm="6" lg="4" xl="3">
-                      <v-checkbox
-                        ref="active"
-                        v-model="obj.items[editItemIndex].active"
-                        dense
-                        :readonly="formState.readOnly"
-                        :label="$sock.t('Active')"
-                        :error-messages="
-                          form().serverErrors(
-                            this,
-                            `Items[${editItemIndex}].active`
-                          )
-                        "
-                        @change="
-                          fieldValueChanged(`Items[${editItemIndex}].active`)
-                        "
-                      ></v-checkbox>
-                    </v-col>
                   </v-row>
                 </v-col>
+
+                <v-col cols="12" sm="6" lg="4" xl="3">
+                  <gz-date-time-picker
+                    ref="Items.originalOrderDate"
+                    v-model="obj.items[editItemIndex].originalOrderDate"
+                    :label="$sock.t('OriginalOrderDate')"
+                    :readonly="formState.readOnly"
+                    :error-messages="
+                      form().serverErrors(
+                        this,
+                        `Items[${editItemIndex}].originalOrderDate`
+                      )
+                    "
+                    :rules="[form().required(this, 'Items.originalOrderDate')]"
+                    @input="
+                      fieldValueChanged(
+                        `Items[${editItemIndex}].originalOrderDate`
+                      )
+                    "
+                  ></gz-date-time-picker>
+                </v-col>
+
+                <v-col cols="12" sm="6" lg="4" xl="3">
+                  <v-text-field
+                    ref="Items.originalOrderNumber"
+                    v-model="obj.items[editItemIndex].originalOrderNumber"
+                    dense
+                    :label="$sock.t('OriginalOrderNumber')"
+                    :readonly="formState.readOnly"
+                    :error-messages="
+                      form().serverErrors(
+                        this,
+                        `Items[${editItemIndex}].originalOrderNumber`
+                      )
+                    "
+                    :rules="[
+                      form().required(this, 'Items.originalOrderNumber')
+                    ]"
+                    @input="
+                      fieldValueChanged(
+                        `Items[${editItemIndex}].originalOrderNumber`
+                      )
+                    "
+                  ></v-text-field>
+                </v-col>
+                <v-col cols="12" sm="6" lg="4" xl="3">
+                  <v-checkbox
+                    ref="active"
+                    v-model="obj.items[editItemIndex].active"
+                    dense
+                    :readonly="formState.readOnly"
+                    :label="$sock.t('Active')"
+                    :error-messages="
+                      form().serverErrors(
+                        this,
+                        `Items[${editItemIndex}].active`
+                      )
+                    "
+                    @change="
+                      fieldValueChanged(`Items[${editItemIndex}].active`)
+                    "
+                  ></v-checkbox>
+                </v-col>
               </v-row>
             </v-card-text>
             <v-card-actions>
@@ -389,7 +434,7 @@ export default {
       obj: {
         id: 0,
         concurrency: 0,
-        customerId: 0,
+        customerId: null,
         pGroup: null,
         active: true,
         subsite: "main",
@@ -567,6 +612,8 @@ export default {
         productId: null,
         quantity: 1,
         expireDate: window.$gz.locale.nowUTC8601String(),
+        originalOrderDate: window.$gz.locale.nowUTC8601String(),
+        originalOrderNumber: null,
         active: true
       });
       this.editItemIndex = this.obj.items.length - 1;
@@ -938,7 +985,9 @@ async function fetchTranslatedText() {
     "ProductName",
     "PurchaseQuantity",
     "PurchaseExpireDate",
-    "SubscriptionItemList"
+    "SubscriptionItemList",
+    "OriginalOrderNumber",
+    "OriginalOrderDate"
   ]);
 }