feat: notes.

This commit is contained in:
elforjani13
2021-12-27 22:23:41 +02:00
parent a6cd483eb9
commit 1e361dac66
5 changed files with 14 additions and 8 deletions

View File

@@ -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 (
<DrawerMainTabs
renderActiveTabPanelOnly={true}
@@ -33,13 +36,13 @@ function BillDetailsTabs() {
id={'journal_entries'}
panel={<BillGLEntriesTable />}
/>
{/* <Can I={PaymentMadeAction.View} a={AbilitySubject.PaymentMade}> */}
{ability.can(PaymentMadeAction.View, AbilitySubject.PaymentMade) && (
<Tab
title={intl.get('payment_transactions')}
id={'payment_transactions'}
panel={<BillPaymentTransactionTable />}
/>
{/* </Can> */}
)}
<Tab
title={intl.get('located_landed_cost')}
id={'landed_cost'}

View File

@@ -1,4 +1,5 @@
import React from 'react';
import intl from 'react-intl-universal';
import { MenuItem, Intent } from '@blueprintjs/core';
import { TextStatus, Icon, Choose, T } from 'components';
@@ -110,7 +111,7 @@ const transformVendorCreditsToSearch = (vendorCredit) => ({
*/
export const universalSearchVendorCreditBind = () => ({
resourceType: RESOURCES_TYPES.VENDOR_CREDIT,
optionItemLabel: 'Vendor credits',
optionItemLabel: intl.get('vendor_credit.label'),
selectItemAction: VendorCreditUniversalSearchSelect,
itemRenderer: VendorCreditUniversalSearchItem,
itemSelect: transformVendorCreditsToSearch,

View File

@@ -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,

View File

@@ -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": "تاريخ الإشعار",

View File

@@ -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",