From 69da63524713a9b870d4fdbb034350f6a6882f82 Mon Sep 17 00:00:00 2001 From: adonis Date: Tue, 23 Jun 2026 22:31:21 +0330 Subject: [PATCH] fix some bugs --- src/api/wallet.ts | 11 +- src/model/wallet.ts | 16 -- .../components/DashboardQuickWalletModal.vue | 62 ++++---- .../components/CustomerMobileCardList.vue | 9 +- .../components/CustomerMobileDetailSheet.vue | 22 ++- .../base/components/WalletChargeForm.vue | 76 ++------- .../customers/base/components/table.vue | 14 +- src/pages/menuPages/customers/base/index.vue | 145 ++++++++++-------- .../customers/base/utils/walletChargeForm.ts | 40 +---- 9 files changed, 156 insertions(+), 239 deletions(-) diff --git a/src/api/wallet.ts b/src/api/wallet.ts index aeda732..b1146dd 100644 --- a/src/api/wallet.ts +++ b/src/api/wallet.ts @@ -1,19 +1,10 @@ import type { TableInput } from '@core/type/baseTable' import useAxios from '@core/utils/useAxios' -// import { Customer } from '@/model/customer' -import type { Charge, SendWeight, Wallet, WalletChargeTarget, Withdraw } from '@/model/wallet' +import type { Charge, SendWeight, Wallet, Withdraw } from '@/model/wallet' export const getWalletTable = async (params?: TableInput) => await useAxios.post>('/admin/wallet/table', params) -export const getWalletChargeTargets = async () => - await useAxios.get<{ targets: WalletChargeTarget[] }>('/admin/wallet/charge-targets') - -/** شارژ یکپارچه — نقدی یا محصول (product_id=null یعنی ریالی) */ -export const chargeWalletUnified = async (params: Charge) => - await useAxios.post('/admin/wallet/charge_wallet', params) - -/** @deprecated از chargeWalletUnified استفاده کنید */ export const chargeWallet = async (params: Charge, type: 'gold' | 'money') => type === 'money' ? await useAxios.post('/admin/wallet/charge', params) diff --git a/src/model/wallet.ts b/src/model/wallet.ts index fbad0e8..aa7b9b2 100644 --- a/src/model/wallet.ts +++ b/src/model/wallet.ts @@ -54,20 +54,6 @@ export interface Withdraw { export type WalletChargeDirection = 'charge' | 'discharge' -export type WalletChargeTargetKind = 'money' | 'metal' - -export interface WalletChargeTarget { - key: string - kind: WalletChargeTargetKind - label: string - unit: string - product_id?: number | null - metal_id?: number - uses_main_wallet?: boolean - trade_by_quantity?: boolean - group_type?: string -} - export interface Charge { value?: number note?: string @@ -75,8 +61,6 @@ export interface Charge { talabBedehi?: boolean direction?: WalletChargeDirection amountAbs?: number | string - chargeTargetKey?: string | null - product_id?: number | null } export interface WithdrawStatus { diff --git a/src/pages/dashboard/components/DashboardQuickWalletModal.vue b/src/pages/dashboard/components/DashboardQuickWalletModal.vue index 713a3c2..db31175 100644 --- a/src/pages/dashboard/components/DashboardQuickWalletModal.vue +++ b/src/pages/dashboard/components/DashboardQuickWalletModal.vue @@ -2,7 +2,7 @@ -
+
+
+ {{ metalLabel.goldWalletShort() }} +

{{ formatGold(selectedCustomer) }}

+
ریالی

{{ formatCash(selectedCustomer) }}

+
+ + + ریالی + {{ metalLabel.goldWalletShort() }} + +
+
@@ -63,19 +78,18 @@ import { message } from 'ant-design-vue' import BasicActionSheet from '@/components/BasicActionSheet.vue' import WalletChargeForm from '@/pages/menuPages/customers/base/components/WalletChargeForm.vue' import { - applyChargeTarget, buildChargePayload, createEmptyChargeForm, - resolveChargeTarget, walletChargeOkText, walletChargeSuccessMessage, walletChargeTitle, } from '@/pages/menuPages/customers/base/utils/walletChargeForm' import { getCustomersList } from '@/api/customer' -import { chargeWalletUnified, getWalletChargeTargets } from '@/api/wallet' +import { chargeWallet } from '@/api/wallet' import type { Customer } from '@/model/customer' -import type { Charge, Wallet, WalletChargeTarget } from '@/model/wallet' +import type { Charge, Wallet } from '@/model/wallet' import { usePrice } from '@core/utils/usePrice' +import { metalLabel } from '@/utils/adminMetalLabels' const props = defineProps<{ visible: boolean }>() const emit = defineEmits<{ (e: 'update:visible', value: boolean): void }>() @@ -88,7 +102,7 @@ const visibleProxy = computed({ const loading = ref(false) const submitting = ref(false) const customers = ref([]) -const chargeTargets = ref([]) +const walletVariant = ref<'money' | 'gold'>('money') const formCharge = ref(createEmptyChargeForm()) const chargeFormRef = ref>() @@ -110,12 +124,8 @@ const selectedCustomer = computed(() => customers.value.find((customer) => customer.id === formCharge.value.customer_id), ) -const selectedTarget = computed(() => - resolveChargeTarget(chargeTargets.value, formCharge.value.chargeTargetKey), -) - const modalTitle = computed(() => - walletChargeTitle(selectedTarget.value, formCharge.value.direction), + walletChargeTitle(walletVariant.value, formCharge.value.direction), ) const okText = computed(() => walletChargeOkText(formCharge.value.direction)) @@ -129,25 +139,20 @@ function customerWallet(customer: Customer): Wallet | undefined { return Array.isArray(wallet) ? wallet[0] : wallet } +function formatGold(customer: Customer) { + const gold = customerWallet(customer)?.gold ?? customer.wallet_gold ?? customer.gold + return `${Number(gold ?? 0).toLocaleString('fa-IR', { maximumFractionDigits: 3 })} گرم` +} + function formatCash(customer: Customer) { const cash = customerWallet(customer)?.cash ?? customer.wallet_cash return usePrice(Number(cash ?? 0), true, '') } -async function loadChargeTargets() { - const data = await getWalletChargeTargets() - chargeTargets.value = data?.targets ?? [] - const firstTarget = chargeTargets.value[0] - if (firstTarget) { - Object.assign(formCharge.value, applyChargeTarget(formCharge.value, firstTarget)) - } -} - async function loadCustomers() { loading.value = true try { - const [customerList] = await Promise.all([getCustomersList(), loadChargeTargets()]) - customers.value = customerList ?? [] + customers.value = (await getCustomersList()) ?? [] } catch (e) { console.error(e) message.error('خطا در بارگذاری لیست مشتریان') @@ -157,11 +162,8 @@ async function loadCustomers() { } function resetForm() { + walletVariant.value = 'money' formCharge.value = createEmptyChargeForm() - const firstTarget = chargeTargets.value[0] - if (firstTarget) { - Object.assign(formCharge.value, applyChargeTarget(formCharge.value, firstTarget)) - } } function handleClose() { @@ -187,7 +189,7 @@ async function submit() { submitting.value = true try { - await chargeWalletUnified(buildChargePayload(formCharge.value)) + await chargeWallet(buildChargePayload(formCharge.value), walletVariant.value) message.success(walletChargeSuccessMessage(formCharge.value.direction)) closeModal() } catch (e) { @@ -230,7 +232,7 @@ watch( } .dashboard-wallet-modal__balances { - @apply grid grid-cols-1 gap-3 rounded-lg border border-slate-200 bg-slate-50 px-3 py-2.5 text-xs dark:border-slate-600 dark:bg-slate-800/60; + @apply grid grid-cols-2 gap-3 rounded-lg border border-slate-200 bg-slate-50 px-3 py-2.5 text-xs dark:border-slate-600 dark:bg-slate-800/60; } .dashboard-wallet-modal__footer { diff --git a/src/pages/menuPages/customers/base/components/CustomerMobileCardList.vue b/src/pages/menuPages/customers/base/components/CustomerMobileCardList.vue index ca36f63..680e41e 100644 --- a/src/pages/menuPages/customers/base/components/CustomerMobileCardList.vue +++ b/src/pages/menuPages/customers/base/components/CustomerMobileCardList.vue @@ -26,7 +26,8 @@ @edit="forwardAndClose('edit', $event)" @archive="forwardAndClose('archive', $event)" @toggleActive="forward('toggleActive', $event)" - @chargeWallet="forwardAndClose('chargeWallet', $event)" + @chargeMoney="forwardAndClose('chargeMoney', $event)" + @chargeGold="forwardAndClose('chargeGold', $event)" @toggleTrade="forward('toggleTrade', $event)" @confirmUser="forwardAndClose('confirmUser', $event)" /> @@ -55,7 +56,8 @@ const emit = defineEmits<{ (e: 'edit', item: Customer): void (e: 'archive', item: Customer): void (e: 'toggleActive', item: Customer): void - (e: 'chargeWallet', item: Customer): void + (e: 'chargeMoney', item: Customer): void + (e: 'chargeGold', item: Customer): void (e: 'toggleTrade', item: Customer): void (e: 'confirmUser', item: Customer): void }>() @@ -67,7 +69,8 @@ type SheetAction = | 'edit' | 'archive' | 'toggleActive' - | 'chargeWallet' + | 'chargeMoney' + | 'chargeGold' | 'toggleTrade' | 'confirmUser' diff --git a/src/pages/menuPages/customers/base/components/CustomerMobileDetailSheet.vue b/src/pages/menuPages/customers/base/components/CustomerMobileDetailSheet.vue index c5e63e9..b601f20 100644 --- a/src/pages/menuPages/customers/base/components/CustomerMobileDetailSheet.vue +++ b/src/pages/menuPages/customers/base/components/CustomerMobileDetailSheet.vue @@ -4,15 +4,12 @@

{{ row.name || '-' }}

{{ row.mobile }}

-
- - شارژ / دشارژ کیف پول +
+ + شارژ ریالی + + + {{ metalLabel.goldChargeShort() }} () @@ -136,7 +134,7 @@ const visibleProxy = computed({ set: (value: boolean) => emit('update:visible', value) }) -type SheetEmit = 'archive' | 'chargeWallet' | 'info' | 'confirmUser' | 'edit' +type SheetEmit = 'archive' | 'chargeMoney' | 'chargeGold' | 'info' | 'confirmUser' | 'edit' function closeAndEmit(event: SheetEmit, row: Customer) { visibleProxy.value = false diff --git a/src/pages/menuPages/customers/base/components/WalletChargeForm.vue b/src/pages/menuPages/customers/base/components/WalletChargeForm.vue index 0b235ff..5f9b8b4 100644 --- a/src/pages/menuPages/customers/base/components/WalletChargeForm.vue +++ b/src/pages/menuPages/customers/base/components/WalletChargeForm.vue @@ -6,18 +6,6 @@ class="wallet-charge-form" :class="formClass" > - - - - -
+
معادل {{ usePrice(Number(modelValue.amountAbs) / 10, true, 'تومان') }}
@@ -63,46 +51,23 @@