diff --git a/src/api/price.ts b/src/api/price.ts index d6a5b49..feb27d0 100644 --- a/src/api/price.ts +++ b/src/api/price.ts @@ -12,3 +12,23 @@ export const getPriceTable = async (params: TableInput) => export const getLastPrice = async () => await useAxios.get(`/api/price/last`) export const methodePrices = async () => await useAxios.get('/admin/p') + +export interface ZaarboxProductOption { + key: string + name: string + id: string + category: string + active: boolean +} + +export interface ZaarboxProductsResponse { + code: number + message: string + data: { + items: ZaarboxProductOption[] + api_url: string + } +} + +export const getZaarboxProducts = async () => + await useAxios.get('/admin/zaarbox/products') diff --git a/src/api/wallet.ts b/src/api/wallet.ts index 68cf83a..507b84b 100644 --- a/src/api/wallet.ts +++ b/src/api/wallet.ts @@ -10,9 +10,14 @@ export const chargeWallet = async (params: Charge, type: 'gold' | 'money') => ? await useAxios.post('/admin/wallet/charge', params) : await useAxios.post('/admin/wallet/charge_gold', params) -export const getWithdrawTable = async (params: TableInput) => +export const getWithdrawTable = async (params: TableInput & { flow_type?: string }) => await useAxios.post>('/admin/wallet/withdraw/table', params) +export const exportWithdrawReport = async (params: TableInput & { flow_type?: string }) => + await useAxios.post('/admin/wallet/withdraw/report', params, { + responseType: 'text' + }) + export const completeWithdraw = async (params: Withdraw) => await useAxios.post('/admin/wallet/withdraw/complete', params) diff --git a/src/core/assets/css/ant-override.less b/src/core/assets/css/ant-override.less index ccf21f9..0efecd7 100644 --- a/src/core/assets/css/ant-override.less +++ b/src/core/assets/css/ant-override.less @@ -79,8 +79,13 @@ z-index: 1100 !important; } -.ant-picker-dropdown{ - z-index: 1100 !important; +// dropdown سلکت و date picker داخل مودال (باید بالاتر از 1100 باشد) +.ant-select-dropdown { + z-index: 1200 !important; +} + +.ant-picker-dropdown { + z-index: 1200 !important; } diff --git a/src/core/components/BaseTableOld/src/BaseTable.vue b/src/core/components/BaseTableOld/src/BaseTable.vue index 311e917..e136ae0 100644 --- a/src/core/components/BaseTableOld/src/BaseTable.vue +++ b/src/core/components/BaseTableOld/src/BaseTable.vue @@ -193,6 +193,7 @@
غیرفعال + + diff --git a/src/pages/menuPages/configuration/index.vue b/src/pages/menuPages/configuration/index.vue index 0335ebb..4f38bbc 100644 --- a/src/pages/menuPages/configuration/index.vue +++ b/src/pages/menuPages/configuration/index.vue @@ -289,7 +289,7 @@ const SETTING_GROUPS: Array<{ id: 'general', title: 'عمومی و اطلاعات اپ', icon: 'vuesax-linear:home-2', - match: (k) => /^(name_|app_|admin_|server_|bace_|key$|color_|logo_|title_pwa|title_fav|metal_type)/.test(k) + match: (k) => /^(name_|app_|admin_|server_|bace_|key$|color_|logo_|title_pwa|title_fav|metal_type|unit$)/.test(k) }, { id: 'pricing', diff --git a/src/pages/menuPages/configuration/settingTypes.ts b/src/pages/menuPages/configuration/settingTypes.ts index 6b77d34..a35cc76 100644 --- a/src/pages/menuPages/configuration/settingTypes.ts +++ b/src/pages/menuPages/configuration/settingTypes.ts @@ -75,6 +75,7 @@ const KEY_TYPE_FALLBACK: Record = { external_order_api_enabled: 'switch', store_status: 'select', credit_rial_price_unit: 'select', + zaarbox_price_key: 'select', node_client_id: 'text', node_shared_secret: 'text', support_messenger_id: 'text', @@ -99,6 +100,7 @@ const SELECT_OPTIONS_BY_KEY: Record = { payping_gateway_name: 'sepal,', credit_rial_price_unit: 'gram,mesghal,unit', store_status: 'باز,بسته', + unit: 'گرم,کیلوگرم', support_messenger: 'bale,telegram,whatsapp,rubika,eitaa,soroush' } diff --git a/src/pages/menuPages/products/base/components/ProductEditorFormBody.vue b/src/pages/menuPages/products/base/components/ProductEditorFormBody.vue index f1e51db..6e28e63 100644 --- a/src/pages/menuPages/products/base/components/ProductEditorFormBody.vue +++ b/src/pages/menuPages/products/base/components/ProductEditorFormBody.vue @@ -3,7 +3,57 @@