Merge pull request #12 from iDataRiver/support-license

iDataRiver · web-flow · commit be69649f6f81 · 2024-10-01T19:16:59.000+08:00
Support license
diff --git a/components/Home/Theme1.vue b/components/Home/Theme1.vue
@@ -13,7 +13,7 @@ const filterSkus = (projects, keyword = '') => {
   const showSkus = []
 
   projects.forEach((project) => {
-    if (!['DIGITAL', 'MANUAL', 'GROUP'].includes(project.type)) {
+    if (!['DIGITAL', 'MANUAL', 'LICENSE', 'GROUP'].includes(project.type)) {
       return
     }
 
diff --git a/components/Home/Theme2.vue b/components/Home/Theme2.vue
@@ -12,7 +12,7 @@ const siteSettings = merchant.value.website ? merchant.value.website.settings :
 const projects = merchant.value.projects
 
 projects.forEach((project) => {
-  if (!['DIGITAL', 'MANUAL', 'GROUP'].includes(project.type)) {
+  if (!['DIGITAL', 'MANUAL', 'LICENSE', 'GROUP'].includes(project.type)) {
     return
   }
   cates.value.push({
@@ -91,7 +91,7 @@ onMounted(() => {
         <div class="space-y-4">
           <template v-for="project in projects">
             <template
-              v-if="['DIGITAL', 'MANUAL', 'GROUP'].includes(project.type) && project.skus.length > 0 && ['all', project.slug].includes(selectedCate.code)">
+              v-if="['DIGITAL', 'MANUAL', 'LICENSE', 'GROUP'].includes(project.type) && project.skus.length > 0 && ['all', project.slug].includes(selectedCate.code)">
 
               <details
                 class="group [&_summary::-webkit-details-marker]:hidden rounded-lg border1 border-gray-900 bg-gradient-to-b bg-white"
diff --git a/components/OrderDetailDigital.vue b/components/OrderDetailDigital.vue
@@ -162,7 +162,10 @@ if (payStatus.value === 'WAIT') {
       <div class="border-t"></div>
 
       <div id="digitalItems" class="grid grid-cols-1 space-y-2">
-        <div class="pr-6 text-lg font-medium text-gray-500">{{ $t('order_digital_items') }}</div>
+        <div class="flex items-center">
+          <div class="pr-2 text-lg font-medium text-gray-500">{{ $t('order_digital_items') }}</div>
+          <BtnCopy :text="order.digitalItemsStr" btn-size="small" />
+        </div>
         <div>
           <textarea :value="order.digitalItemsStr" type="text" rows="5" maxlength="1000000"
             class="w-full px-3 py-2 border rounded-md border-gray-300 bg-gray-100 focus:bg-white text-gray-800 focus:ring-gray-900 focus:border-gray-900"
diff --git a/components/btn/Copy.vue b/components/btn/Copy.vue
@@ -0,0 +1,44 @@
+<script setup>
+const props = defineProps(['copyStatus', 'text', 'btnSize'])
+const text = props.copyStatus ? useState(props.copyStatus, () => '') : props.text || ''
+const btnSize = props.btnSize || 'large'
+
+const copied = ref(false)
+const clickCopyBtn = () => {
+  navigator.clipboard.writeText(isRef(text) ? text.value : text)
+
+  if (copied.value) return
+  copied.value = true
+  setTimeout(() => {
+    copied.value = false;
+  }, 2000);
+}
+</script>
+
+
+<template>
+  <div>
+    <div class="relative">
+      <button @click.stop="clickCopyBtn"
+        class="text-gray-900 hover:bg-gray-100 rounded-md inline-flex items-center justify-center bg-white border-gray-200 border"
+        :class="{ 'py-2 px-2.5 text-md': btnSize == 'large', 'py-1.5 px-1.5 text-sm': btnSize == 'medium', 'px-1 py-1 text-xs': btnSize == 'small' }">
+        <span id="default-message" class="inline-flex items-center" :class="[copied ? 'hidden' : '']">
+          <svg class="w-3 h-3 me-1.5" :aria-hidden="copied" xmlns="http://www.w3.org/2000/svg" fill="currentColor"
+            viewBox="0 0 18 20">
+            <path
+              d="M16 1h-3.278A1.992 1.992 0 0 0 11 0H7a1.993 1.993 0 0 0-1.722 1H2a2 2 0 0 0-2 2v15a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2Zm-3 14H5a1 1 0 0 1 0-2h8a1 1 0 0 1 0 2Zm0-4H5a1 1 0 0 1 0-2h8a1 1 0 1 1 0 2Zm0-5H5a1 1 0 0 1 0-2h2V2h4v2h2a1 1 0 1 1 0 2Z" />
+          </svg>
+          <span class="text-xs font-semibold">Copy</span>
+        </span>
+        <span id="success-message" class="inline-flex items-center" :class="[copied ? '' : 'hidden']">
+          <svg class="w-3 h-3 text-gray-800 me-1.5" :aria-hidden="!copied" xmlns="http://www.w3.org/2000/svg"
+            fill="none" viewBox="0 0 16 12">
+            <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+              d="M1 5.917 5.724 10.5 15 1.5" />
+          </svg>
+          <span class="text-xs font-semibold text-gray-800">Copied</span>
+        </span>
+      </button>
+    </div>
+  </div>
+</template>
diff --git a/i18n/auto/ar.ts b/i18n/auto/ar.ts
@@ -79,7 +79,7 @@ export default {
   automatic_delivery: "صفقة تلقائية",
   header_search_order: "أوامر البحث",
   Search_Order: "يبحث",
-  search_order_input_placeholder: "الرجاء إدخال معلومات الاتصال أو OrderID",
+  search_order_input_placeholder: "يرجى إدخال معلومات الاتصال أو orderid",
   txn_order_id: "معرف الطلب",
   Name: "اسم",
   Price: "سعر",
@@ -122,4 +122,5 @@ export default {
   GROUP: "عضوية المجموعة",
   MANUAL: "الخدمة اليدوية",
   Payment_fee: "رسوم الدفع",
+  LICENSE: "خدمة الترخيص",
 };
diff --git a/i18n/auto/de.ts b/i18n/auto/de.ts
@@ -23,7 +23,7 @@ export default {
   server_order_payment_succ: "Zahlungszahlung erfolgreich",
   server_internal_exception: "Interne Ausnahme",
   server_order_wrong_payment_user: "Falscher Zahlungsbenutzer",
-  server_order_pay_status_error: "Bestellung kann nicht puzentiert",
+  server_order_pay_status_error: "Bestellung kann nicht puzentiert werden",
   server_order_expired: "Bestellung ist abgelaufen",
   server_insufficient_credits: "Unzureichende Credits",
   server_redeem_code_unknown: "Code einlösen nicht existiert nicht",
@@ -133,4 +133,5 @@ export default {
   GROUP: "Gruppenmitgliedschaft",
   MANUAL: "Manueller Service",
   Payment_fee: "Zahlungsgebühren",
+  LICENSE: "Lizenzservice",
 };
diff --git a/i18n/auto/es.ts b/i18n/auto/es.ts
@@ -133,4 +133,5 @@ export default {
   GROUP: "Membresía del grupo",
   MANUAL: "Servicio manual",
   Payment_fee: "Tarifas de pago",
+  LICENSE: "Servicio de licencia",
 };
diff --git a/i18n/auto/fa.ts b/i18n/auto/fa.ts
@@ -127,4 +127,5 @@ export default {
   GROUP: "عضویت گروهی",
   MANUAL: "سرویس دستی",
   Payment_fee: "هزینه پرداخت",
+  LICENSE: "سرویس مجوز",
 };
diff --git a/i18n/auto/fr.ts b/i18n/auto/fr.ts
@@ -131,4 +131,5 @@ export default {
   GROUP: "Appartenance à un groupe",
   MANUAL: "Service manuel",
   Payment_fee: "Frais de paiement",
+  LICENSE: "Service de licence",
 };
diff --git a/i18n/auto/ja.ts b/i18n/auto/ja.ts
@@ -126,4 +126,5 @@ export default {
   GROUP: "グループメンバーシップ",
   MANUAL: "マニュアルサービス",
   Payment_fee: "支払い料",
+  LICENSE: "ライセンスサービス",
 };
diff --git a/i18n/auto/kk.ts b/i18n/auto/kk.ts
@@ -108,7 +108,7 @@ export default {
   order_done: "Тапсырыс аяқталды",
   order_tip1:
     "! Төлем аяқталғаннан кейін, сатып алынған мазмұнды көру үшін осы беттен оралыңыз.",
-  minutes: "минуттар",
+  minutes: "минуттары",
   seconds: "секіру",
   order_countdown: "Төлемді кері санау",
   sku_desc: "Өнім сипаттамасы",
@@ -126,4 +126,5 @@ export default {
   GROUP: "Топ мүшелігі",
   MANUAL: "Қолмен қызмет",
   Payment_fee: "Төлемақы төлемі",
+  LICENSE: "Лицензиялық қызмет",
 };
diff --git a/i18n/auto/ko.ts b/i18n/auto/ko.ts
@@ -125,4 +125,5 @@ export default {
   GROUP: "그룹 멤버십",
   MANUAL: "수동 서비스",
   Payment_fee: "지불 수수료",
+  LICENSE: "라이센스 서비스",
 };
diff --git a/i18n/auto/pa.ts b/i18n/auto/pa.ts
@@ -127,4 +127,5 @@ export default {
   GROUP: "ਸਮੂਹ ਮੈਂਬਰਸ਼ਿਪ",
   MANUAL: "ਮੈਨੁਅਲ ਸੇਵਾ",
   Payment_fee: "ਭੁਗਤਾਨ ਫੀਸਾਂ",
+  LICENSE: "ਲਾਇਸੰਸ ਸੇਵਾ",
 };
diff --git a/i18n/auto/pl.ts b/i18n/auto/pl.ts
@@ -125,4 +125,5 @@ export default {
   GROUP: "Członkostwo w grupie",
   MANUAL: "Obsługa ręczna",
   Payment_fee: "Opłaty za płatność",
+  LICENSE: "Usługa licencyjna",
 };
diff --git a/i18n/auto/pt.ts b/i18n/auto/pt.ts
@@ -128,4 +128,5 @@ export default {
   GROUP: "Associação ao grupo",
   MANUAL: "Serviço manual",
   Payment_fee: "Taxas de pagamento",
+  LICENSE: "Serviço de licença",
 };
diff --git a/i18n/auto/ru.ts b/i18n/auto/ru.ts
@@ -128,4 +128,5 @@ export default {
   GROUP: "Членство в группе",
   MANUAL: "Ручное обслуживание",
   Payment_fee: "Плата за оплату",
+  LICENSE: "Лицензионная служба",
 };
diff --git a/i18n/auto/tr.ts b/i18n/auto/tr.ts
@@ -125,4 +125,5 @@ export default {
   GROUP: "Grup üyeliği",
   MANUAL: "Manuel hizmet",
   Payment_fee: "Ödeme ücretleri",
+  LICENSE: "Lisans hizmeti",
 };
diff --git a/i18n/auto/uk.ts b/i18n/auto/uk.ts
@@ -44,7 +44,7 @@ export default {
     "Будь ласка, спочатку заповніть інформацію про гаманець",
   server_already_withdrawal_processing: "Вже виведення, яке обробляється",
   server_exceed_max_create_num: "Перевищує максимуну num",
-  server_specific_sku_can_not_empty: "Конкретний предмет не може бути порожнім",
+  server_specific_sku_can_not_empty: "Конкретний елемент не може бути порожнім",
   server_max_one_global_plan: "Максимум один глобальний план",
   server_specific_plan_has_exists_item:
     "Якийсь предмет вже існує в конкретному плані",
@@ -128,4 +128,5 @@ export default {
   GROUP: "Групове членство",
   MANUAL: "Ручне обслуговування",
   Payment_fee: "Платіжні збори",
+  LICENSE: "Служба ліцензії",
 };
diff --git a/i18n/auto/uz.ts b/i18n/auto/uz.ts
@@ -130,4 +130,5 @@ export default {
   GROUP: "Guruh a'zoligi",
   MANUAL: "Qo'lda xizmat",
   Payment_fee: "To'lov to'lovlari",
+  LICENSE: "Litsenziya xizmati",
 };
diff --git a/i18n/auto/zh-HK.ts b/i18n/auto/zh-HK.ts
@@ -121,4 +121,5 @@ export default {
   GROUP: "付費群組",
   MANUAL: "人工交付",
   Payment_fee: "支付通道費",
+  LICENSE: "授權碼",
 };
diff --git a/i18n/en.ts b/i18n/en.ts
@@ -119,4 +119,5 @@ export default {// En
   GROUP: 'Group Membership',
   MANUAL: 'Manual Service',
   Payment_fee: 'Payment fees',
+  LICENSE: 'LICENSE Service',
 }
diff --git a/i18n/zh-CN.ts b/i18n/zh-CN.ts
@@ -119,4 +119,5 @@ export default {// 中文
   GROUP: '付费群组',
   MANUAL: '人工交付',
   Payment_fee: '支付通道费',
+  LICENSE: '授权码',
 }
diff --git a/translate.config.js b/translate.config.js
@@ -90,5 +90,5 @@ const configZh = {
     },
   ]
 }
-//export default defineConfig(configEn)
-export default defineConfig(configZh)
+export default defineConfig(configEn)
+//export default defineConfig(configZh)

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ const filterSkus = (projects, keyword = '') => {`
`13`	`13`	`const showSkus = []`
`14`	`14`
`15`	`15`	`projects.forEach((project) => {`
`16`		`- if (!['DIGITAL', 'MANUAL', 'GROUP'].includes(project.type)) {`
	`16`	`+ if (!['DIGITAL', 'MANUAL', 'LICENSE', 'GROUP'].includes(project.type)) {`
`17`	`17`	`return`
`18`	`18`	`}`
`19`	`19`