diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b1592013..be9479fe1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to Bigcapital server-side will be in this file. +## [1.7.2-rc.2] - 04-04-2022 + +### Fixed + - Add the missing Arabic localization. + - Subscription plans modifications. + ## [1.7.1-rc.2] - 30-03-2022 ## Added diff --git a/src/containers/Entries/components.js b/src/containers/Entries/components.js index d7877cd1b..5cc5f14ba 100644 --- a/src/containers/Entries/components.js +++ b/src/containers/Entries/components.js @@ -43,7 +43,10 @@ export function ActionsCellRenderer({ const exampleMenu = ( - + } + /> ); diff --git a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js index 241022488..5296e96a6 100644 --- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js +++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js @@ -147,7 +147,7 @@ function InvoiceFormHeaderFields({ - + {/* ----------- Due date ----------- */} {({ form, field: { value }, meta: { error, touched } }) => ( diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json index 16a9b5723..078014ec7 100644 --- a/src/lang/ar/index.json +++ b/src/lang/ar/index.json @@ -1918,7 +1918,7 @@ "branches_multi_select.placeholder": "تصفية حسب الفروع…", "warehouses_multi_select.label": "مخازن", "warehouses_multi_select.placeholder": "تصفية حسب المخازن…", - "dimensions": "Dimensions", + "dimensions": "الأبعاد", "warehouse_transfer.save_initiate_transfer": "حفظ وبدء النقل", "warehouse_transfer.save_mark_as_transferred": "حفظ وتم النقل", "warehouse_transfer.label.transfer_initiated": "بدء النقل", @@ -1947,7 +1947,7 @@ "view_customer_details": "عرض تفاصيل العميل ", "view_vendor_details": "عرض تفاصيل المورد ", "thanks_for_your_business_and_have_a_great_day": "Thanks for your business and have a great day!", - "terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction", + "terms_and_conditions.placeholder": "أدخل شروط وأحكام عملك ليتم عرضها في المعاملة.", "expenses.decscrption.placeholder": "Enter the description of your business to be displayed in your transaction", "make_jorunal.decscrption.placeholder": "Enter the description of your business to be displayed in your transaction", "estimate_form.label.total": "إجمالي", @@ -1955,14 +1955,15 @@ "estimate_form.label.customer_note": "ملاحظة الزبون", "estimate_form.label.terms_conditions": "الشروط والأحكام", "estimate_form.customer_note.placeholder": "Thanks for your business and have a great day!", - "estimate_form.terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction", + "estimate_form.terms_and_conditions.placeholder": "أدخل شروط وأحكام عملك ليتم عرضها في المعاملة.", "invoice_form.label.total": "إجمالي", "invoice_form.label.subtotal": "المجموع", "invoice_form.label.due_amount": "مبلغ المستحق", "invoice_form.label.payment_amount": "مبلغ المدفوع", "invoice_form.label.invoice_message": "رسالة الفاتورة", "invoice_form.invoice_message.placeholder": "Thanks for your business and have a great day!", - "invoice_form.terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction", + "invoice_form.label.terms_conditions": "الشروط والأحكام", + "invoice_form.terms_and_conditions.placeholder": "أدخل شروط وأحكام عملك ليتم عرضها في المعاملة.", "receipt_form.label.total": "إجمالي", "receipt_form.label.subtotal": "المجموع", "receipt_form.label.due_amount": "مبلغ المستحق", @@ -1976,13 +1977,13 @@ "payment_receive_form.label.subtotal": "المجموع", "payment_receive_form.label.total": "إجمالي", "bill_form.label.note": "ملاحظة", - "bill_form.label.note.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction", + "bill_form.label.note.placeholder": "أدخل شروط وأحكام عملك ليتم عرضها في المعاملة.", "bill_form.label.subtotal": "المجموع", "bill_form.label.total": "إجمالي", "bill_form.label.due_amount": "مبلغ المستحق", "bill_form.label.payment_amount": "مبلغ المدفوع", "vendor_credit_form.label.note": "ملاحظة", - "vendor_credit_form.note.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction", + "vendor_credit_form.note.placeholder": "أدخل شروط وأحكام عملك ليتم عرضها في المعاملة.", "vendor_credit_form.label.subtotal": "المجموع", "vendor_credit_form.label.total": "إجمالي", "payment_made_form.label.statement": "بيان", @@ -2010,7 +2011,7 @@ "warehouse_transfer.empty_status.title": "إدارة عمليات النقل بين المخازن", "warehouse_transfer.empty_status.description": "غالبًا ماتحتاج الاعمال ذات مخازن متعددة لطلبات نقل البضائع من مخزن إلى آخر عندما تكون في حاجة ماسة إلى البائعين.", "warehouse_transfer.form.reason.label": "أسباب النقل", - "warehouse_transfer.form.reason.placeholder": "Enter the reason behind the transfer order.", + "warehouse_transfer.form.reason.placeholder": "أدخل السبب وراء طلب النقل.", "item.error.you_could_not_delete_item_has_associated": "لا يمكنك حذف العنصر لديه معاملات مرتبطة به ", "warehouse_transfer.quantity_cannot_be_zero_or_empty": "لا يمكن أن تكون الكمية صفراً أو فارغة.", "invoice.validation.due_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}", diff --git a/src/lang/en/index.json b/src/lang/en/index.json index 3d4760696..6f35aaa18 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -1258,12 +1258,41 @@ "setup.initializing.please_refresh_the_page": "Please refresh the page", "setup.organization.title": "Let’s Get Started", "setup.organization.description": "Tell the system a little bit about your organization.", + "plan.capital_basic.title": "Capital Basic", + "plan.feature.sales_invoices": "Sales Invoices.", + "plan.feature.sales_estimates": "Sales Estimates.", + "plan.feature.customers": "Customers.", + "plan.feature.credit_notes": "Credit notes.", + "plan.feature.manual_journals": "Manual Journals.", + "plan.feature.expenses_tracking": "Expenses Tracking", + "plan.feature.basic_financial_reports": "Basic Financial Reports.", + "plan.capital_plus.title": "Capital Plus", + "plan.feature.all_capital_basic": "All Capital Basic features.", + "plan.feature.predefined_user_roles": "Predefined User Roles.", + "plan.feature.custom_tables_views": "Custom Tables Views.", + "plan.feature.transactions_locking": "Transactions Locking.", + "plan.feature.plus_financial_reports": "Plus Financial Reports.", + "plan.feature.custom_fields_resources": "Custom Fields & Resources.", + "plan.essential.title": "Capital Essential", + "plan.feature.all_capital_plus": "All Capital Basic features.", + "plan.feature.sales_purchases_order": "Sales & Purchases Order.", + "plan.feature.purchase_invoices": "Purchase Invoices.", + "plan.feature.inventory_tracking": "Inventory Tracking.", + "plan.feature.custom_roles": "Custom Roles.", + "plan.feature.multiply_currency_transcations": "Multiply Currency Transcations.", + "plan.feature.inventory_reports": "Inventory Reports.", + "plan.feature.landed_cost": "Landed cost.", + "plan.capital_enterprise.title": "Capital Enterprise", + "plan.feature.all_capital_essential": "All Capital Essential features.", + "plan.feature.multiply_branches": "Multiply Branches.", + "plan.feature.multiply_warehouses": "Multiply Warehouses.", + "plan.feature.accounting_dimensions": "Accounting Dimensions.", + "plan.feature.warehouses_reports": "Warehouses Reports.", + "plan.feature.branches_reports": "Branches Reports.", "plan.professional.title": "Pro", - "plan.essential.title": "Essential", "plan.plus.title": "Plus+", "plan.feature.sale_purchase_invoice": "Sale and purchase invoices.", "plan.feature.receivable_payable_accounts": "Customers/vendors accounts.", - "plan.feature.expenses_tracking": "Expenses tracking", "plan.feature.manual_journal": "Manual journals.", "plan.feature.financial_reports": "Financial reports.", "plan.feature.one_user_with_accountant": "For one user and accountant", @@ -1274,9 +1303,7 @@ "plan.feature.three_users": "Three users with your accountant", "plan.feature.advanced_financial_reports": "Advanced financial reports", "plan.feature.tracking_multi_locations": "Track multi-branches and locations", - "plan.feature.all_capital_essential": "All Capital Essential features.", "plan.feature.projects_accounting": "Projects accounting and timesheets", - "plan.feature.accounting_dimensions": "Accounting dimensions.", "plan.monthly": "Monthly", "plan.yearly": "Yearly", "payment_via_voucher.success_message": "Payment has been done successfully.", @@ -1941,7 +1968,6 @@ "payment_made.error.withdrawal_account_currency_invalid": "The withdrawal account currency should be same vendor currency or organization base currency.", "view_customer_details": "View Customer Details", "view_vendor_details": "View Vendor Details", - "thanks_for_your_business_and_have_a_great_day": "Thanks for your business and have a great day!", "terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction", "expenses.decscrption.placeholder": "Enter the description of your business to be displayed in your transaction", "make_jorunal.decscrption.placeholder": "Enter the description of your business to be displayed in your transaction", diff --git a/src/store/plans/plans.reducer.js b/src/store/plans/plans.reducer.js index 154baf721..a8178fbc7 100644 --- a/src/store/plans/plans.reducer.js +++ b/src/store/plans/plans.reducer.js @@ -2,7 +2,6 @@ import { createReducer } from '@reduxjs/toolkit'; import intl from 'react-intl-universal'; import t from 'store/types'; - const getSubscriptionPeriods = () => [ { slug: 'month', @@ -15,79 +14,110 @@ const getSubscriptionPeriods = () => [ ]; const getSubscriptionPlans = () => [ + { + name: intl.get('plan.capital_basic.title'), + slug: 'capital_basic', + description: [ + intl.get('plan.feature.sales_invoices'), + intl.get('plan.feature.sales_estimates'), + intl.get('plan.feature.customers'), + intl.get('plan.feature.credit_notes'), + intl.get('plan.feature.manual_journals'), + intl.get('plan.feature.expenses_tracking'), + intl.get('plan.feature.basic_financial_reports'), + ], + price: '55', + periods: [ + { + slug: 'month', + label: intl.get('plan.monthly'), + price: '55', + }, + { + slug: 'year', + label: intl.get('plan.yearly'), + price: '595', + }, + ], + currencyCode: 'LYD', + }, + { + name: intl.get('plan.capital_plus.title'), + slug: 'capital_plus', + description: [ + intl.get('plan.feature.all_capital_basic'), + intl.get('plan.feature.predefined_user_roles'), + intl.get('plan.feature.custom_tables_views'), + intl.get('plan.feature.transactions_locking'), + intl.get('plan.feature.plus_financial_reports'), + intl.get('plan.feature.custom_fields_resources'), + ], + price: '75', + periods: [ + { + slug: 'month', + label: intl.get('plan.monthly'), + price: '75', + }, + { + slug: 'year', + label: intl.get('plan.yearly'), + price: '795', + }, + ], + currencyCode: 'LYD', + }, { name: intl.get('plan.essential.title'), slug: 'essentials', description: [ - intl.get('plan.feature.sale_purchase_invoice'), - intl.get('plan.feature.receivable_payable_accounts'), - intl.get('plan.feature.expenses_tracking'), - intl.get('plan.feature.manual_journal'), - intl.get('plan.feature.financial_reports'), - intl.get('plan.feature.one_user_with_accountant'), + intl.get('plan.feature.all_capital_plus'), + intl.get('plan.feature.sales_purchases_order'), + intl.get('plan.feature.purchase_invoices'), + intl.get('plan.feature.inventory_tracking'), + intl.get('plan.feature.custom_roles'), + intl.get('plan.feature.multiply_currency_transcations'), + intl.get('plan.feature.inventory_reports'), + intl.get('plan.feature.landed_cost'), ], - price: '100', + price: '95', periods: [ { slug: 'month', label: intl.get('plan.monthly'), - price: '100' + price: '95', }, { slug: 'year', label: intl.get('plan.yearly'), - price: '1,200', + price: '995', }, ], currencyCode: 'LYD', }, { - name: intl.get('plan.professional.title'), - slug: 'plus', - description: [ - intl.get('plan.feature.all_capital_essential'), - intl.get('plan.feature.multi_currency'), - intl.get('plan.feature.purchase_sell_orders'), - intl.get('plan.feature.multi_inventory_managment'), - intl.get('plan.feature.three_users'), - intl.get('plan.feature.advanced_financial_reports'), - ], - price: '200', - currencyCode: 'LYD', - periods: [ - { - slug: 'month', - label: intl.get('plan.monthly'), - price: '200' - }, - { - slug: 'year', - label: intl.get('plan.yearly'), - price: '1,200', - }, - ], - }, - { - name: intl.get('plan.plus.title'), + name: intl.get('plan.capital_enterprise.title'), slug: 'enterprise', description: [ - intl.get('plan.feture.all_capital_professional_features'), - intl.get('plan.feature.tracking_multi_locations'), - intl.get('plan.feature.projects_accounting'), + intl.get('plan.feature.all_capital_essential'), + intl.get('plan.feature.multiply_branches'), + intl.get('plan.feature.multiply_warehouses'), intl.get('plan.feature.accounting_dimensions'), + intl.get('plan.feature.warehouses_reports'), + intl.get('plan.feature.branches_reports'), ], - price: '300', + price: '120', currencyCode: 'LYD', periods: [ { slug: 'month', label: intl.get('plan.monthly'), - price: '300' + price: '120', }, { slug: 'year', label: intl.get('plan.yearly'), - price: '1,200', + price: '1,195', }, ], }, diff --git a/src/style/pages/Subscription/BillingPlans.scss b/src/style/pages/Subscription/BillingPlans.scss index cc9948b53..f5d2bbe5c 100644 --- a/src/style/pages/Subscription/BillingPlans.scss +++ b/src/style/pages/Subscription/BillingPlans.scss @@ -1,6 +1,6 @@ .billing-plans{ - + max-width: 753px; .paragraph{ font-size: 15px; }