Merge pull request #8 from iDataRiver/manual-service

support manual service

Author: iDataRiver

components/Home/Theme1.vue

@@ -13,7 +13,7 @@ const filterSkus = (projects, keyword = '') => {
   const showSkus = []
 
   projects.forEach((project) => {
-    if (!['DIGITAL', 'GROUP'].includes(project.type)) {
+    if (!['DIGITAL', 'MANUAL', 'GROUP'].includes(project.type)) {
       return
     }
 
@@ -33,6 +33,7 @@ const filterSkus = (projects, keyword = '') => {
       sku.cover = project.cover
       sku.project = {
         id: project.id,
+        type: project.type,
         name: project.name,
         nameI18n: project.nameI18n,
         desc: project.desc,

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', 'GROUP'].includes(project.type)) {
+  if (!['DIGITAL', 'MANUAL', 'GROUP'].includes(project.type)) {
     return
   }
   cates.value.push({
@@ -25,6 +25,7 @@ projects.forEach((project) => {
     sku.cover = project.cover
     sku.project = {
       id: project.id,
+      type: project.type,
       name: project.name,
       nameI18n: project.nameI18n,
       desc: project.desc,
@@ -90,7 +91,7 @@ onMounted(() => {
         <div class="space-y-4">
           <template v-for="project in projects">
             <template
-              v-if="['DIGITAL', 'GROUP'].includes(project.type) && project.skus.length > 0 && ['all', project.slug].includes(selectedCate.code)">
+              v-if="['DIGITAL', 'MANUAL', '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"

components/OrderDetailDigital.vue

@@ -69,6 +69,7 @@ const isHiicashEnabled = () => {
         <div class="text-xl font-bold text-gray-800">{{ nameI18n(locale, order.sku) }}</div>
 
         <div class="mb-2 sm:space-x-2 space-y-2">
+          <span class="badge badge-sm font-medium badge-outline rounded-md">{{ $t(order.projectType) }}</span>
           <span v-if="order.sku.itemType === 'reuse'" class="badge badge-sm font-medium badge-outline rounded-md">
             {{ $t('at_most_buy_one') }}
           </span>
@@ -174,7 +175,7 @@ const isHiicashEnabled = () => {
       </div>
     </div>
 
-    <div v-if="isNotEmptyObj(order) && order.digitalItemsStr !== ''" class="space-y-4">
+    <div v-if="isNotEmptyObj(order) && order.digitalItemsStr" class="space-y-4">
       <div class="border-t"></div>
 
       <div id="digitalItems" class="grid grid-cols-1 space-y-2">

components/PlaceOrder.vue

@@ -94,15 +94,17 @@ const clear = () => {
               <div class="badge badge-sm font-medium badge-outline rounded-md">
                 {{ $t('stock') }} {{ displayStock(sku.stock, sku.hiddenStock) }}
               </div>
-              <div v-if="sku.itemType === 'reuse'" class="badge badge-sm font-medium badge-outline rounded-md">
+              <span class="badge badge-sm font-medium badge-outline rounded-md">{{ $t(sku.project.type) }}</span>
+              <div v-if="sku.project.type === 'DIGITAL' && sku.itemType === 'reuse'"
+                class="badge badge-sm font-medium badge-outline rounded-md">
                 {{ $t('at_most_buy_one') }}
               </div>
-              <div class="badge badge-sm font-medium badge-outline rounded-md">
+              <div v-if="sku.project.type === 'DIGITAL'" class="badge badge-sm font-medium badge-outline rounded-md">
                 {{ $t('automatic_delivery') }}
               </div>
             </div>
 
-            <div class="space-y-2 mt-8">
+            <div class="space-y-2 mt-4">
               <label :for="'quantity-input-' + sku.id" class="flex text-sm font-medium text-gray-700">
                 {{ $t('Quantity') }}
               </label>

i18n/auto/ar.ts

@@ -118,4 +118,7 @@ export default {
   hiicash_vendor_tip: "لشراء قسائم hiicash.",
   Search: "يبحث",
   product_name: "اسم المنتج",
+  DIGITAL: "المنتج الرقمي",
+  GROUP: "عضوية المجموعة",
+  MANUAL: "الخدمة اليدوية",
 };

i18n/auto/de.ts

@@ -129,4 +129,7 @@ export default {
   hiicash_vendor_tip: "Hiicash -Gutscheine kaufen.",
   Search: "Suchen",
   product_name: "Produktname",
+  DIGITAL: "Digitales Produkt",
+  GROUP: "Gruppenmitgliedschaft",
+  MANUAL: "Manueller Service",
 };

i18n/auto/es.ts

@@ -129,4 +129,7 @@ export default {
   hiicash_vendor_tip: "Comprar cupones Hiicash.",
   Search: "Buscar",
   product_name: "Nombre del producto",
+  DIGITAL: "Producto digital",
+  GROUP: "Membresía del grupo",
+  MANUAL: "Servicio manual",
 };

i18n/auto/fa.ts

@@ -123,4 +123,7 @@ export default {
   hiicash_vendor_tip: "برای خرید کوپن Hiicash.",
   Search: "جستجو",
   product_name: "نام محصول",
+  DIGITAL: "محصول دیجیتالی",
+  GROUP: "عضویت گروهی",
+  MANUAL: "سرویس دستی",
 };

i18n/auto/fr.ts

@@ -127,4 +127,7 @@ export default {
   hiicash_vendor_tip: "Pour acheter des bons Hiicash.",
   Search: "Recherche",
   product_name: "Nom de produit",
+  DIGITAL: "Produit numérique",
+  GROUP: "Appartenance à un groupe",
+  MANUAL: "Service manuel",
 };

i18n/auto/ja.ts

@@ -122,4 +122,7 @@ export default {
   hiicash_vendor_tip: "Hiicashバウチャーを購入します。",
   Search: "検索",
   product_name: "製品名",
+  DIGITAL: "デジタル製品",
+  GROUP: "グループメンバーシップ",
+  MANUAL: "マニュアルサービス",
 };