From 1e361dac666202170d9521e4f422584e3fe59ea5 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Mon, 27 Dec 2021 22:23:41 +0200 Subject: [PATCH] feat: notes. --- src/containers/Drawers/BillDrawer/BillDrawerDetails.js | 9 ++++++--- .../CreditNotes/VendorCreditIUniversalSearchBind.js | 3 ++- .../Sales/CreditNotes/CreditNoteUniversalSearch.js | 3 ++- src/lang/ar/index.json | 2 ++ src/lang/en/index.json | 5 ++--- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/containers/Drawers/BillDrawer/BillDrawerDetails.js b/src/containers/Drawers/BillDrawer/BillDrawerDetails.js index 62ddb5aa6..a196fc6d1 100644 --- a/src/containers/Drawers/BillDrawer/BillDrawerDetails.js +++ b/src/containers/Drawers/BillDrawer/BillDrawerDetails.js @@ -3,11 +3,12 @@ import { Tab } from '@blueprintjs/core'; import intl from 'react-intl-universal'; import styled from 'styled-components'; -import { Can, DrawerMainTabs } from 'components'; +import { DrawerMainTabs } from 'components'; import { PaymentMadeAction, AbilitySubject, } from '../../../common/abilityOption'; +import { useAbilityContext } from 'hooks/utils'; import BillDetailTab from './BillDetailTab'; import LocatedLandedCostTable from './LocatedLandedCostTable'; import BillGLEntriesTable from './BillGLEntriesTable'; @@ -18,6 +19,8 @@ import BillDetailActionsBar from './BillDetailActionsBar'; * Bill details tabs. */ function BillDetailsTabs() { + const ability = useAbilityContext(); + return ( } /> - {/* */} + {ability.can(PaymentMadeAction.View, AbilitySubject.PaymentMade) && ( } /> - {/* */} + )} ({ */ export const universalSearchVendorCreditBind = () => ({ resourceType: RESOURCES_TYPES.VENDOR_CREDIT, - optionItemLabel: 'Vendor credits', + optionItemLabel: intl.get('vendor_credit.label'), selectItemAction: VendorCreditUniversalSearchSelect, itemRenderer: VendorCreditUniversalSearchItem, itemSelect: transformVendorCreditsToSearch, diff --git a/src/containers/Sales/CreditNotes/CreditNoteUniversalSearch.js b/src/containers/Sales/CreditNotes/CreditNoteUniversalSearch.js index 314a45fba..c5e97e134 100644 --- a/src/containers/Sales/CreditNotes/CreditNoteUniversalSearch.js +++ b/src/containers/Sales/CreditNotes/CreditNoteUniversalSearch.js @@ -1,4 +1,5 @@ import React from 'react'; +import intl from 'react-intl-universal'; import { MenuItem, Intent } from '@blueprintjs/core'; import { Icon, Choose, T, TextStatus } from 'components'; @@ -108,7 +109,7 @@ const transformReceiptsToSearch = (creditNote) => ({ */ export const universalSearchCreditNoteBind = () => ({ resourceType: RESOURCES_TYPES.CREDIT_NOTE, - optionItemLabel: 'Credit notes', + optionItemLabel: intl.get('credit_note.label'), selectItemAction: CreditNoteUniversalSearchSelect, itemRenderer: CreditNoteUniversalSearchItem, itemSelect: transformReceiptsToSearch, diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json index fcb77558b..b9c65d1b0 100644 --- a/src/lang/ar/index.json +++ b/src/lang/ar/index.json @@ -1525,6 +1525,7 @@ "credit_note.label_customer_note": "ملاحظة الزبون", "credit_note.once_delete_this_credit_note": " بمجرد حذف إشعار الدائن ، لن تتمكن من استعادته لاحقًا. هل أنت متأكد أنك تريد حذف هذا إشعار", "credit_note.alert.delete_message": "تم حذف إشعار الدائن بنجاح", + "credit_note.label":"إشعارات الدائن", "credit_note.success_message": "تم إنشاء إشعار الدائن بنجاح.", "credit_note.edit_success_message": "تم تعديل إشعار الدائن بنجاح.", "credit_note_number_settings": "إعدادات رقم إشعار الدائن", @@ -1564,6 +1565,7 @@ "vendor_credit.auto_increment.auto": "يتم تعيين أرقام إشعارات المدين على وضع الزيادة التلقائي. هل أنت متأكد من تغيير هذا الإعداد؟", "vendor_credit.auto_increment.manually": "يتم تعيين أرقام إشعارات المدين على وضع الزيادة التلقائي. هل أنت متأكد من تغيير هذا الإعداد؟", "setting_your_auto_generated_vendor_credit_number": "تعيين رقم إشعار المدين الذي تم إنشاؤه تلقائيًا", + "vendor_credit.label":"إشعارات المدين", "vendor_credit.drawer_vendor_credit_detail": "تفاصيل إشعار المدين ({vendorNumber})", "vendor_credit.drawer.label_vendor_credit_no": "رقم الإشعار", "vendor_credit.drawer.label_vendor_credit_date": "تاريخ الإشعار", diff --git a/src/lang/en/index.json b/src/lang/en/index.json index c419c20dd..7e0ea454d 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -1496,7 +1496,6 @@ "roles.error.you_cannot_delete_predefined_roles": "You cannot delete predefined roles.", "roles.error.the_submit_role_has_invalid_permissions": "The submit role has invalid permissions.", "roles.error.you_cannot_delete_role_that_associated_to_users": "You cannot delete role that associated to users", - "sidebar_credit_note": "Credit Notes", "credit_note.label_create_note_list": "Credit Notes List", "credit_note.label.new_credit_note": "New Credit Note", @@ -1519,7 +1518,7 @@ "credit_note.alert.delete_message": "The credit note has been deleted successfully", "credit_note.success_message": "The credit note has been created successfully.", "credit_note.edit_success_message": "The credit note has been edited successfully.", - + "credit_note.label":"Credit notes", "credit_note_number_settings": "Credit Note Number Settings", "credit_note.auto_increment.auto": "Your credit note numbers are set on auto-increment mode. Are you sure changing this setting?", "credit_note.auto_increment.manually": "Your credit note numbers are set on manual mode. Are you sure chaning this settings?", @@ -1556,6 +1555,7 @@ "vendor_credit.auto_increment.auto": "Your vendor credit numbers are set on auto-increment mode. Are you sure changing this setting?", "vendor_credit.auto_increment.manually": "Your vendor credit numbers are set on manual mode. Are you sure chaning this settings?", "setting_your_auto_generated_vendor_credit_number": "Setting your auto-generated vendor credit number", + "vendor_credit.label":"Vendor credits", "vendor_credit.drawer_vendor_credit_detail": "Vendor Credit details", "vendor_credit.drawer.label_vendor_credit_no": "Vendor Credit #", "vendor_credit.drawer.label_vendor_credit_date": "Vendor Credit Date", @@ -1565,7 +1565,6 @@ "vendor_credit.drawer.label_subtotal": "Subtotal", "vendor_credit.drawer.label_refund_transactions": "Refund Transactions", "vendor_credit.drawer.label_bills_reconciled": "Bills Reconciled", - "refund": "Refund", "landed_cost.dialog.label_select_transaction": "Select transaction", "landed_cost.dialog.label_select_transaction_entry": "Select transaction entry",