@7365admin1/layer-common 3.2.1-staging.72 → 3.2.2

package/components/OnlineFormFill.vue

@@ -247,40 +247,6 @@
             {{ resolveText(block.text) }}
           </p>
 
-          <!-- ORDERED LIST -->
-          <div v-else-if="block.type === 'ordered-list'" class="mb-3">
-            <div
-              v-if="block.title"
-              class="text-body-2 font-weight-bold mb-1"
-              style="text-decoration: underline; text-underline-offset: 3px"
-            >{{ block.title }}</div>
-            <ol style="padding-left: 22px; margin: 0">
-              <li
-                v-for="(item, itemIdx) in block.items"
-                :key="itemIdx"
-                class="text-body-2 mb-1"
-                style="line-height: 1.55; color: #333"
-              >{{ item }}</li>
-            </ol>
-          </div>
-
-          <!-- UNORDERED LIST -->
-          <div v-else-if="block.type === 'unordered-list'" class="mb-3">
-            <div
-              v-if="block.title"
-              class="text-body-2 font-weight-bold mb-1"
-              style="text-decoration: underline; text-underline-offset: 3px"
-            >{{ block.title }}</div>
-            <ul style="padding-left: 22px; margin: 0">
-              <li
-                v-for="(item, itemIdx) in block.items"
-                :key="itemIdx"
-                class="text-body-2 mb-1"
-                style="line-height: 1.55; color: #333"
-              >{{ item }}</li>
-            </ul>
-          </div>
-
           <!-- DIVIDER -->
           <v-divider v-else-if="block.type === 'divider'" class="my-4" />
 
@@ -467,7 +433,6 @@ const props = defineProps({
   approvalMode: { type: Boolean, default: false },
   initialManagementValues: { type: Object as PropType<Record<string, string>>, default: () => ({}) },
   formType: { type: String, default: "" },
-  paymentAmount: { type: Number, default: 0 },
   /** Optional custom submit handler. Receives the collected form values.
    *  If omitted the component submits to /api/online-forms automatically. */
   submitFn: {
@@ -631,8 +596,15 @@ const submissionStatusColor = computed(() => {
   }
 });
 
+const PAYMENT_REQUIRED_FORM_TYPES = new Set([
+  "Application for Electronic Access Card",
+  "Application for Booking of BBQ Pit",
+  "Application for Moving In/Out & Delivery",
+  "Application for Main Entrance RFID Transponder",
+]);
+
 const requiresPayment = computed(() => {
-  if (props.paymentAmount <= 0) return false;
+  if (!PAYMENT_REQUIRED_FORM_TYPES.has(props.formType)) return false;
   if (props.formType === "Application for Main Entrance RFID Transponder") {
     return !!(props.initialValues.reasonLost || props.initialValues.reasonDamaged);
   }

package/components/OnlineFormsConfiguration.vue

@@ -88,7 +88,7 @@
     >
 
     <!-- Create Dialog -->
-    <v-dialog v-model="createDialog" width="720" persistent>
+    <v-dialog v-model="createDialog" width="450" persistent>
       <OnlineFormConfigurationForm
         mode="add"
         @cancel="createDialog = false"
@@ -97,7 +97,7 @@
     </v-dialog>
 
     <!-- Edit Dialog -->
-    <v-dialog v-model="editDialog" width="720" persistent>
+    <v-dialog v-model="editDialog" width="450" persistent>
       <OnlineFormConfigurationForm
         mode="edit"
         @cancel="editDialog = false"
@@ -113,7 +113,6 @@
         :definition="selectedFormDefinition"
         :site-id="siteId"
         :org-id="orgId"
-        :payment-amount="selectedPaymentAmount"
         readonly
         @cancel="previewDialog = false"
       >
@@ -337,9 +336,6 @@ const selectedFormDefinition = ref<any>(null);
 const deleteLoading = ref(false);
 const confirmDialog = ref(false);
 const selectedOnlineFormId = ref<string | null>(null);
-const selectedPaymentAmount = computed(() =>
-  Number(selectedOnlineForm.value?.fields?.paymentAmount ?? 0)
-);
 
 function parseFieldsToInputs(fields: Record<string, string>): any[] {
   return Object.keys(fields)

package/components/QrTemplate/CreditCardLandscape.vue

@@ -33,7 +33,7 @@
 
                 <qrcode-vue
                   v-if="templateQrCode.CCFrontQREnabled"
-                  :value="getPassNumberValue(card.number)"
+                  :value="`${prefix}0${+printRangeStart + +card.number - 1}`"
                   :size="templateQrCode.CCFrontQRCodeSize"
                   level="H"
                   :style="{
@@ -53,7 +53,9 @@
                   }"
                   class="position-absolute text-center"
                 >
-                  Pass Number: {{ getPassNumberValue(card.number) }}
+                  Pass Number: {{ prefix }}0{{
+                    +printRangeStart + +card.number - 1
+                  }}
                 </div>
               </v-card>
 
@@ -72,7 +74,7 @@
 
                 <qrcode-vue
                   v-if="templateQrCode.CCBackQREnabled"
-                  :value="getPassNumberValue(card.number)"
+                  :value="`${prefix}0${+printRangeStart + +card.number - 1}`"
                   :size="templateQrCode.CCBackQRCodeSize"
                   level="H"
                   :style="{
@@ -91,7 +93,9 @@
                   }"
                   class="position-absolute text-center"
                 >
-                  Pass Number: {{ getPassNumberValue(card.number) }}
+                  Pass Number: {{ prefix }}0{{
+                    +printRangeStart + +card.number - 1
+                  }}
                 </div>
               </v-card>
             </v-col>
@@ -109,22 +113,11 @@ const props = defineProps({
   paginatedCardData: Array,
   templateQrCode: Object,
   prefix: String,
-  printRangeStart: [String, Number],
+  printRangeStart: Number,
+});
+onMounted(() => {
+  console.log("templateQrCode 11", props.templateQrCode.CCOrientation);
 });
-
-const getPassNumberValue = (position) => {
-  const rawStartValue = `${props.printRangeStart ?? ""}`.trim();
-  const startMatch = rawStartValue.match(/(\d+)$/);
-  const startValue = startMatch?.[1] ?? "0";
-  const startNumber = Number(startValue);
-  const sequenceNumber = startNumber + Number(position) - 1;
-  const cleanPrefix = `${props.prefix ?? ""}`.replace(/\d+$/, "");
-  const width = startValue.length;
-  const formattedSequence =
-    width > 0 ? `${sequenceNumber}`.padStart(width, "0") : `${sequenceNumber}`;
-
-  return `${cleanPrefix}${formattedSequence}`;
-};
 </script>
 
 <style scoped>