diff --git a/config/env.js b/config/env.js index 09ec03c5b..24a907f0d 100644 --- a/config/env.js +++ b/config/env.js @@ -85,6 +85,9 @@ function getClientEnvironment(publicUrl) { WDS_SOCKET_HOST: process.env.WDS_SOCKET_HOST, WDS_SOCKET_PATH: process.env.WDS_SOCKET_PATH, WDS_SOCKET_PORT: process.env.WDS_SOCKET_PORT, + + // Application version. + VERSION: paths.appVersion } ); // Stringify all values so we can feed into webpack DefinePlugin diff --git a/config/paths.js b/config/paths.js index b3fd764ae..d9a21bc72 100644 --- a/config/paths.js +++ b/config/paths.js @@ -48,6 +48,8 @@ const resolveModule = (resolveFn, filePath) => { return resolveFn(`${filePath}.js`); }; +const appVersion = require(resolveApp('package.json')).version; + // config after eject: we're in ./config/ module.exports = { dotenv: resolveApp('.env'), @@ -65,6 +67,7 @@ module.exports = { proxySetup: resolveApp('src/setupProxy.js'), appNodeModules: resolveApp('node_modules'), publicUrlOrPath, + appVersion }; diff --git a/src/components/Sidebar/Sidebar.js b/src/components/Sidebar/Sidebar.js index dee5b7d12..92f97cc95 100644 --- a/src/components/Sidebar/Sidebar.js +++ b/src/components/Sidebar/Sidebar.js @@ -28,7 +28,7 @@ export default function Sidebar({ dashboardContentRef }) { * @returns {React.JSX} */ function SidebarFooterVersion() { - const { REACT_APP_VERSION: VERSION } = process.env; + const { VERSION } = process.env; if (!VERSION) { return null; diff --git a/src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.js b/src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.js index 4dee8f29c..1f72e8cad 100644 --- a/src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.js +++ b/src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.js @@ -57,9 +57,7 @@ function BillTransactionDeleteAlert({ loading={isLoading} >

- +

); diff --git a/src/containers/CashFlow/AccountTransactions/utils.js b/src/containers/CashFlow/AccountTransactions/utils.js index 567422ea6..94a830925 100644 --- a/src/containers/CashFlow/AccountTransactions/utils.js +++ b/src/containers/CashFlow/AccountTransactions/utils.js @@ -79,6 +79,10 @@ export const handleCashFlowTransactionType = (reference, openDrawer) => { return openDrawer('refund-vendor-detail-drawer', { refundTransactionId: reference.reference_id, }); + case 'InventoryAdjustment': + return openDrawer('inventory-adjustment-drawer', { + inventoryId: reference.reference_id, + }); default: return openDrawer('cashflow-transaction-drawer', { diff --git a/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFloatingActions.js b/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFloatingActions.js index 121f86aa5..0f3fee4a8 100644 --- a/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFloatingActions.js +++ b/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFloatingActions.js @@ -37,7 +37,7 @@ function AllocateLandedCostFloatingActions({ {costTransactionEntry && ( - Unallocated cost Amount:{' '} + {formattedUnallocatedCostAmount} )} diff --git a/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostForm.js b/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostForm.js index e4ac664cd..12d755051 100644 --- a/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostForm.js +++ b/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostForm.js @@ -42,7 +42,10 @@ function AllocateLandedCostForm({ .map((entry) => transformToForm(entry, defaultInitialValues.items[0])); if (entries.length <= 0) { - AppToaster.show({ message: 'Something wrong!', intent: Intent.DANGER }); + AppToaster.show({ + message: intl.get('something_wrong'), + intent: Intent.DANGER, + }); return; } const form = { @@ -69,13 +72,14 @@ function AllocateLandedCostForm({ ) ) { AppToaster.show({ - message: - 'The total located cost is bigger than the transaction line.', + message: intl.get( + 'landed_cost.error.the_total_located_cost_is_bigger_than_the_transaction_line', + ), intent: Intent.DANGER, }); } else { AppToaster.show({ - message: 'Something went wrong!', + message: intl.get('something_went_wrong'), intent: Intent.DANGER, }); } diff --git a/src/containers/Dialogs/PaymentViaVoucherDialog/PaymentViaVoucherDialogContent.js b/src/containers/Dialogs/PaymentViaVoucherDialog/PaymentViaVoucherDialogContent.js index 22770dd06..7e4542824 100644 --- a/src/containers/Dialogs/PaymentViaVoucherDialog/PaymentViaVoucherDialogContent.js +++ b/src/containers/Dialogs/PaymentViaVoucherDialog/PaymentViaVoucherDialogContent.js @@ -36,7 +36,7 @@ function PaymentViaLicenseDialogContent({ setSubmitting(true); const mutateValues = { - plan_slug: `${values.plan_slug}-${values.period}ly`, + plan_slug: `essentials-monthly`, license_code: values.license_code, }; // Payment via voucher mutate. diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json index 6cbb5e68b..078014ec7 100644 --- a/src/lang/ar/index.json +++ b/src/lang/ar/index.json @@ -1173,7 +1173,6 @@ "From transaction": "من معاملة", "Landed": "Landed", "This options allows you to be able to add additional cost eg. freight then allocate cost to the items in your bills.": "يتيح لك هذا الخيار إمكانية إضافة تكلفة إضافية على سبيل المثال اضافة تكلفة الشحن ومن ثم تخصيص التكلفة لفواتير الشراء.", - "Once your delete this located landed cost, you won't be able to restore it later, Are your sure you want to delete this transaction?": "بمجرد حذف معاملة تحميل التكلفة ، لن تتمكن من استعادتها لاحقًا ، هل أنت متأكد من أنك تريد حذف هذه المعاملة؟", "journal_entries": "القيود", "contact": "جهة الاتصال", "invoice_details": "تفاصيل الفاتورة", @@ -1390,7 +1389,7 @@ "filter.value": "قيمة", "payment_made.empty_status.title": "المنشأة لم تدفع اي اموال إلي الموردين ، إلي حد الأن!.", "estimate.delete.error.estimate_converted_to_invoice": "لا يمكن حذف عملية عرض اسعار الذي تم تحويلها إلي فاتورة بيع.", - "landed_cost.action.delete.success_message": "The landed cost has been deleted successfully.", + "landed_cost.action.delete.success_message": "تم حذف تكلفة اضافية بنجاح. ", "items.option.only_active": "Only active", "items.option_all_items.hint": "جميع الاصناف ، بما في ذلك تلك الاصناف لديها رصيد صفر.", "items.option_with_transactions": "الاصناف مع معاملات", @@ -1594,6 +1593,9 @@ "refund": "استرجاع", "landed_cost.dialog.label_select_transaction": "حدد المعاملة ", "landed_cost.dialog.label_select_transaction_entry": "حدد سطر المعاملة ", + "landed_cost.dialog.label_unallocated_cost_amount":"قيمة التكلفة غير المحملة:", + "landed_cost.error.the_total_located_cost_is_bigger_than_the_transaction_line":"إجمالي قيمة التكلفة المحملة أكبر من قيمة سطر المعاملة.", + "landed_cost.once_your_delete_this_located_landed_cost": "بمجرد حذف معاملة تحميل التكلفة ، لن تتمكن من استعادتها لاحقًا ، هل أنت متأكد من أنك تريد حذف هذه المعاملة؟", "refund_credit_note.dialog.label": "استرجاع اموال", "refund_credit_note.dialog.success_message": "تم انشاء معاملة استرجاع الاموال لإشعار الدائن بنجاح.", "refund_credit_note.dialog.refund_date": "تاريخ الاسترجاع", diff --git a/src/lang/en/index.json b/src/lang/en/index.json index c8703b7cc..6f35aaa18 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -1147,7 +1147,6 @@ "From transaction": "From transaction", "landed": "Landed", "This options allows you to be able to add additional cost eg. freight then allocate cost to the items in your bills.": "This options allows you to be able to add additional cost eg. freight then allocate cost to the items in your bills.", - "Once your delete this located landed cost, you won't be able to restore it later, Are your sure you want to delete this transaction?": "Once your delete this located landed cost, you won't be able to restore it later, Are your sure you want to delete this transaction?", "journal_entries": "Journal Entries", "contact": "Contact", "invoice_details": "Invoice details", @@ -1320,11 +1319,11 @@ "inventory_adjustment.details_drawer.title": "Inventory adjustment details", "setup.organization.location": "Location", "preferences.general.success_message": "The general preferences has been saved.", - "customer.drawer.action.new_invoice": "New invoice", - "customer.drawer.action.new_estimate": "New estimate", - "customer.drawer.action.new_payment": "New payment", - "customer.drawer.action.new_receipt": "New receipt", - "customer.drawer.action.new_transaction": "New transaction", + "customer.drawer.action.new_invoice": "New Invoice", + "customer.drawer.action.new_estimate": "New Estimate", + "customer.drawer.action.new_payment": "New Payment", + "customer.drawer.action.new_receipt": "New Receipt", + "customer.drawer.action.new_transaction": "New Transaction", "customer.drawer.action.edit_opening_balance": "Edit Opening Balance", "customer.drawer.action.edit": "Edit", "customer.drawer.label.outstanding_receivable": "Outstanding receivable", @@ -1351,9 +1350,9 @@ "vendor.drawer.label.note": "Note", "vendor.drawer.action.edit_vendor": "Edit vendor", "vendor.drawer.action.delete": "Delete", - "vendor.drawer.action.new_transaction": "New transaction", - "vendor.drawer.action.new_payment": "New payment", - "vendor.drawer.action.new_invoice": "New purchase invoice", + "vendor.drawer.action.new_transaction": "New Transaction", + "vendor.drawer.action.new_payment": "New Payment", + "vendor.drawer.action.new_invoice": "New Purchase Invoice", "vendor.drawer.action.edit": "Edit", "vendor.drawer.action.edit_opening_balance": "Edit Opening Balance", "manual_journals.empty_status.description": "Manual journals can be used to record financial transactions manually, used by accountants to work with the ledger.", @@ -1612,6 +1611,9 @@ "refund": "Refund", "landed_cost.dialog.label_select_transaction": "Select transaction", "landed_cost.dialog.label_select_transaction_entry": "Select transaction entry", + "landed_cost.dialog.label_unallocated_cost_amount": "Unallocated cost Amount:", + "landed_cost.error.the_total_located_cost_is_bigger_than_the_transaction_line": "The total located cost is bigger than the transaction line.", + "landed_cost.once_your_delete_this_located_landed_cost": "Once your delete this located landed cost, you won't be able to restore it later, Are your sure you want to delete this transaction?", "refund_credit_note.dialog.label": "Refund Credit Note", "refund_credit_note.dialog.success_message": "The customer credit note refund has been created successfully.", "refund_credit_note.dialog.refund_date": "Refund date",