diff --git a/public/54136786.txt b/public/54136786.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/assets/img/banks/ayandeh.png b/src/assets/img/banks/ayandeh.png index 0613a27..7f4810e 100644 Binary files a/src/assets/img/banks/ayandeh.png and b/src/assets/img/banks/ayandeh.png differ diff --git a/src/assets/img/banks/keshavarzi.png b/src/assets/img/banks/keshavarzi.png index 6ba6c44..23b1ef3 100644 Binary files a/src/assets/img/banks/keshavarzi.png and b/src/assets/img/banks/keshavarzi.png differ diff --git a/src/assets/img/banks/mellat.png b/src/assets/img/banks/mellat.png index cc54aa6..19e2621 100644 Binary files a/src/assets/img/banks/mellat.png and b/src/assets/img/banks/mellat.png differ diff --git a/src/assets/img/banks/parsiyan.png b/src/assets/img/banks/parsiyan.png new file mode 100644 index 0000000..dfde304 Binary files /dev/null and b/src/assets/img/banks/parsiyan.png differ diff --git a/src/assets/img/banks/pasargad.png b/src/assets/img/banks/pasargad.png index b4e3829..03a3743 100644 Binary files a/src/assets/img/banks/pasargad.png and b/src/assets/img/banks/pasargad.png differ diff --git a/src/assets/img/banks/refah-alt.png b/src/assets/img/banks/refah-alt.png deleted file mode 100644 index 5ac59bd..0000000 Binary files a/src/assets/img/banks/refah-alt.png and /dev/null differ diff --git a/src/assets/img/banks/refah.png b/src/assets/img/banks/refah.png index 8850d8b..91e6417 100644 Binary files a/src/assets/img/banks/refah.png and b/src/assets/img/banks/refah.png differ diff --git a/src/assets/img/banks/saderat.png b/src/assets/img/banks/saderat.png new file mode 100644 index 0000000..0ea8e86 Binary files /dev/null and b/src/assets/img/banks/saderat.png differ diff --git a/src/assets/img/banks/sanatomadan.png b/src/assets/img/banks/sanatomadan.png new file mode 100644 index 0000000..8635f90 Binary files /dev/null and b/src/assets/img/banks/sanatomadan.png differ diff --git a/src/assets/img/banks/sarmayeh.png b/src/assets/img/banks/sarmayeh.png index e0dd11c..f17a241 100644 Binary files a/src/assets/img/banks/sarmayeh.png and b/src/assets/img/banks/sarmayeh.png differ diff --git a/src/assets/img/banks/sepah.png b/src/assets/img/banks/sepah.png new file mode 100644 index 0000000..1012546 Binary files /dev/null and b/src/assets/img/banks/sepah.png differ diff --git a/src/utils/bankBranding.ts b/src/utils/bankBranding.ts index b0f1dbe..952538f 100644 --- a/src/utils/bankBranding.ts +++ b/src/utils/bankBranding.ts @@ -2,10 +2,14 @@ import ayandehLogo from '@/assets/img/banks/ayandeh.png' import keshavarziLogo from '@/assets/img/banks/keshavarzi.png' import mellatLogo from '@/assets/img/banks/mellat.png' import melliLogo from '@/assets/img/banks/melli.png' +import parsiyanLogo from '@/assets/img/banks/parsiyan.png' import pasargadLogo from '@/assets/img/banks/pasargad.png' import refahLogo from '@/assets/img/banks/refah.png' +import saderatLogo from '@/assets/img/banks/saderat.png' import samanLogo from '@/assets/img/banks/saman.png' +import sanatomadanLogo from '@/assets/img/banks/sanatomadan.png' import sarmayehLogo from '@/assets/img/banks/sarmayeh.png' +import sepahLogo from '@/assets/img/banks/sepah.png' const BANK_ACCENT_COLORS: Record = { 'بانک پاسارگاد': '#1f7a54', @@ -16,6 +20,7 @@ const BANK_ACCENT_COLORS: Record = { 'SAMAN': '#2f63d8', 'بانک پارسیان': '#c9a227', 'پارسیان': '#c9a227', + 'PARSIAN': '#c9a227', 'بانک ملی': '#4b5e96', 'ملی': '#4b5e96', 'MELLI': '#4b5e96', @@ -24,6 +29,12 @@ const BANK_ACCENT_COLORS: Record = { 'MELLAT': '#c0392b', 'بانک صادرات': '#1a6fb3', 'صادرات': '#1a6fb3', + 'SADERAT': '#1a6fb3', + 'بانک صنعت و معدن': '#8b6914', + 'صنعت و معدن': '#8b6914', + 'صنعت معدن': '#8b6914', + 'SANATOMADAN': '#8b6914', + 'SANAT_MADAN': '#8b6914', 'بانک آینده': '#2b2f6b', 'آینده': '#2b2f6b', 'AYANDEH': '#2b2f6b', @@ -36,6 +47,9 @@ const BANK_ACCENT_COLORS: Record = { 'بانک سرمایه': '#c0392b', 'سرمایه': '#c0392b', 'SARMAYEH': '#c0392b', + 'بانک سپه': '#e85d04', + 'سپه': '#e85d04', + 'SEPAH': '#e85d04', } const BANK_LOGOS: Record = { @@ -63,6 +77,20 @@ const BANK_LOGOS: Record = { 'بانک سرمایه': sarmayehLogo, 'سرمایه': sarmayehLogo, 'SARMAYEH': sarmayehLogo, + 'بانک پارسیان': parsiyanLogo, + 'پارسیان': parsiyanLogo, + 'PARSIAN': parsiyanLogo, + 'بانک صادرات': saderatLogo, + 'صادرات': saderatLogo, + 'SADERAT': saderatLogo, + 'بانک صنعت و معدن': sanatomadanLogo, + 'صنعت و معدن': sanatomadanLogo, + 'صنعت معدن': sanatomadanLogo, + 'SANATOMADAN': sanatomadanLogo, + 'SANAT_MADAN': sanatomadanLogo, + 'بانک سپه': sepahLogo, + 'سپه': sepahLogo, + 'SEPAH': sepahLogo, } const BANK_PERSIAN_NAMES: Record = { @@ -76,6 +104,7 @@ const BANK_PERSIAN_NAMES: Record = { SARMAYEH: 'بانک سرمایه', PARSIAN: 'بانک پارسیان', SADERAT: 'بانک صادرات', + SEPAH: 'بانک سپه', 'بانک پاسارگاد': 'بانک پاسارگاد', 'پاسارگاد': 'بانک پاسارگاد', 'بانک سامان': 'بانک سامان', @@ -96,6 +125,13 @@ const BANK_PERSIAN_NAMES: Record = { 'پارسیان': 'بانک پارسیان', 'بانک صادرات': 'بانک صادرات', 'صادرات': 'بانک صادرات', + 'بانک صنعت و معدن': 'بانک صنعت و معدن', + 'صنعت و معدن': 'بانک صنعت و معدن', + 'صنعت معدن': 'بانک صنعت و معدن', + SANATOMADAN: 'بانک صنعت و معدن', + SANAT_MADAN: 'بانک صنعت و معدن', + 'بانک سپه': 'بانک سپه', + 'سپه': 'بانک سپه', } export function formatShebaForDisplay(value?: string | number | null): string { diff --git a/src/views/base/physicalReceive/components/RequestItem.vue b/src/views/base/physicalReceive/components/RequestItem.vue index 743dc26..2c57603 100644 --- a/src/views/base/physicalReceive/components/RequestItem.vue +++ b/src/views/base/physicalReceive/components/RequestItem.vue @@ -25,7 +25,7 @@
{{ tx.title }}
-
{{ tx.gold * -1 }} عدد
+
{{ tx.gold * -1 }} {{ getProductQuantityUnit(tx.product) }}
@@ -49,6 +49,7 @@ import type { Physicalreceive } from '@/models/physicalreceive' import { toJalali } from '@/utils/useDateTime' import { getProductDisplayImage } from '@/utils/productAssets' +import { getProductQuantityUnit } from '@/utils/productDealMethod' interface Prop { item: Physicalreceive diff --git a/src/views/base/products/mobile/MobileProductsView.vue b/src/views/base/products/mobile/MobileProductsView.vue index 82c378f..de9559e 100644 --- a/src/views/base/products/mobile/MobileProductsView.vue +++ b/src/views/base/products/mobile/MobileProductsView.vue @@ -16,10 +16,11 @@
همه getStoreClosedMessage()) display: flex; justify-content: center; width: 100%; - padding: 1.25rem 0.75rem 0.75rem; + padding: 0.625rem 0.5rem 0.5rem; overflow-x: auto; -webkit-overflow-scrolling: touch; + scrollbar-width: none; + + &::-webkit-scrollbar { + display: none; + } +} + +.products-mobile-root__tab-group { + display: inline-flex; + flex-wrap: nowrap; + max-width: 100%; +} + +.products-mobile-root__tab-group :deep(.ant-radio-button-wrapper) { + height: auto; + min-height: 2rem; + padding: 0.375rem 0.625rem; + font-size: 0.75rem; + font-weight: 600; + line-height: 1.3; + white-space: nowrap; } .products-mobile-root__scroll { diff --git a/src/views/base/wallet/components/BoursecuBankAccountPicker.vue b/src/views/base/wallet/components/BoursecuBankAccountPicker.vue index e6b12f7..6930344 100644 --- a/src/views/base/wallet/components/BoursecuBankAccountPicker.vue +++ b/src/views/base/wallet/components/BoursecuBankAccountPicker.vue @@ -29,16 +29,28 @@
+
+ +
@@ -49,22 +61,34 @@ حساب بانکی ثبت نشده است
- + + +
@@ -75,6 +99,8 @@ import { computed, ref, watch } from 'vue' import { onClickOutside } from '@vueuse/core' import BasicIcon from '@/components/BasicPacks/BasicIcon.vue' import type { Card } from '@/models/wallet' +import { deleteCard } from '@/api/wallet' +import { confirmDeleteItem } from '@/utils/useConfirm' import BoursecuBankAccountOption from './BoursecuBankAccountOption.vue' const props = withDefaults( @@ -89,6 +115,7 @@ const props = withDefaults( const emit = defineEmits<{ 'update:id': [value: number | string | undefined] 'add-account': [] + 'card-deleted': [] }>() const rootRef = ref(null) @@ -133,6 +160,16 @@ function selectCard(cardId?: number) { isOpen.value = false } +function requestDelete(card: Card) { + if (card.id == null) { + return + } + + confirmDeleteItem('این حساب بانکی', card.id, deleteCard, () => { + emit('card-deleted') + }) +} + if (props.variant === 'mobile') { onClickOutside(rootRef, close) } @@ -242,14 +279,11 @@ watch(isOpen, (open) => { } .boursecu-bank-picker__sheet-item { - appearance: none; + display: flex; + align-items: center; + gap: 8px; width: 100%; - border: none; border-radius: 12px; - background: transparent; - padding: 10px 12px; - cursor: pointer; - text-align: right; transition: background-color 0.15s ease; &--active, @@ -258,6 +292,39 @@ watch(isOpen, (open) => { } } +.boursecu-bank-picker__sheet-select { + appearance: none; + flex: 1; + min-width: 0; + border: none; + background: transparent; + padding: 10px 0 10px 12px; + cursor: pointer; + text-align: right; +} + +.boursecu-bank-picker__delete { + appearance: none; + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + width: 36px; + height: 36px; + margin-inline-end: 8px; + border: none; + border-radius: 10px; + background: transparent; + color: #dc2626; + cursor: pointer; + transition: background-color 0.15s ease, color 0.15s ease; + + &:hover { + background: rgba(220, 38, 38, 0.08); + color: #b91c1c; + } +} + .boursecu-bank-picker--desktop { gap: 0; flex: 1; @@ -274,18 +341,11 @@ watch(isOpen, (open) => { } .boursecu-bank-picker__list-item { - appearance: none; - width: 100%; display: flex; align-items: center; - justify-content: space-between; - gap: 10px; - border: none; + gap: 8px; + width: 100%; border-radius: 12px; - background: transparent; - padding: 10px 12px; - cursor: pointer; - text-align: right; transition: background-color 0.15s ease; &--active { @@ -297,6 +357,22 @@ watch(isOpen, (open) => { } } +.boursecu-bank-picker__list-select { + appearance: none; + flex: 1; + min-width: 0; + display: flex; + align-items: center; + justify-content: space-between; + gap: 10px; + border: none; + border-radius: 12px; + background: transparent; + padding: 10px 0 10px 12px; + cursor: pointer; + text-align: right; +} + .boursecu-bank-picker__list-chevron { flex-shrink: 0; color: #6b7280; diff --git a/src/views/base/wallet/desktop/DesktopWalletView.vue b/src/views/base/wallet/desktop/DesktopWalletView.vue index 2ee6eaa..bb6f13a 100644 --- a/src/views/base/wallet/desktop/DesktopWalletView.vue +++ b/src/views/base/wallet/desktop/DesktopWalletView.vue @@ -165,6 +165,7 @@ variant="desktop" :items="cardItems" @add-account="showAddCard = true" + @card-deleted="getCards" />
diff --git a/src/views/base/wallet/mobile/MobileWalletView.vue b/src/views/base/wallet/mobile/MobileWalletView.vue index f40d0f7..8773781 100644 --- a/src/views/base/wallet/mobile/MobileWalletView.vue +++ b/src/views/base/wallet/mobile/MobileWalletView.vue @@ -40,6 +40,7 @@ :items="cardItems" class="mb-4" @add-account="showAddCard = true" + @card-deleted="getCards" />