Compare commits

...
5 Commits
10 changed files with 139 additions and 42 deletions
@@ -53,3 +53,8 @@
- 2026-11-01 | درخواست تبدیل سیم | `convert/CopperConvertCalculator.vue` + `useCopperConvertPage.ts` + سرور `CopperConvertRequestService` + ادمین `hesabKetab.ts` فرزند `copperConvertMain` | حلقه صحیح؛ منوی ادمین زیر حساب کتاب نه منوی اصلی - 2026-11-01 | درخواست تبدیل سیم | `convert/CopperConvertCalculator.vue` + `useCopperConvertPage.ts` + سرور `CopperConvertRequestService` + ادمین `hesabKetab.ts` فرزند `copperConvertMain` | حلقه صحیح؛ منوی ادمین زیر حساب کتاب نه منوی اصلی
- 2026-11-01 | ۵۰۰ لیست تبدیل | `2026_11_01_000001_create_copper_convert_requests_table.php` | git pull کافی نیست؛ بدون `php artisan migrate` جدول نیست و GET ادمین ۵۰۰ می‌دهد - 2026-11-01 | ۵۰۰ لیست تبدیل | `2026_11_01_000001_create_copper_convert_requests_table.php` | git pull کافی نیست؛ بدون `php artisan migrate` جدول نیست و GET ادمین ۵۰۰ می‌دهد
- 2026-11-01 | جدول درخواست تبدیل | ادمین `copperConvert/components/table.vue` | دسکتاپ BaseTable؛ موبایل `CopperConvertMobileCardList` مثل بقیه صفحات - 2026-11-01 | جدول درخواست تبدیل | ادمین `copperConvert/components/table.vue` | دسکتاپ BaseTable؛ موبایل `CopperConvertMobileCardList` مثل بقیه صفحات
- 2026-11-01 | ترتیب ۱.۵ و mm² | `convert/components/CopperConvertCalculator.vue` | صفحه rtl است؛ نشان و برچسب سیم با `dir="ltr"` تا اول مقطع بیاید بعد mm²
- 2026-11-01 | جای واحد و عدد در تبدیل | `CopperConvertCalculator.vue` + `useCopperConvertPage.ts` | ریال/کیلو/عدد با `bdi` داخل `measure` قبل از عدد؛ باکس مقدار `dir=ltr`
- 2026-11-01 | ماشین‌حساب اجرت/سود/مالیات | `components/GoldDayCalculatorModal.vue` | اجرت ساخت مفتول؛ سود مورد انتظار جدا؛ مالیات ارزش افزوده روی (هزینه+اجرت+سود)
- 2026-11-01 | پلیس‌هولدر هشدار قیمت | user `priceTrigger/components/PriceTriggerForm.vue` + admin `priceTriggers/components/PriceTriggerEditorFormBody.vue` | «آبشده، سکه، نقره و ...» → «کاتد مس، مفتول مس و...»
- 2026-11-01 | تاریخچه برداشت کیف پول | `wallet/mobile/MobileWalletView.vue` + `desktop/DesktopWalletView.vue` + `useWalletPageData.ts` | `walletWithdrawItems` از قبل لود می‌شد؛ زیر راهنمای برداشت و زیر حساب‌های دسکتاپ نشان داده می‌شود
+25 -9
View File
@@ -37,17 +37,25 @@
<BasicInput <BasicInput
v-model:value="feePercent" v-model:value="feePercent"
title="اجرت ساخت (%)" title="اجرت ساخت مفتول (%)"
type="tel" type="tel"
place-holder="مثلاً ۷" place-holder="مثلاً ۷"
inputmode="decimal" inputmode="decimal"
/> />
<BasicInput <BasicInput
v-model:value="taxPercent" v-model:value="profitPercent"
title="سود و مالیات (%)" title="سود مورد انتظار (%)"
type="tel" type="tel"
place-holder="مثلاً ۹" place-holder="مثلاً ۵"
inputmode="decimal"
/>
<BasicInput
v-model:value="taxPercent"
title="مالیات ارزش افزوده (%)"
type="tel"
place-holder="مثلاً ۱۰"
inputmode="decimal" inputmode="decimal"
/> />
@@ -63,11 +71,15 @@
<span class="gold-day-calc__num">{{ formatRial(breakdown.goldCost) }}</span> <span class="gold-day-calc__num">{{ formatRial(breakdown.goldCost) }}</span>
</div> </div>
<div class="flex justify-between gap-2"> <div class="flex justify-between gap-2">
<span>اجرت</span> <span>اجرت ساخت مفتول</span>
<span class="gold-day-calc__num">{{ formatRial(breakdown.feeCost) }}</span> <span class="gold-day-calc__num">{{ formatRial(breakdown.feeCost) }}</span>
</div> </div>
<div class="flex justify-between gap-2"> <div class="flex justify-between gap-2">
<span>سود و مالیات</span> <span>سود مورد انتظار</span>
<span class="gold-day-calc__num">{{ formatRial(breakdown.profitCost) }}</span>
</div>
<div class="flex justify-between gap-2">
<span>مالیات ارزش افزوده</span>
<span class="gold-day-calc__num">{{ formatRial(breakdown.taxCost) }}</span> <span class="gold-day-calc__num">{{ formatRial(breakdown.taxCost) }}</span>
</div> </div>
</div> </div>
@@ -109,6 +121,7 @@ const weightUnit = computed(() => settingsStore.tradeWeightUnit)
const weight = ref<string | number>('') const weight = ref<string | number>('')
const feePercent = ref<string | number>('') const feePercent = ref<string | number>('')
const profitPercent = ref<string | number>('')
const taxPercent = ref<string | number>('') const taxPercent = ref<string | number>('')
const tick = ref(0) const tick = ref(0)
@@ -139,13 +152,16 @@ const breakdown = computed(() => {
void tick.value void tick.value
const w = parseNum(weight.value) const w = parseNum(weight.value)
const fee = parseNum(feePercent.value) const fee = parseNum(feePercent.value)
const profit = parseNum(profitPercent.value)
const tax = parseNum(taxPercent.value) const tax = parseNum(taxPercent.value)
const unit = liveUnitPrice.value const unit = liveUnitPrice.value
const goldCost = w * unit const goldCost = w * unit
const feeCost = goldCost * (fee / 100) const feeCost = goldCost * (fee / 100)
const taxCost = (goldCost + feeCost) * (tax / 100) const afterFee = goldCost + feeCost
const total = goldCost + feeCost + taxCost const profitCost = afterFee * (profit / 100)
return { goldCost, feeCost, taxCost, total } const taxCost = (afterFee + profitCost) * (tax / 100)
const total = afterFee + profitCost + taxCost
return { goldCost, feeCost, profitCost, taxCost, total }
}) })
const formattedTotal = computed(() => formatRial(breakdown.value.total)) const formattedTotal = computed(() => formatRial(breakdown.value.total))
@@ -21,7 +21,10 @@
:class="{ 'copper-convert__chip--muted': row.missing }" :class="{ 'copper-convert__chip--muted': row.missing }"
> >
<span class="copper-convert__chip-label">{{ row.label }}</span> <span class="copper-convert__chip-label">{{ row.label }}</span>
<span class="copper-convert__chip-value" dir="ltr">{{ row.value }}</span> <span class="copper-convert__measure">
<bdi v-if="row.unit">{{ row.unit }}</bdi>
<bdi>{{ row.value }}</bdi>
</span>
</li> </li>
</ul> </ul>
</div> </div>
@@ -35,7 +38,10 @@
class="copper-convert__chip copper-convert__chip--accent" class="copper-convert__chip copper-convert__chip--accent"
> >
<span class="copper-convert__chip-label">{{ row.label }}</span> <span class="copper-convert__chip-label">{{ row.label }}</span>
<span class="copper-convert__chip-value" dir="ltr">{{ row.value }}</span> <span class="copper-convert__measure">
<bdi v-if="row.unit">{{ row.unit }}</bdi>
<bdi>{{ row.value }}</bdi>
</span>
</li> </li>
</ul> </ul>
</div> </div>
@@ -60,12 +66,12 @@
<div class="copper-convert__weight"> <div class="copper-convert__weight">
<label class="copper-convert__field-label">مقدار</label> <label class="copper-convert__field-label">مقدار</label>
<div class="copper-convert__weight-wrap"> <div class="copper-convert__weight-wrap" dir="ltr">
<span class="copper-convert__weight-value" dir="ltr">{{ formatAssetAmount(sliderAmount) }}</span> <span class="copper-convert__weight-value">{{ formatAssetAmount(sliderAmount) }}</span>
<span class="copper-convert__weight-unit">{{ assetUnit }}</span> <span class="copper-convert__weight-unit">{{ assetUnit }}</span>
</div> </div>
<p class="copper-convert__asset-hint"> <p class="copper-convert__asset-hint">
<template v-if="assetAmount > 0">از دارایی شما؛ انتهای زبانه {{ formatAssetAmount(assetAmount) }} {{ assetUnit }} است</template> <template v-if="assetAmount > 0">از دارایی شما؛ انتهای زبانه <span class="copper-convert__measure"><bdi>{{ assetUnit }}</bdi><bdi>{{ formatAssetAmount(assetAmount) }}</bdi></span> است</template>
<template v-else>موجودی این دارایی صفر است.</template> <template v-else>موجودی این دارایی صفر است.</template>
</p> </p>
<div <div
@@ -85,7 +91,7 @@
</div> </div>
<div class="copper-convert__slider-scale"> <div class="copper-convert__slider-scale">
<span>۰</span> <span>۰</span>
<span dir="ltr">{{ formatAssetAmount(assetAmount) }} {{ assetUnit }}</span> <span class="copper-convert__measure"><bdi>{{ assetUnit }}</bdi><bdi>{{ formatAssetAmount(assetAmount) }}</bdi></span>
</div> </div>
</div> </div>
</section> </section>
@@ -98,12 +104,12 @@
<div class="copper-convert__rings"> <div class="copper-convert__rings">
<article class="copper-convert__ring-card"> <article class="copper-convert__ring-card">
<span class="copper-convert__ring-badge">۱.۵ mm²</span> <span class="copper-convert__ring-badge" dir="ltr">۱.۵ mm²</span>
<p class="copper-convert__ring-count" dir="ltr">{{ formatRings(result.rings15ByValue) }}</p> <p class="copper-convert__ring-count" dir="ltr">{{ formatRings(result.rings15ByValue) }}</p>
<p class="copper-convert__ring-caption">حلقه سیم</p> <p class="copper-convert__ring-caption">حلقه سیم</p>
</article> </article>
<article class="copper-convert__ring-card"> <article class="copper-convert__ring-card">
<span class="copper-convert__ring-badge">۲.۵ mm²</span> <span class="copper-convert__ring-badge" dir="ltr">۲.۵ mm²</span>
<p class="copper-convert__ring-count" dir="ltr">{{ formatRings(result.rings25ByValue) }}</p> <p class="copper-convert__ring-count" dir="ltr">{{ formatRings(result.rings25ByValue) }}</p>
<p class="copper-convert__ring-caption">حلقه سیم</p> <p class="copper-convert__ring-caption">حلقه سیم</p>
</article> </article>
@@ -112,11 +118,11 @@
<div class="copper-convert__summary"> <div class="copper-convert__summary">
<div class="copper-convert__summary-row"> <div class="copper-convert__summary-row">
<span>ارزش معادل</span> <span>ارزش معادل</span>
<strong dir="ltr">{{ formatRial(result.totalValueRial) }} <small>ریال</small></strong> <strong class="copper-convert__measure"><small>ریال</small><bdi>{{ formatRial(result.totalValueRial) }}</bdi></strong>
</div> </div>
<div class="copper-convert__summary-row"> <div class="copper-convert__summary-row">
<span>معادل مفتول</span> <span>معادل مفتول</span>
<strong dir="ltr">{{ formatKg(result.equivalentMaftoulKg) }} <small>کیلو</small></strong> <strong class="copper-convert__measure"><small>کیلو</small><bdi>{{ formatKg(result.equivalentMaftoulKg) }}</bdi></strong>
</div> </div>
</div> </div>
</section> </section>
@@ -127,13 +133,13 @@
<span class="copper-convert__result-title">تقسیم بین دو سیم</span> <span class="copper-convert__result-title">تقسیم بین دو سیم</span>
</div> </div>
<p class="copper-convert__asset-hint"> <p class="copper-convert__asset-hint">
مانده {{ formatAssetAmount(remainderAmount) }} {{ assetUnit }} است. هر زبانه فقط عدد صحیح حلقه است؛ اعشاری که به یک حلقه نرسد در دارایی می‌ماند. مانده <span class="copper-convert__measure"><bdi>{{ assetUnit }}</bdi><bdi>{{ formatAssetAmount(remainderAmount) }}</bdi></span> است. هر زبانه فقط عدد صحیح حلقه است؛ اعشاری که به یک حلقه نرسد در دارایی می‌ماند.
</p> </p>
<div class="copper-convert__weight"> <div class="copper-convert__weight">
<label class="copper-convert__field-label">سیم ۱.۵ mm²</label> <label class="copper-convert__field-label">سیم <span dir="ltr">۱.۵ mm²</span></label>
<div class="copper-convert__weight-wrap"> <div class="copper-convert__weight-wrap" dir="ltr">
<span class="copper-convert__weight-value" dir="ltr">{{ wire15Rings }}</span> <span class="copper-convert__weight-value">{{ wire15Rings }}</span>
<span class="copper-convert__weight-unit">عدد حلقه</span> <span class="copper-convert__weight-unit">عدد حلقه</span>
</div> </div>
<div <div
@@ -153,14 +159,14 @@
</div> </div>
<div class="copper-convert__slider-scale"> <div class="copper-convert__slider-scale">
<span>۰</span> <span>۰</span>
<span dir="ltr">{{ maxRings15 }} عدد حلقه</span> <span class="copper-convert__measure"><bdi>عدد حلقه</bdi><bdi>{{ maxRings15 }}</bdi></span>
</div> </div>
</div> </div>
<div class="copper-convert__weight"> <div class="copper-convert__weight">
<label class="copper-convert__field-label">سیم ۲.۵ mm²</label> <label class="copper-convert__field-label">سیم <span dir="ltr">۲.۵ mm²</span></label>
<div class="copper-convert__weight-wrap"> <div class="copper-convert__weight-wrap" dir="ltr">
<span class="copper-convert__weight-value" dir="ltr">{{ wire25Rings }}</span> <span class="copper-convert__weight-value">{{ wire25Rings }}</span>
<span class="copper-convert__weight-unit">عدد حلقه</span> <span class="copper-convert__weight-unit">عدد حلقه</span>
</div> </div>
<div <div
@@ -180,12 +186,12 @@
</div> </div>
<div class="copper-convert__slider-scale"> <div class="copper-convert__slider-scale">
<span>۰</span> <span>۰</span>
<span dir="ltr">{{ maxRings25 }} عدد حلقه</span> <span class="copper-convert__measure"><bdi>عدد حلقه</bdi><bdi>{{ maxRings25 }}</bdi></span>
</div> </div>
</div> </div>
<p class="copper-convert__asset-hint"> <p class="copper-convert__asset-hint">
اعشار مانده: {{ formatAssetAmount(leftoverAmount) }} {{ assetUnit }} نگه داشته می‌شود. اعشار مانده: <span class="copper-convert__measure"><bdi>{{ assetUnit }}</bdi><bdi>{{ formatAssetAmount(leftoverAmount) }}</bdi></span> نگه داشته می‌شود.
</p> </p>
<BasicButton <BasicButton
type="primary" type="primary"
@@ -252,11 +258,11 @@ function formatAssetAmount(value: number) {
} }
function sliderTip(value?: number) { function sliderTip(value?: number) {
return `${formatAssetAmount(Number(value ?? 0))} ${assetUnit.value}` return `${assetUnit.value} ${formatAssetAmount(Number(value ?? 0))}`
} }
function ringTip(value?: number) { function ringTip(value?: number) {
return `${Math.floor(Number(value ?? 0))} عدد حلقه` return `عدد حلقه ${Math.floor(Number(value ?? 0))}`
} }
function formatRial(value: number) { function formatRial(value: number) {
@@ -371,17 +377,14 @@ function formatRings(value: number) {
border-color: #d4e3de; border-color: #d4e3de;
} }
.copper-convert__chip--muted .copper-convert__chip-value {
color: #94a3b8;
}
.copper-convert__chip-label { .copper-convert__chip-label {
font-size: 0.625rem; font-size: 0.625rem;
line-height: 1.45; line-height: 1.45;
color: #64748b; color: #64748b;
} }
.copper-convert__chip-value { .copper-convert__chip-value,
.copper-convert__price-grid .copper-convert__measure {
font-size: 0.6875rem; font-size: 0.6875rem;
font-weight: 700; font-weight: 700;
color: #0f172a; color: #0f172a;
@@ -390,6 +393,17 @@ function formatRings(value: number) {
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.copper-convert__measure {
display: inline-flex;
direction: ltr;
align-items: baseline;
gap: 0.25rem;
}
.copper-convert__chip--muted .copper-convert__measure {
color: #94a3b8;
}
.copper-convert__form, .copper-convert__form,
.copper-convert__split { .copper-convert__split {
display: flex; display: flex;
@@ -451,7 +465,7 @@ function formatRings(value: number) {
font-weight: 800; font-weight: 800;
color: #0f172a; color: #0f172a;
direction: ltr; direction: ltr;
text-align: right; text-align: left;
} }
.copper-convert__asset-hint { .copper-convert__asset-hint {
@@ -289,7 +289,8 @@ export function useCopperConvertPage() {
const p = prices.value const p = prices.value
const row = (label: string, amount: number) => ({ const row = (label: string, amount: number) => ({
label, label,
value: amount > 0 ? `${Math.round(amount).toLocaleString('en-US')} ریال` : '—', value: amount > 0 ? Math.round(amount).toLocaleString('en-US') : '—',
unit: amount > 0 ? 'ریال' : '',
missing: amount <= 0, missing: amount <= 0,
}) })
return [ return [
@@ -12,7 +12,7 @@
v-model:value="form.product_id" v-model:value="form.product_id"
:items="products" :items="products"
key-name="id" key-name="id"
placeholder="آبشده، سکه، نقره و ..." placeholder="کاتد مس، مفتول مس و..."
size="large" size="large"
value-name="title" value-name="title"
/> />
@@ -25,6 +25,7 @@ import {
loadMoreWalletDeposits, loadMoreWalletDeposits,
loadMoreWalletWithdrawals, loadMoreWalletWithdrawals,
refreshWalletCards, refreshWalletCards,
reloadWalletWithdrawals,
walletCardItems, walletCardItems,
walletDepositItems, walletDepositItems,
walletWithdrawItems, walletWithdrawItems,
@@ -256,6 +257,7 @@ export function useWalletPage() {
extra_note: extraNote.value.trim() || undefined, extra_note: extraNote.value.trim() || undefined,
}) })
await walletStore.getMyWallet() await walletStore.getMyWallet()
await reloadWalletWithdrawals()
await message.success('عملیات با موفقیت انجام شد') await message.success('عملیات با موفقیت انجام شد')
withdrawInfModal.value = true withdrawInfModal.value = true
resetData() resetData()
@@ -284,6 +286,11 @@ export function useWalletPage() {
await loadSupportMessengerFromSettings(true) await loadSupportMessengerFromSettings(true)
}) })
watch(isDeposit, () => {
const el = activeDepositScrollEl.value
if (el) el.scrollTop = 0
})
if (!userStore.isSingle) { if (!userStore.isSingle) {
useInfiniteScroll( useInfiniteScroll(
activeDepositScrollEl, activeDepositScrollEl,
@@ -119,6 +119,16 @@ export async function loadMoreWalletDeposits() {
await fetchDepositPage(true) await fetchDepositPage(true)
} }
export async function reloadWalletWithdrawals() {
walletWithdrawPagination.value.page = 0
try {
walletWithdrawTableOutput.value = await getTransactionTable(walletWithdrawPagination.value)
walletWithdrawItems.value = [...(walletWithdrawTableOutput.value?.rows ?? [])]
} catch (error) {
console.error('Wallet withdraw table error:', error)
}
}
export async function loadMoreWalletWithdrawals() { export async function loadMoreWalletWithdrawals() {
if ( if (
!walletWithdrawTableOutput.value !walletWithdrawTableOutput.value
@@ -159,6 +159,25 @@
@add-account="showAddCard = true" @add-account="showAddCard = true"
@card-deleted="getCards" @card-deleted="getCards"
/> />
<div class="dwallet-side__header dwallet-side__header--split">
<h3 class="dwallet-side__title">تاریخچه برداشت</h3>
</div>
<div
:ref="(node) => { desktopDepositScrollEl = (node as HTMLElement | null) }"
class="dwallet-side__scroll"
>
<list-anim v-if="!loading" :numberItemsAnim="4">
<Item v-for="item in withdrawItems" :key="item.id" :item="item" />
<TransactionSkeleton v-if="loadingMore" class="mt-1 mb-4" />
</list-anim>
<div v-else class="dwallet-side__skeletons">
<TransactionSkeleton v-for="i in 6" :key="i" class="mt-1" />
</div>
<p v-if="!loading && !withdrawItems.length" class="dwallet-side__empty">
تراکنش برداشتی ثبت نشده است.
</p>
</div>
</template> </template>
</section> </section>
</div> </div>
@@ -187,6 +206,7 @@ const {
disableButton, disableButton,
cardItems, cardItems,
depositItems, depositItems,
withdrawItems,
loading, loading,
loadingMore, loadingMore,
desktopDepositScrollEl, desktopDepositScrollEl,
@@ -201,6 +201,12 @@
justify-content: space-between; justify-content: space-between;
gap: 12px; gap: 12px;
padding: 20px 24px 0; padding: 20px 24px 0;
&--split {
margin-top: 4px;
padding-top: 16px;
border-top: 1px solid #f1f5f9;
}
} }
&__title { &__title {
@@ -117,20 +117,23 @@
class="wallet-withdraw-guide-panel relative z-10" class="wallet-withdraw-guide-panel relative z-10"
> >
<BoursecuWithdrawGuide /> <BoursecuWithdrawGuide />
<p class="wallet-history-title">تاریخچه برداشت</p>
</div> </div>
<div <div
v-if="isDeposit"
:ref="(node) => { mobileDepositScrollEl = (node as HTMLElement | null) }" :ref="(node) => { mobileDepositScrollEl = (node as HTMLElement | null) }"
:class="loading ? 'h-screen' : ''" :class="loading ? 'h-screen' : ''"
class="px-3 overflow-y-scroll w-full h-[49vh] pb-16" class="px-3 overflow-y-scroll w-full h-[49vh] pb-16"
style="max-height: var(--mpage-scroll-max-height)" style="max-height: var(--mpage-scroll-max-height)"
> >
<list-anim v-if="!loading" :numberItemsAnim="4"> <list-anim v-if="!loading" :numberItemsAnim="4">
<Item v-for="item in depositItems" :key="item.id" :item="item" /> <Item v-for="item in (isDeposit ? depositItems : withdrawItems)" :key="item.id" :item="item" />
<TransactionSkeleton v-if="loadingMore" class="mt-1 mb-8" /> <TransactionSkeleton v-if="loadingMore" class="mt-1 mb-8" />
</list-anim> </list-anim>
<TransactionSkeleton v-for="i in 13" v-else :key="i" class="mt-1" /> <TransactionSkeleton v-for="i in 13" v-else :key="i" class="mt-1" />
<p v-if="!loading && !(isDeposit ? depositItems : withdrawItems).length" class="wallet-history-empty">
{{ isDeposit ? 'تراکنش واریزی ثبت نشده است.' : 'تراکنش برداشتی ثبت نشده است.' }}
</p>
</div> </div>
</div> </div>
</div> </div>
@@ -158,6 +161,7 @@ const {
disableButton, disableButton,
cardItems, cardItems,
depositItems, depositItems,
withdrawItems,
loading, loading,
loadingMore, loadingMore,
mobileDepositScrollEl, mobileDepositScrollEl,
@@ -180,7 +184,21 @@ const {
.wallet-withdraw-guide-panel { .wallet-withdraw-guide-panel {
margin-top: 1.25rem; margin-top: 1.25rem;
padding-bottom: 1rem; padding-bottom: 0.25rem;
}
.wallet-history-title {
margin: 1rem 0 0;
font-size: 0.875rem;
font-weight: 700;
color: #111827;
}
.wallet-history-empty {
margin: 0.75rem 0 0;
text-align: center;
font-size: 0.75rem;
color: #9ca3af;
} }
@media screen and (min-width: 426px) { @media screen and (min-width: 426px) {