Compare commits

...

224 Commits

Author SHA1 Message Date
Ahmed Bouhuolia
11851d114d Merge pull request #16 from bigcapitalhq/develop
Release 1.5.5
2022-01-04 22:35:49 +02:00
elforjani13
3a3dd7a565 fix(VendorForm): placeholder phone number. 2022-01-04 22:31:01 +02:00
elforjani13
687dda1e7c fix(inviteUserFrom): fix localiztion. 2022-01-04 21:31:58 +02:00
elforjani13
bfa809c831 feat(VendorList): add note accessor & personal phone. 2022-01-04 20:47:43 +02:00
elforjani13
07145e92ab feat(CustomerList): add note accessor & personal phone. 2022-01-04 20:47:28 +02:00
a.bouhuolia
21779007be fix: application version. 2022-01-03 23:14:11 +02:00
a.bouhuolia
4fc1ecdc2d Merge branch 'main' of https://github.com/bigcapitalhq/client into main 2022-01-03 19:42:48 +02:00
a.bouhuolia
c9b5cecf7a Merge branch 'develop' into main 2022-01-03 19:42:23 +02:00
a.bouhuolia
4a46c00a07 chore: bump version. 2022-01-03 19:42:05 +02:00
a.bouhuolia
5c7ac0593d feat(GlobalErrors): localize the global errors. 2022-01-03 18:31:52 +02:00
a.bouhuolia
fa25fb4ede fix(TrialBalanceSheet): expand account name column. 2022-01-03 18:02:24 +02:00
elforjani13
c31e9dcd29 fix: inventory adjustment & contacts drawer. 2022-01-03 14:35:50 +02:00
a.bouhuolia
3566d3b855 Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2022-01-03 13:53:40 +02:00
a.bouhuolia
c5da97bce0 chore: changlog. 2022-01-03 13:53:04 +02:00
a.bouhuolia
0cfbe633bd feat: add .env.example file. 2022-01-03 13:53:02 +02:00
a.bouhuolia
55098d7b78 chore: remove repo logo. 2022-01-03 13:53:00 +02:00
a.bouhuolia
78610cd519 chore: upload repo logo. 2022-01-03 13:52:59 +02:00
a.bouhuolia
828a28b976 chore: update package-lock.json. 2022-01-03 13:52:58 +02:00
a.bouhuolia
daf5fc8aba feat: add version numebr on sidebar footer. 2022-01-03 13:49:55 +02:00
elforjani13
430ab95dc3 landed cost localiztion. 2022-01-03 13:38:22 +02:00
Ahmed Bouhuolia
8100a57195 Merge pull request #15 from bigcapitalhq/develop
Merge `develop` to `main`
2022-01-03 12:31:14 +02:00
a.bouhuolia
97d890bcef chore: remove repo logo. 2022-01-03 12:30:15 +02:00
a.bouhuolia
521df8511d chore: upload repo logo. 2022-01-03 12:24:28 +02:00
a.bouhuolia
73ec49b36a chore: update package-lock.json. 2022-01-03 12:06:07 +02:00
a.bouhuolia
cfc625edf9 Merge branch 'develop' 2022-01-03 11:46:00 +02:00
elforjani13
e1b6f0d879 fix:APAging summary stye. 2022-01-02 18:39:53 +02:00
a.bouhuolia
ecda9296b8 fix(FinancialReport): BIG-205 Financial reports missing border final border bottom. 2022-01-02 17:24:35 +02:00
a.bouhuolia
aba732724b Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2022-01-02 16:37:46 +02:00
a.bouhuolia
40bc7d4e99 fix: BIG-222 Manual journal details entries table footer. 2022-01-02 16:37:37 +02:00
elforjani13
7f1844aa6b BIG-231 Transactions number on drawer title. 2022-01-02 13:38:40 +02:00
a.bouhuolia
7ab7456d08 Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2022-01-01 18:11:15 +02:00
a.bouhuolia
de53a24d58 fix: BIG-209 Account details such as normal, account type not localized. 2022-01-01 18:11:06 +02:00
a.bouhuolia
e0c565388a fix: BIG-196 Bill landed cost transactions formatted allocate type. 2022-01-01 18:06:46 +02:00
elforjani13
3c73540b4e BIG-210 Refund credit & vendor drawer detail. 2022-01-01 15:34:04 +02:00
elforjani13
a4a2d0c888 BIG-225 Optimize style of refund vendor form. 2022-01-01 11:00:08 +02:00
elforjani13
e9797fd9a0 BIG-214 Min width submit button on edit mode. 2022-01-01 10:27:32 +02:00
elforjani13
40ae1aeb52 BIG-225 Add menu divider before delete on contextMenu. 2021-12-30 21:54:32 +02:00
elforjani13
b2c08d5645 Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-30 21:33:31 +02:00
elforjani13
ee6f4028eb BIG-232 customer and vendor drawer link. 2021-12-30 21:33:18 +02:00
a.bouhuolia
cdb8ea6721 Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-30 15:39:26 +02:00
a.bouhuolia
0173630e80 fix: BIG-206 Reconcilate credit note and vendor credit with invoices should amount to credit be max the invoice remaining amount. 2021-12-30 15:39:22 +02:00
elforjani13
4403bf2b06 Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-30 12:54:41 +02:00
elforjani13
f8e44c4f4e BIG-220 Avoid display empty status. 2021-12-30 12:54:22 +02:00
a.bouhuolia
0bd11419bb fix: BIG-199 Purchase invoice partial payment status progress height not consistent with sell invoice style. 2021-12-30 12:50:27 +02:00
a.bouhuolia
c1e229814f Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-30 12:38:12 +02:00
a.bouhuolia
871dcb62c4 fix: BIG-213 Landed cost checkbox disable with inventory items not service in purchase invoice. 2021-12-30 12:38:03 +02:00
elforjani13
5bf591d8c9 Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-30 12:36:21 +02:00
elforjani13
75b1cce380 BIG-211 Invalidate reconciliation credit & vendor transaction. 2021-12-30 12:35:28 +02:00
a.bouhuolia
119e6fa216 fix: BIG-195 Allocate landed cost amount max number should be transaction remaining amount. 2021-12-30 12:30:02 +02:00
elforjani13
6b98e1f1c2 BIG-204 payment transactions context menu actions. 2021-12-30 12:28:42 +02:00
elforjani13
fa23aa67d3 BIG-202 Remove the allocate actions bar. 2021-12-30 12:15:23 +02:00
elforjani13
9474a4fcd1 BIG-197 Bill landed amount text right align. 2021-12-30 11:56:58 +02:00
elforjani13
81c81bd09f fix: add ability credit & vendor tabs. 2021-12-29 14:37:03 +02:00
elforjani13
1492c24cfb fix: formatted_type in inventory adjustment. 2021-12-29 12:34:12 +02:00
a.bouhuolia
b4e9ee7ff3 feat(GLTable): columns text overflow. 2021-12-28 19:52:21 +02:00
elforjani13
e97bf56adb feat: isLoading state. 2021-12-28 18:32:55 +02:00
elforjani13
11d44c128b Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-28 17:58:53 +02:00
elforjani13
e615f62ef5 fix: customer & inventory adjustment. 2021-12-28 17:57:50 +02:00
a.bouhuolia
c69d29fb22 feat(TransactionsLocking): localization. 2021-12-28 17:53:47 +02:00
a.bouhuolia
1e472d278a fix(Estimate): estimate status. 2021-12-28 17:01:35 +02:00
elforjani13
1688f49bc1 fix: fix localiztion. 2021-12-28 13:43:53 +02:00
elforjani13
9182e13c07 feat: estimate & cashflow. 2021-12-28 13:10:15 +02:00
elforjani13
f2150a982a fix: add type_formatted in item detail. 2021-12-28 12:30:47 +02:00
elforjani13
d8efb17651 feat: add notes. 2021-12-28 12:21:56 +02:00
elforjani13
1e361dac66 feat: notes. 2021-12-27 22:23:41 +02:00
elforjani13
a6cd483eb9 Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-27 22:05:32 +02:00
elforjani13
765f00d203 feat: permissions localiztion. 2021-12-27 22:05:17 +02:00
a.bouhuolia
088d7d4b1d feat(TransactionsLocking): modify AR localization. 2021-12-27 18:59:01 +02:00
a.bouhuolia
92c9001c52 feat(AccountDetail): more transactions icon in RTL mode. 2021-12-27 18:43:02 +02:00
a.bouhuolia
93bd2af1d7 feat(Card): card footer actions. 2021-12-27 18:29:52 +02:00
a.bouhuolia
f261555b86 feat(InvoiceDetails): invoice payment transactions ability access control. 2021-12-27 16:19:13 +02:00
a.bouhuolia
62ab31efd2 Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-27 16:02:16 +02:00
a.bouhuolia
96cb3177aa feat: WIP role form localization. 2021-12-27 16:01:22 +02:00
elforjani13
d5f7cdf131 Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-27 15:20:48 +02:00
elforjani13
6ad3065f1f feat: landed hint. 2021-12-27 15:19:16 +02:00
a.bouhuolia
0860db87fb Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-27 15:05:17 +02:00
a.bouhuolia
2707415319 feat: Role form permissions dependecies. 2021-12-27 15:04:57 +02:00
elforjani13
99716e99a9 feat: localiztion. 2021-12-27 14:44:04 +02:00
a.bouhuolia
d1a67ca2ed Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-27 11:08:10 +02:00
a.bouhuolia
a1ed9bf4da feat: add rtlcss to styled components. 2021-12-27 11:08:05 +02:00
elforjani13
99df627633 feat: empty status in credit & vednor. 2021-12-26 20:56:25 +02:00
a.bouhuolia
e1646e92a8 fix: BIG-160 Remove expense default resource type on universal search. 2021-12-26 20:07:11 +02:00
a.bouhuolia
d4138fdf4e feat(RoleForm): service full access. 2021-12-26 19:09:20 +02:00
a.bouhuolia
49b6deed6d Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-26 18:26:22 +02:00
a.bouhuolia
0dddf3d1d0 feat: permissions service full access. 2021-12-26 18:26:05 +02:00
elforjani13
d5acb3696e feat: add convert to vendor credit in drawer. 2021-12-26 17:11:04 +02:00
elforjani13
2a9c1a9833 feat: add convert to credit note in drawer. 2021-12-26 16:34:05 +02:00
elforjani13
80d86b01de feat: add payment receive & bill detail footer. 2021-12-26 13:28:25 +02:00
elforjani13
4a42fa4edc feat: credit note detail footer. 2021-12-26 13:26:53 +02:00
elforjani13
8ea92513fe feat: receipt detail footer. 2021-12-26 13:26:10 +02:00
elforjani13
a075b998d3 feat: estimate detail footer. 2021-12-26 13:25:52 +02:00
elforjani13
93aa60124b feat: add convert to vendor credit. 2021-12-26 13:25:07 +02:00
elforjani13
f9a7306e47 feat: add convert to credit note. 2021-12-26 13:24:38 +02:00
elforjani13
10f0d47b54 fix: BIG-145 rename product/service to product. 2021-12-26 13:22:27 +02:00
a.bouhuolia
1d505db7bf fix: BIG-193 purchase item description does fill on item entries table. 2021-12-25 19:40:14 +02:00
a.bouhuolia
6975ebb9e7 feat: styled preferences page cards. 2021-12-25 19:35:07 +02:00
a.bouhuolia
5defb5a279 feat: credit note and vendor credit universal search. 2021-12-25 18:52:46 +02:00
a.bouhuolia
1497a27e7d feat: add terms and conditions to invoice details. 2021-12-25 12:10:29 +02:00
elforjani13
af9f4c45fc feat: add inventory adjustment entries. 2021-12-23 17:58:26 +02:00
elforjani13
d719ac60bd feat: add ability credit & vendor & item transactions. 2021-12-23 17:27:28 +02:00
elforjani13
789c8db693 feat: localization. 2021-12-23 13:33:02 +02:00
a.bouhuolia
7eea202f9d feat(CommercialDoc): tweak in style. 2021-12-23 11:16:28 +02:00
a.bouhuolia
5b581b86f4 Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-23 11:10:28 +02:00
a.bouhuolia
1ad2117c37 feat: optimize style of card component. 2021-12-23 11:10:07 +02:00
elforjani13
b1afa88c16 feat: add localization. 2021-12-22 22:02:38 +02:00
elforjani13
4b7af1c634 Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-22 20:43:07 +02:00
elforjani13
29a4ab7590 feat: add locking localization. 2021-12-22 20:42:41 +02:00
a.bouhuolia
7150f12a01 Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-22 19:17:46 +02:00
a.bouhuolia
934b0abbe6 feat: optimize style of role permissions form. 2021-12-22 19:17:41 +02:00
elforjani13
b36468ff7f feat: add localization. 2021-12-22 15:59:16 +02:00
a.bouhuolia
10c421dea0 feat: optimize account details. 2021-12-21 20:29:51 +02:00
a.bouhuolia
661cbaf11e feat: optimize landed cost entries table style. 2021-12-21 20:18:34 +02:00
a.bouhuolia
1e5b394575 feat: optimize style of reconcile customer/vendor credit table. 2021-12-21 20:09:32 +02:00
a.bouhuolia
dd7b44eb29 feat: display expense formatted amount. 2021-12-21 18:36:45 +02:00
a.bouhuolia
a456b9d942 feat: optimize expense and manual journal details status. 2021-12-21 18:10:58 +02:00
a.bouhuolia
5429643db5 feat: optimize expense and manual journal details. 2021-12-21 17:57:03 +02:00
a.bouhuolia
13310b1aac feat: optimize table of item associated transactions. 2021-12-21 17:11:41 +02:00
a.bouhuolia
7987f68aa3 refactor: payment made details total lines. 2021-12-21 16:55:35 +02:00
a.bouhuolia
1d159c2757 Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-21 16:51:54 +02:00
a.bouhuolia
588995e759 refactor: Total lines of commercial documents. 2021-12-21 16:51:47 +02:00
a.bouhuolia
e2349f1951 feat: changelog. 2021-12-21 16:47:15 +02:00
elforjani13
e80901c7a6 fix: itemPerfernce. 2021-12-21 12:24:25 +02:00
elforjani13
c87a98a5e4 fix: accountant. 2021-12-21 12:12:06 +02:00
elforjani13
da3564d315 fix: handle switch button item transaction. 2021-12-21 10:43:04 +02:00
elforjani13
0d924464ea feat: add style of payment made. 2021-12-20 16:47:48 +02:00
elforjani13
961082c50b Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-20 16:11:21 +02:00
elforjani13
828c33bee1 feat: add style of vendor credit. 2021-12-20 16:11:10 +02:00
a.bouhuolia
1540a20a6e Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-20 16:08:30 +02:00
a.bouhuolia
2a37497648 feat: optimize style of sale receipt details. 2021-12-20 16:08:25 +02:00
elforjani13
dbe067a27c Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-20 15:31:15 +02:00
elforjani13
3511348d04 feat: add style of bill. 2021-12-20 15:31:03 +02:00
a.bouhuolia
ace3fdc569 feat: optmize style of payment receive details. 2021-12-20 14:33:48 +02:00
a.bouhuolia
a0098382e7 feat: optimize style of sale estimate details. 2021-12-20 14:12:19 +02:00
a.bouhuolia
a953236bff Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-20 13:28:22 +02:00
a.bouhuolia
4dda2a37aa feat: optimize style of invoice details.
feat: optimize style of credit note details.
feat: optimize global style checkbox  of the application.
2021-12-20 13:19:59 +02:00
elforjani13
0e79dceae8 feat: add journal entries credit & vendor. 2021-12-20 11:47:01 +02:00
elforjani13
0ca0a2ee0b feat: add context menu. 2021-12-20 11:12:38 +02:00
elforjani13
7095903653 feat: add contextMenu in item transactions. 2021-12-19 19:29:42 +02:00
elforjani13
30841d57dc feat: add item payment transactions. 2021-12-19 18:25:41 +02:00
elforjani13
d0f889850c feat: add contextMenu in invoice & bill transactions. 2021-12-19 17:30:16 +02:00
elforjani13
f9fe3506c5 feat: item payment transactions. 2021-12-19 17:29:25 +02:00
elforjani13
8390e5ea6b fix: fix errors. 2021-12-16 21:11:21 +02:00
a.bouhuolia
fcd1a8849d fix(Invoice|Bill): draft status round tag. 2021-12-16 14:48:38 +02:00
a.bouhuolia
9bd047917d feat(EstimatesList): optimize status tags. 2021-12-16 12:49:11 +02:00
a.bouhuolia
2108666f3a Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-15 22:31:28 +02:00
a.bouhuolia
0f10b71604 feat(Changelog): release v1.5.0 logs. 2021-12-15 22:31:24 +02:00
elforjani13
09e739a5a9 feat: edit locking transactions. 2021-12-15 20:45:42 +02:00
elforjani13
a7a94ba201 fix: fix format. 2021-12-15 20:19:04 +02:00
a.bouhuolia
3466828b65 feat(VendorCredit): optimize data table style. 2021-12-15 19:55:47 +02:00
a.bouhuolia
cfed874182 feat(RefundCreditNote): optimize style. 2021-12-15 19:54:17 +02:00
a.bouhuolia
c688b8700e feat(TextStatus): new component. 2021-12-15 19:53:21 +02:00
a.bouhuolia
7a608d2ee3 feat: transactions locking content. 2021-12-15 19:53:04 +02:00
a.bouhuolia
33b998cbda Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-15 12:01:44 +02:00
a.bouhuolia
d7da0ad24e feat: architect transactions locking. 2021-12-15 11:59:39 +02:00
elforjani13
92cff82184 feat: add edit locking transactions. 2021-12-14 22:05:17 +02:00
a.bouhuolia
7cd2b1c533 feat: transactions list container dynamic width. 2021-12-14 19:09:41 +02:00
a.bouhuolia
29a34f826a feat: controlled transactions locking type. 2021-12-14 19:01:15 +02:00
a.bouhuolia
bd97a73c65 Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-14 18:04:07 +02:00
a.bouhuolia
eebe4c46fa feat: handle transactions locking request error. 2021-12-14 18:03:58 +02:00
elforjani13
6aba694518 feat: add payment trasnactions. 2021-12-14 17:56:42 +02:00
elforjani13
ae7d37a0e0 Merge branch 'feature/associated-payment-transactions' into develop 2021-12-14 13:06:05 +02:00
elforjani13
897e674912 feat add localization & auto focus. 2021-12-13 20:14:16 +02:00
a.bouhuolia
a52f00eeb2 feat: optimize transactions locking. 2021-12-13 19:22:56 +02:00
a.bouhuolia
0ee9b54a9b fix: cancel partial locking. 2021-12-13 17:46:26 +02:00
a.bouhuolia
dd8bb9cb18 Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-13 17:37:32 +02:00
a.bouhuolia
86762d2dc8 feat: add little space between items of transactions locking. 2021-12-13 17:37:26 +02:00
elforjani13
c124002605 feat: add cancel unlocking alert. 2021-12-13 17:36:48 +02:00
a.bouhuolia
8e18d4a0dc feat: modify the locked transactions module. 2021-12-13 16:47:52 +02:00
a.bouhuolia
21e075b479 feat: validate before move to full and partial transactions locking. 2021-12-13 16:28:36 +02:00
a.bouhuolia
51dfee699f Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-13 15:23:49 +02:00
a.bouhuolia
a6a10ef6b8 feat: switch betweel full and partial transactions locking. 2021-12-13 15:22:33 +02:00
elforjani13
fba46e2479 feat: add module in payload. 2021-12-13 15:20:16 +02:00
elforjani13
c4650f5d31 fix: name list. 2021-12-13 14:03:34 +02:00
a.bouhuolia
a441f78e61 Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop 2021-12-13 13:58:13 +02:00
a.bouhuolia
280d991567 feat: add lock all transactions at once callout. 2021-12-13 13:53:21 +02:00
elforjani13
62e5db86a5 feat: locking transaction page. 2021-12-13 13:48:21 +02:00
a.bouhuolia
4fe4178090 feat: optimize transactions locking style. 2021-12-13 12:12:48 +02:00
elforjani13
dfc0fbbb71 feat: add transactions locking query. 2021-12-12 19:15:31 +02:00
elforjani13
295fff4746 feat: add unlocking transactions dialog. 2021-12-12 19:10:58 +02:00
elforjani13
c671fcd011 feat: add unlocking partail transactions dialog. 2021-12-12 19:06:55 +02:00
elforjani13
a6141d9f73 feat: add transactions locking. 2021-12-12 19:01:52 +02:00
elforjani13
91d1dddfed fix: add credited_amount & calculate remaining. 2021-12-09 16:55:29 +02:00
elforjani13
ca746df86d feat: add quick create & sortable. 2021-12-09 14:01:53 +02:00
elforjani13
02330c84b1 feat: invalidate query. 2021-12-08 22:59:48 +02:00
elforjani13
c89b8b131d fix: fix notes. 2021-12-08 22:43:44 +02:00
elforjani13
3690c88c04 fix: loading state on submit button. 2021-12-08 20:11:09 +02:00
elforjani13
6573f19ff8 fix: notes. 2021-12-08 18:53:14 +02:00
elforjani13
a948dd4236 feat: add delete reconcile & handle error. 2021-12-08 18:51:21 +02:00
a.bouhuolia
56b1c36c9d Merge branch 'feature/credit-memo' into develop 2021-12-08 15:43:49 +02:00
a.bouhuolia
bc7ec834c0 Merge branch 'feature/credit-memo' into develop 2021-12-08 15:21:39 +02:00
elforjani13
5963d14fdd feat: add reconcile vendor credit. 2021-12-08 14:33:33 +02:00
elforjani13
80b8083059 feat: add reconcile credit style. 2021-12-07 21:12:56 +02:00
elforjani13
ecaf23d269 feat: add reconcile credit transactions table. 2021-12-07 20:58:17 +02:00
elforjani13
14f33c667b feat: handle error message. 2021-12-07 20:56:54 +02:00
elforjani13
78c42acb17 feat: add reconcile credit note. 2021-12-07 20:55:47 +02:00
elforjani13
192bcdc696 feat: add filterByTypes 2021-12-07 11:00:57 +02:00
elforjani13
ac99a6ca75 feat: add status & opened alert in credit & vendor. 2021-12-06 16:28:42 +02:00
elforjani13
2a48d9be51 feat: add refund transactions. 2021-12-05 19:30:52 +02:00
elforjani13
ab48e6092a feat: add refund credit & vendor dialogs. 2021-12-05 19:29:39 +02:00
elforjani13
bf99bda616 fix: credit & vendor reducer. 2021-12-04 22:16:36 +02:00
elforjani13
e1a3f471cb feat: add Invalidate landed cost in bill. 2021-12-04 18:59:01 +02:00
elforjani13
07e52bef7a feat: add payment transaction & style 2021-12-04 18:08:20 +02:00
a.bouhuolia
d3c5131020 fix: allocate landed cost on inventory items. 2021-12-04 16:32:37 +02:00
elforjani13
58a0ed4ecd fix: formatted amount & lang in credit view. 2021-12-04 12:41:08 +02:00
elforjani13
26cf1d20f3 feat: add formatted amount & date in credit view. 2021-12-02 17:04:24 +02:00
elforjani13
0fedd2479d feat: add formatted amount & data in credit. 2021-12-02 16:07:18 +02:00
elforjani13
ba585271b0 feat: landed cost fields & style. 2021-12-02 15:36:29 +02:00
elforjani13
0c4259a05b feat: style journal entries. 2021-12-02 15:34:26 +02:00
elforjani13
31e0bbc187 feat: add View detail. 2021-12-01 16:59:37 +02:00
elforjani13
43b91503d2 feat: add auto increment in vendor credit number. 2021-12-01 14:02:54 +02:00
elforjani13
432e2d202a feat: add Auto increment in credit note number. 2021-12-01 14:02:31 +02:00
elforjani13
eeb16f4362 feat: add create & edit & delete in credit note. 2021-11-30 21:04:36 +02:00
elforjani13
15fa1729a2 feat: add create & edit & delete in vendor credit. 2021-11-30 16:34:13 +02:00
elforjani13
119d0b2839 feat: Vendor Credit note. 2021-11-29 16:33:43 +02:00
elforjani13
0a9798e7a7 feat: Credit note. 2021-11-29 16:14:22 +02:00
a.bouhuolia
008faaece6 Merge branch 'master' of https://github.com/bigcapitalhq/client 2021-11-28 09:05:55 +02:00
a.bouhuolia
27916585a5 Merge branch 'develop' 2021-11-28 09:04:32 +02:00
a.bouhuolia
51fde0cc31 Merge branch 'feature/draft' of https://github.com/bigcapitalhq/client 2021-11-23 15:29:17 +02:00
elforjani13
802f7cc442 fix: add note to customer & vendor details. 2021-11-23 13:13:23 +02:00
a.bouhuolia
5f0700b5e5 fix: hotbug account dialog edit payload transformation. 2021-11-20 18:52:45 +02:00
a.bouhuolia
48348da663 fix: invite user auth route. 2021-11-20 15:49:28 +02:00
elforjani13
0ad5a9ed03 feat: item payment transactions. 2021-11-15 21:45:24 +02:00
elforjani13
bd282acae4 feat: invoice payment transactions. 2021-11-15 21:44:46 +02:00
elforjani13
377fb07c70 feat: bill payment transactions. 2021-11-15 21:43:39 +02:00
530 changed files with 21136 additions and 2615 deletions

1
.env.example Normal file
View File

@@ -0,0 +1 @@
APP_VERSION=$npm_package_version

1
.gitignore vendored
View File

@@ -13,6 +13,7 @@
# misc # misc
.DS_Store .DS_Store
.env
.env.local .env.local
.env.development.local .env.development.local
.env.test.local .env.test.local

View File

@@ -2,6 +2,52 @@
All notable changes to Bigcapital server-side will be in this file. All notable changes to Bigcapital server-side will be in this file.
## [1.5.3] - 03-01-2020
### Fixed
- Localize the global errors.
- Expand account name column on trial balance sheet.
## [1.5.0] - 20-12-2021
### Added
- Add credit note on sales module.
- Add vendor credit on purchases module.
- Optimize landed costs on purchase invoices.
- Display associated payment transactions on sale invoice drawer.
- Display associated pamyment transactions on purchase invoice drawer.
- Display item associate invoice, bill, estimate and receipt transactions.
- Transactions locking on all transactions or individual modules.
- Roles and permissions access control module.
- Optimize readonly details style of invoice, receipt, estimate, payment receive,
purchase invoice, expense, manual journal, inventory adjustment and cashflow transaction.
### Changed
- Dashboard meta boot and authenticated user request query.
- Optimize Arabic localization.
## [1.4.0] - 11-09-2021
### Added
- Add SMS notification on sale invoice, receipt, customers payments modules.
- Customer quick create in customers list.
- Item quick create in items list.
### Changes
change: BIG-171 alerts in global scope and lazy loading.
### Fixed
fix: BIG-140 - Reordering sell, cost and inventory account on item details.
fix: BIG-144 - Typo adjustment dialog success message.
fix: BIG-148 - Items entries ordered by index.
fix: BIG-132 AR/AP aging summary report filter by none transactions/zero contacts.
## [1.2.0-RC] - 03-09-2021 ## [1.2.0-RC] - 03-09-2021
Here we write upgrading notes for brands. It's a team effort to make them as Here we write upgrading notes for brands. It's a team effort to make them as
@@ -32,7 +78,7 @@ straightforward as possible.
- Inventory adjustment publish action. - Inventory adjustment publish action.
- Customers and vendors activate and inactivate action. - Customers and vendors activate and inactivate action.
- Add refresh button on dashboard actions bar to all datatables resources. - Add refresh button on dashboard actions bar to all datatables resources.
- Add clickable datatable rows to display each row details. - Add clickable datatable rows to display each row details.
### Changed ### Changed

View File

@@ -85,6 +85,9 @@ function getClientEnvironment(publicUrl) {
WDS_SOCKET_HOST: process.env.WDS_SOCKET_HOST, WDS_SOCKET_HOST: process.env.WDS_SOCKET_HOST,
WDS_SOCKET_PATH: process.env.WDS_SOCKET_PATH, WDS_SOCKET_PATH: process.env.WDS_SOCKET_PATH,
WDS_SOCKET_PORT: process.env.WDS_SOCKET_PORT, WDS_SOCKET_PORT: process.env.WDS_SOCKET_PORT,
// Application version.
VERSION: paths.appVersion
} }
); );
// Stringify all values so we can feed into webpack DefinePlugin // Stringify all values so we can feed into webpack DefinePlugin

View File

@@ -48,6 +48,8 @@ const resolveModule = (resolveFn, filePath) => {
return resolveFn(`${filePath}.js`); return resolveFn(`${filePath}.js`);
}; };
const appVersion = require(resolveApp('package.json')).version;
// config after eject: we're in ./config/ // config after eject: we're in ./config/
module.exports = { module.exports = {
dotenv: resolveApp('.env'), dotenv: resolveApp('.env'),
@@ -65,6 +67,7 @@ module.exports = {
proxySetup: resolveApp('src/setupProxy.js'), proxySetup: resolveApp('src/setupProxy.js'),
appNodeModules: resolveApp('node_modules'), appNodeModules: resolveApp('node_modules'),
publicUrlOrPath, publicUrlOrPath,
appVersion
}; };

779
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{ {
"name": "bigcapital-client", "name": "bigcapital-client",
"version": "1.2.0", "version": "1.5.3",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@babel/core": "7.8.4", "@babel/core": "7.8.4",
@@ -36,6 +36,7 @@
"cross-env": "^7.0.2", "cross-env": "^7.0.2",
"css-loader": "3.4.2", "css-loader": "3.4.2",
"deep-map-keys": "^2.0.1", "deep-map-keys": "^2.0.1",
"dependency-graph": "^0.11.0",
"dotenv": "8.2.0", "dotenv": "8.2.0",
"dotenv-expand": "5.1.0", "dotenv-expand": "5.1.0",
"eslint": "^6.6.0", "eslint": "^6.6.0",
@@ -46,6 +47,7 @@
"eslint-plugin-jsx-a11y": "6.2.3", "eslint-plugin-jsx-a11y": "6.2.3",
"eslint-plugin-react": "7.18.0", "eslint-plugin-react": "7.18.0",
"eslint-plugin-react-hooks": "^1.6.1", "eslint-plugin-react-hooks": "^1.6.1",
"fast-deep-equal": "^3.1.3",
"file-loader": "4.3.0", "file-loader": "4.3.0",
"flow-bin": "^0.123.0", "flow-bin": "^0.123.0",
"formik": "^2.2.5", "formik": "^2.2.5",
@@ -106,6 +108,7 @@
"semver": "6.3.0", "semver": "6.3.0",
"style-loader": "0.23.1", "style-loader": "0.23.1",
"styled-components": "^5.3.1", "styled-components": "^5.3.1",
"stylis-rtlcss": "^2.1.1",
"terser-webpack-plugin": "2.3.4", "terser-webpack-plugin": "2.3.4",
"ts-pnp": "1.1.5", "ts-pnp": "1.1.5",
"url-loader": "2.3.0", "url-loader": "2.3.0",

6
src/common/TableStyle.js Normal file
View File

@@ -0,0 +1,6 @@
export const TableStyle = {
Constrant: 'constrant',
Regular: 'regular'
}

View File

@@ -17,6 +17,8 @@ export const AbilitySubject = {
Preferences: 'Preferences', Preferences: 'Preferences',
ExchangeRate: 'ExchangeRate', ExchangeRate: 'ExchangeRate',
SubscriptionBilling: 'SubscriptionBilling', SubscriptionBilling: 'SubscriptionBilling',
CreditNote: 'CreditNote',
VendorCredit: 'VendorCredit',
}; };
export const ItemAction = { export const ItemAction = {
@@ -66,6 +68,21 @@ export const PaymentReceiveAction = {
NotifyBySms: 'NotifyBySms', NotifyBySms: 'NotifyBySms',
}; };
export const CreditNoteAction = {
View: 'View',
Create: 'Create',
Edit: 'Edit',
Delete: 'Delete',
Refund: 'Refund'
};
export const VendorCreditAction = {
View: 'View',
Create: 'Create',
Edit: 'Edit',
Delete: 'Delete',
Refund: 'Refund'
};
export const BillAction = { export const BillAction = {
View: 'View', View: 'View',
Create: 'Create', Create: 'Create',

View File

@@ -39,6 +39,8 @@ const CLASSES = {
PAGE_FORM_ITEM: 'page-form--item', PAGE_FORM_ITEM: 'page-form--item',
PAGE_FORM_MAKE_JOURNAL: 'page-form--make-journal-entries', PAGE_FORM_MAKE_JOURNAL: 'page-form--make-journal-entries',
PAGE_FORM_EXPENSE: 'page-form--expense', PAGE_FORM_EXPENSE: 'page-form--expense',
PAGE_FORM_CREDIT_NOTE:'page-form--credit-note',
PAGE_FORM_VENDOR_CREDIT_NOTE:'page-form--vendor-credit-note',
FORM_GROUP_LIST_SELECT: 'form-group--select-list', FORM_GROUP_LIST_SELECT: 'form-group--select-list',

View File

@@ -14,4 +14,8 @@ export const DRAWERS = {
QUICK_WRITE_VENDOR: 'quick-write-vendor', QUICK_WRITE_VENDOR: 'quick-write-vendor',
QUICK_CREATE_CUSTOMER: 'quick-create-customer', QUICK_CREATE_CUSTOMER: 'quick-create-customer',
QUICK_CREATE_ITEM: 'quick-create-item', QUICK_CREATE_ITEM: 'quick-create-item',
CREDIT_NOTE_DETAIL_DRAWER: 'credit-note-detail-drawer',
VENDOR_CREDIT_DETAIL_DRAWER: 'vendor-credit-detail-drawer',
REFUND_CREDIT_NOTE_DETAIL_DRAWER:'refund-credit-detail-drawer',
REFUND_VENDOR_CREDIT_DETAIL_DRAWER:'refund-vendor-detail-drawer'
}; };

4
src/common/index.js Normal file
View File

@@ -0,0 +1,4 @@
export * from './TableStyle';

View File

@@ -0,0 +1,51 @@
import intl from 'react-intl-universal';
import {
AbilitySubject,
SaleEstimateAction,
SaleReceiptAction,
SaleInvoiceAction,
BillAction,
} from '../common/abilityOption';
import { useAbilitiesFilter } from '../hooks';
export const getItemPaymentTransactions = () => [
{
name: 'invoices',
label: intl.get('invoices'),
permission: {
subject: AbilitySubject.Invoice,
ability: SaleInvoiceAction.View,
},
},
{
name: 'estimates',
label: intl.get('estimates'),
permission: {
subject: AbilitySubject.Estimate,
ability: SaleEstimateAction.View,
},
},
{
name: 'receipts',
label: intl.get('receipts'),
permission: {
subject: AbilitySubject.Receipt,
ability: SaleReceiptAction.View,
},
},
{
name: 'bills',
label: intl.get('bills'),
permission: {
subject: AbilitySubject.Bill,
ability: BillAction.View,
},
},
];
export const useGetItemPaymentTransactionsMenu = () => {
const itemTransactionMenu = getItemPaymentTransactions();
const abilitiesFilter = useAbilitiesFilter();
return abilitiesFilter(itemTransactionMenu);
};

View File

@@ -0,0 +1,659 @@
import { chain } from 'lodash';
import intl from 'react-intl-universal';
import {
AbilitySubject,
AccountAction,
BillAction,
CreditNoteAction,
CustomerAction,
ExpenseAction,
ItemAction,
ManualJournalAction,
PaymentMadeAction,
PaymentReceiveAction,
ReportsAction,
SaleEstimateAction,
SaleInvoiceAction,
SaleReceiptAction,
VendorAction,
VendorCreditAction,
} from './abilityOption';
export const ModulePermissionsStyle = {
Columns: 'columns',
Vertical: 'vertical',
};
const PermissionColumn = {
View: 'view',
Create: 'create',
Delete: 'delete',
Edit: 'edit',
};
export const getPermissionsSchema = () => [
{
label: intl.get('permissions.items_inventory'),
type: ModulePermissionsStyle.Columns,
serviceFullAccess: true,
columns: [
{ label: intl.get('permissions.column.view'), key: 'view' },
{ label: intl.get('permissions.column.create'), key: 'create' },
{ label: intl.get('permissions.column.edit'), key: 'edit' },
{ label: intl.get('permissions.column.delete'), key: 'delete' },
],
services: [
{
label: intl.get('permissions.items'),
subject: AbilitySubject.Item,
permissions: [
{
label: intl.get('permissions.column.view'),
key: ItemAction.View,
relatedColumn: PermissionColumn.View,
},
{
label: intl.get('permissions.column.create'),
key: ItemAction.Create,
relatedColumn: PermissionColumn.Create,
depend: [{ key: ItemAction.View }],
},
{
label: intl.get('permissions.column.edit'),
key: ItemAction.Edit,
relatedColumn: PermissionColumn.Edit,
depend: [{ key: ItemAction.Create }],
},
{
label: intl.get('permissions.column.delete'),
key: ItemAction.Delete,
relatedColumn: PermissionColumn.Delete,
depend: [{ key: ItemAction.Edit }],
},
],
},
{
label: intl.get('permissions.inventory_adjustment'),
subject: AbilitySubject.InventoryAdjustment,
permissions: [
{
label: 'View',
key: ItemAction.View,
relatedColumn: PermissionColumn.View,
},
{
label: 'Create',
key: ItemAction.Create,
relatedColumn: PermissionColumn.Create,
depend: [{ key: ItemAction.View }],
},
{
label: 'Edit',
key: ItemAction.Edit,
relatedColumn: PermissionColumn.Edit,
depend: [{ key: ItemAction.Create }],
},
{
label: 'Delete',
key: ItemAction.Delete,
relatedColumn: PermissionColumn.Delete,
depend: [{ key: ItemAction.Edit }],
},
],
},
],
},
{
label: intl.get('permissions.contacts'),
type: ModulePermissionsStyle.Columns,
serviceFullAccess: true,
moduleFullAccess: true,
columns: [
{ label: intl.get('permissions.column.view'), key: 'view' },
{ label: intl.get('permissions.column.create'), key: 'create' },
{ label: intl.get('permissions.column.edit'), key: 'edit' },
{ label: intl.get('permissions.column.delete'), key: 'delete' },
],
services: [
{
label: intl.get('permissions.customers'),
subject: AbilitySubject.Customer,
permissions: [
{
label: intl.get('permissions.column.view'),
key: CustomerAction.View,
relatedColumn: PermissionColumn.View,
},
{
label: intl.get('permissions.column.create'),
key: CustomerAction.Create,
relatedColumn: PermissionColumn.Create,
depend: [{ key: CustomerAction.View }],
},
{
label: intl.get('permissions.column.edit'),
key: CustomerAction.Edit,
relatedColumn: PermissionColumn.Edit,
depend: [{ key: CustomerAction.Create }],
},
{
label: intl.get('permissions.column.delete'),
key: CustomerAction.Delete,
relatedColumn: PermissionColumn.Delete,
depend: [{ key: CustomerAction.Edit }],
},
],
},
{
label: intl.get('permissions.vendors'),
subject: AbilitySubject.Vendor,
permissions: [
{
label: intl.get('permissions.column.view'),
key: VendorAction.View,
relatedColumn: PermissionColumn.View,
},
{
label: intl.get('permissions.column.create'),
key: VendorAction.Create,
relatedColumn: PermissionColumn.Create,
depend: [{ key: VendorAction.View }],
},
{
label: intl.get('permissions.column.edit'),
key: VendorAction.Edit,
relatedColumn: PermissionColumn.Edit,
depend: [{ key: VendorAction.Create }],
},
{
label: intl.get('permissions.column.delete'),
key: VendorAction.Delete,
relatedColumn: PermissionColumn.Delete,
depend: [{ key: VendorAction.Edit }],
},
],
},
],
},
{
label: intl.get('permissions.sales'),
type: ModulePermissionsStyle.Columns,
serviceFullAccess: true,
moduleFullAccess: true,
columns: [
{ label: intl.get('permissions.column.view'), key: 'view' },
{ label: intl.get('permissions.column.create'), key: 'create' },
{ label: intl.get('permissions.column.edit'), key: 'edit' },
{ label: intl.get('permissions.column.delete'), key: 'delete' },
],
services: [
{
label: intl.get('permissions.sale_invoice'),
subject: AbilitySubject.Invoice,
permissions: [
{
label: intl.get('permissions.column.view'),
key: SaleInvoiceAction.View,
relatedColumn: PermissionColumn.View,
},
{
label: intl.get('permissions.column.create'),
key: SaleInvoiceAction.Create,
relatedColumn: PermissionColumn.Create,
depend: [{ key: SaleInvoiceAction.View }],
},
{
label: intl.get('permissions.column.edit'),
key: SaleInvoiceAction.Edit,
relatedColumn: PermissionColumn.Edit,
depend: [{ key: SaleInvoiceAction.Create }],
},
{
label: intl.get('permissions.column.delete'),
key: SaleInvoiceAction.Delete,
relatedColumn: PermissionColumn.Delete,
depend: [{ key: SaleInvoiceAction.Edit }],
},
{
label: intl.get('permissions.column.written_off_invoice'),
key: SaleInvoiceAction.Writeoff,
depend: [{ key: SaleInvoiceAction.Edit }],
},
],
},
{
label: intl.get('permissions.sale_estimate'),
subject: AbilitySubject.Estimate,
permissions: [
{
label: intl.get('permissions.column.view'),
key: SaleEstimateAction.View,
relatedColumn: PermissionColumn.View,
},
{
label: intl.get('permissions.column.create'),
key: SaleEstimateAction.Create,
relatedColumn: PermissionColumn.Create,
depend: [{ key: SaleEstimateAction.View }],
},
{
label: intl.get('permissions.column.edit'),
key: SaleEstimateAction.Edit,
relatedColumn: PermissionColumn.Edit,
depend: [{ key: SaleEstimateAction.Create }],
},
{
label: intl.get('permissions.column.delete'),
key: SaleEstimateAction.Delete,
relatedColumn: PermissionColumn.Delete,
depend: [{ key: SaleEstimateAction.Edit }],
},
],
},
{
label: intl.get('permissions.sale_receipt'),
subject: AbilitySubject.Receipt,
permissions: [
{
label: intl.get('permissions.column.view'),
key: SaleReceiptAction.View,
relatedColumn: PermissionColumn.View,
},
{
label: intl.get('permissions.column.create'),
key: SaleReceiptAction.Create,
relatedColumn: PermissionColumn.Create,
depend: [{ key: SaleReceiptAction.View }],
},
{
label: intl.get('permissions.column.edit'),
key: SaleReceiptAction.Edit,
relatedColumn: PermissionColumn.Edit,
depend: [{ key: SaleReceiptAction.Create }],
},
{
label: intl.get('permissions.column.delete'),
key: SaleReceiptAction.Delete,
relatedColumn: PermissionColumn.Delete,
depend: [{ key: SaleReceiptAction.Edit }],
},
],
},
{
label: intl.get('permissions.credit_note'),
subject: AbilitySubject.CreditNote,
permissions: [
{
label: intl.get('permissions.column.view'),
key: CreditNoteAction.View,
relatedColumn: PermissionColumn.View,
},
{
label: intl.get('permissions.column.create'),
key: CreditNoteAction.Create,
relatedColumn: PermissionColumn.Create,
depend: [{ key: CreditNoteAction.View }],
},
{
label: intl.get('permissions.column.edit'),
key: CreditNoteAction.Edit,
relatedColumn: PermissionColumn.Edit,
depend: [{ key: CreditNoteAction.Create }],
},
{
label: intl.get('permissions.column.delete'),
key: CreditNoteAction.Delete,
relatedColumn: PermissionColumn.Delete,
depend: [{ key: CreditNoteAction.Edit }],
},
{
label: intl.get('permissions.column.refund_credit_note'),
key: CreditNoteAction.Refund,
depend: [{ key: CreditNoteAction.View }],
},
],
},
{
label: intl.get('permissions.payment_receive'),
subject: AbilitySubject.PaymentReceive,
permissions: [
{
label: intl.get('permissions.column.view'),
key: PaymentReceiveAction.View,
relatedColumn: PermissionColumn.View,
},
{
label: intl.get('permissions.column.create'),
key: PaymentReceiveAction.Create,
relatedColumn: PermissionColumn.Create,
depend: [{ key: PaymentReceiveAction.View }],
},
{
label: intl.get('permissions.column.edit'),
key: PaymentReceiveAction.Edit,
relatedColumn: PermissionColumn.Edit,
depend: [{ key: PaymentReceiveAction.Create }],
},
{
label: intl.get('permissions.column.delete'),
key: PaymentReceiveAction.Delete,
relatedColumn: PermissionColumn.Delete,
depend: [{ key: PaymentReceiveAction.Edit }],
},
],
},
],
},
{
label: intl.get('permissions.purchases'),
type: ModulePermissionsStyle.Columns,
serviceFullAccess: true,
moduleFullAccess: true,
columns: [
{ label: intl.get('permissions.column.view'), key: 'view' },
{ label: intl.get('permissions.column.create'), key: 'create' },
{ label: intl.get('permissions.column.edit'), key: 'edit' },
{ label: intl.get('permissions.column.delete'), key: 'delete' },
],
services: [
{
label: intl.get('permissions.bills'),
subject: AbilitySubject.Bill,
permissions: [
{
label: intl.get('permissions.column.view'),
key: BillAction.View,
relatedColumn: PermissionColumn.View,
},
{
label: intl.get('permissions.column.create'),
key: BillAction.Create,
relatedColumn: PermissionColumn.Create,
depend: [{ key: BillAction.View }],
},
{
label: intl.get('permissions.column.edit'),
key: BillAction.Edit,
relatedColumn: PermissionColumn.Edit,
depend: [{ key: BillAction.Create }],
},
{
label: intl.get('permissions.column.delete'),
key: BillAction.Delete,
relatedColumn: PermissionColumn.Delete,
depend: [{ key: BillAction.Edit }],
},
],
},
{
label: intl.get('permissions.vendor_credits'),
subject: AbilitySubject.VendorCredit,
permissions: [
{
label: intl.get('permissions.column.view'),
key: VendorCreditAction.View,
relatedColumn: PermissionColumn.View,
},
{
label: intl.get('permissions.column.create'),
key: VendorCreditAction.Create,
relatedColumn: PermissionColumn.Create,
depend: [{ key: VendorCreditAction.View }],
},
{
label: intl.get('permissions.column.edit'),
key: VendorCreditAction.Edit,
relatedColumn: PermissionColumn.Edit,
depend: [{ key: VendorCreditAction.Create }],
},
{
label: intl.get('permissions.column.delete'),
key: VendorCreditAction.Delete,
relatedColumn: PermissionColumn.Delete,
depend: [{ key: VendorCreditAction.Edit }],
},
{
label: intl.get('permissions.column.refund_vendor_credit'),
key: VendorCreditAction.Refund,
depend: [{ key: VendorCreditAction.View }],
},
],
},
{
label: intl.get('permissions.payment_made'),
subject: AbilitySubject.PaymentMade,
permissions: [
{
label: intl.get('permissions.column.view'),
key: PaymentMadeAction.View,
relatedColumn: PermissionColumn.View,
},
{
label: intl.get('permissions.column.create'),
key: PaymentMadeAction.Create,
relatedColumn: PermissionColumn.Create,
depend: [{ key: PaymentMadeAction.View }],
},
{
label: intl.get('permissions.column.edit'),
key: PaymentMadeAction.Edit,
relatedColumn: PermissionColumn.Edit,
depend: [{ key: PaymentMadeAction.Create }],
},
{
label: intl.get('permissions.column.delete'),
key: PaymentMadeAction.Delete,
relatedColumn: PermissionColumn.Delete,
depend: [{ key: PaymentMadeAction.Edit }],
},
],
},
],
},
{
label: intl.get('permissions.financial_accounting'),
type: ModulePermissionsStyle.Columns,
serviceFullAccess: true,
moduleFullAccess: true,
columns: [
{ label: intl.get('permissions.column.view'), key: 'view' },
{ label: intl.get('permissions.column.create'), key: 'create' },
{ label: intl.get('permissions.column.edit'), key: 'edit' },
{ label: intl.get('permissions.column.delete'), key: 'delete' },
],
services: [
{
label: intl.get('permissions.manual_journals'),
subject: AbilitySubject.ManualJournal,
permissions: [
{
label: intl.get('permissions.column.view'),
key: ManualJournalAction.View,
relatedColumn: PermissionColumn.View,
},
{
label: intl.get('permissions.column.create'),
key: ManualJournalAction.Create,
relatedColumn: PermissionColumn.Create,
depend: [{ key: ManualJournalAction.View }],
},
{
label: intl.get('permissions.column.edit'),
key: ManualJournalAction.Edit,
relatedColumn: PermissionColumn.Edit,
depend: [{ key: ManualJournalAction.Create }],
},
{
label: intl.get('permissions.column.delete'),
key: ManualJournalAction.Delete,
relatedColumn: PermissionColumn.Delete,
depend: [{ key: ManualJournalAction.Edit }],
},
],
},
{
label: intl.get('permissions.chart_of_accounts'),
subject: AbilitySubject.Account,
permissions: [
{
label: intl.get('permissions.column.view'),
key: AccountAction.View,
relatedColumn: PermissionColumn.View,
},
{
label: intl.get('permissions.column.create'),
key: AccountAction.Create,
relatedColumn: PermissionColumn.Create,
depend: [{ key: AccountAction.View }],
},
{
label: intl.get('permissions.column.edit'),
key: AccountAction.Edit,
relatedColumn: PermissionColumn.Edit,
depend: [{ key: AccountAction.Create }],
},
{
label: intl.get('permissions.column.delete'),
key: AccountAction.Delete,
relatedColumn: PermissionColumn.Delete,
depend: [{ key: AccountAction.Edit }],
},
{
label: intl.get('permissions.column.transactions_locking'),
key: AccountAction.TransactionsLocking,
},
],
},
{
label: intl.get('permissions.expenses'),
subject: AbilitySubject.Expense,
permissions: [
{
label: intl.get('permissions.column.view'),
key: ExpenseAction.View,
relatedColumn: PermissionColumn.View,
},
{
label: intl.get('permissions.column.create'),
key: ExpenseAction.Create,
relatedColumn: PermissionColumn.Create,
depend: [{ key: ExpenseAction.View }],
},
{
label: intl.get('permissions.column.edit'),
key: ExpenseAction.Edit,
relatedColumn: PermissionColumn.Edit,
depend: [{ key: ExpenseAction.Create }],
},
{
label: intl.get('permissions.column.delete'),
key: ExpenseAction.Delete,
relatedColumn: PermissionColumn.Delete,
depend: [{ key: ExpenseAction.Edit }],
},
],
},
],
},
{
label: intl.get('permissions.reports'),
type: ModulePermissionsStyle.Vertical,
serviceFullAccess: true,
moduleFullAccess: true,
services: [
{
label: intl.get('permissions.financial_reports'),
subject: AbilitySubject.Report,
permissions: [
{
label: intl.get('permissions.balance_sheet'),
key: ReportsAction.READ_BALANCE_SHEET,
},
{
label: intl.get('permissions.trial_balance_sheet'),
key: ReportsAction.READ_TRIAL_BALANCE_SHEET,
},
{
label: intl.get('permissions.profit_loss_sheet'),
key: ReportsAction.READ_PROFIT_LOSS,
},
{
label: intl.get('permissions.cash_flow_sheet'),
key: ReportsAction.READ_CASHFLOW,
},
{
label: intl.get('permissions.journal_sheet'),
key: ReportsAction.READ_JOURNAL,
},
{
label: intl.get('permissions.general_ledger'),
key: ReportsAction.READ_GENERAL_LEDGET,
},
{
label: intl.get('permissions.a_r_aging_summary_report'),
key: ReportsAction.READ_AR_AGING_SUMMARY,
},
{
label: intl.get('permissions.a_r_aging_summary_report'),
key: ReportsAction.READ_AP_AGING_SUMMARY,
},
{
label: intl.get('permissions.purchases_by_items'),
key: ReportsAction.READ_PURCHASES_BY_ITEMS,
},
{
label: intl.get('permissions.sales_by_items'),
key: ReportsAction.READ_SALES_BY_ITEMS,
},
{
label: intl.get('permissions.customers_transactions'),
key: ReportsAction.READ_CUSTOMERS_TRANSACTIONS,
},
{
label: intl.get('permissions.vendors_transactions'),
key: ReportsAction.READ_VENDORS_TRANSACTIONS,
},
{
label: intl.get('permissions.customers_summary_balance'),
key: ReportsAction.READ_CUSTOMERS_SUMMARY_BALANCE,
},
{
label: intl.get('permissions.vendors_summary_balance'),
key: ReportsAction.READ_VENDORS_SUMMARY_BALANCE,
},
{
label: intl.get('permissions.inventory_valuation_summary'),
key: ReportsAction.READ_INVENTORY_VALUATION_SUMMARY,
},
{
label: intl.get('permissions.inventory_items_details'),
key: ReportsAction.READ_INVENTORY_ITEM_DETAILS,
},
{
label: intl.get('permissions.cashflow_account_transactions'),
key: ReportsAction.READ_CASHFLOW_ACCOUNT_TRANSACTION,
},
],
},
],
},
];
export function getPermissionsSchemaService(subject) {
const permissions = getPermissionsSchema();
return chain(permissions)
.map((perm) => perm.services)
.flatten()
.find((service) => service.subject === subject)
.value();
}
export function getPermissionsSchemaServices() {
const permissions = getPermissionsSchema();
return chain(permissions)
.map((module) => module.services)
.flatten()
.value();
}

View File

@@ -11,4 +11,6 @@ export const RESOURCES_TYPES = {
EXPENSE: 'expense', EXPENSE: 'expense',
MANUAL_JOURNAL: 'manual_journal', MANUAL_JOURNAL: 'manual_journal',
ACCOUNT: 'account', ACCOUNT: 'account',
CREDIT_NOTE: 'credit_note',
VENDOR_CREDIT:'vendor_credit'
}; };

View File

@@ -14,6 +14,8 @@ export const TABLES = {
EXPENSES: 'expenses', EXPENSES: 'expenses',
CASHFLOW_ACCOUNTS: 'cashflow_accounts', CASHFLOW_ACCOUNTS: 'cashflow_accounts',
CASHFLOW_Transactions: 'cashflow_transactions', CASHFLOW_Transactions: 'cashflow_transactions',
CREDIT_NOTES: 'credit_notes',
VENDOR_CREDITS: 'vendor_credits',
}; };
export const TABLE_SIZE = { export const TABLE_SIZE = {

View File

@@ -1,17 +1,60 @@
import React from 'react'; import React from 'react';
import clsx from 'classnames'; import clsx from 'classnames';
import styled from 'styled-components';
import Style from './style.module.scss'; export function Alert({ title, description, children, intent, className }) {
export function Alert({ title, description, intent }) {
return ( return (
<div <AlertRoot className={clsx(className)} intent={intent}>
className={clsx(Style.root, { {title && <AlertTitle>{title}</AlertTitle>}
[`${Style['root_' + intent]}`]: intent, {description && <AlertDesc>{description}</AlertDesc>}
})} {children && <AlertDesc>{children}</AlertDesc>}
> </AlertRoot>
{title && <h3 className={clsx(Style.title)}>{title}</h3>}
{description && <p class={clsx(Style.description)}>{description}</p>}
</div>
); );
} }
const AlertRoot = styled.div`
border: 1px solid rgb(223, 227, 230);
padding: 12px;
border-radius: 6px;
margin-bottom: 20px;
${(props) =>
props.intent === 'danger' &&
`
border-color: rgb(249, 198, 198);
background: rgb(255, 248, 248);
${AlertDesc} {
color: #d95759;
}
${AlertTitle} {
color: rgb(205, 43, 49);
}
`}
${(props) =>
props.intent === 'primary' &&
`
background: #fff;
border-color: #98a8ee;
${AlertTitle} {
color: #1a3bd4;
}
${AlertDesc} {
color: #455883;
}
`}
`;
export const AlertTitle = styled.h3`
color: rgb(17, 24, 28);
margin-bottom: 4px;
font-size: 14px;
font-weight: 600;
`;
export const AlertDesc = styled.p`
color: rgb(104, 112, 118);
margin: 0;
`;

View File

@@ -1,32 +0,0 @@
.root {
border: 1px solid rgb(223, 227, 230);
padding: 12px;
border-radius: 6px;
margin-bottom: 20px;
&_danger {
border-color: rgb(249, 198, 198);
background: rgb(255, 248, 248);
.description {
color: #d95759;
}
.title {
color: rgb(205, 43, 49);
}
}
}
.title {
color: rgb(17, 24, 28);
margin-bottom: 4px;
font-size: 14px;
font-weight: 600;
}
.description {
color: rgb(104, 112, 118);
margin: 0;
}

View File

@@ -4,7 +4,6 @@ import styled from 'styled-components';
import { Classes } from '@blueprintjs/core'; import { Classes } from '@blueprintjs/core';
import clsx from 'classnames'; import clsx from 'classnames';
import Icon from '../Icon'; import Icon from '../Icon';
import { whenRtl, whenLtr } from 'utils/styled-components';
const ACCOUNT_TYPE = { const ACCOUNT_TYPE = {
CASH: 'cash', CASH: 'cash',
@@ -185,9 +184,7 @@ const MetaLineValue = styled.div`
text-align: center; text-align: center;
color: rgb(23, 43, 77); color: rgb(23, 43, 77);
font-size: 11px; font-size: 11px;
margin-left: auto;
${whenLtr(`margin-left: auto;`)}
${whenRtl(`margin-right: auto;`)}
`; `;
const BankAccountMeta = styled.div` const BankAccountMeta = styled.div`
@@ -204,7 +201,5 @@ const AccountIconWrap = styled.div`
position: absolute; position: absolute;
top: 14px; top: 14px;
color: #abb3bb; color: #abb3bb;
right: 12px;
${whenLtr(`right: 12px;`)}
${whenRtl(`left: 12px;`)}
`; `;

View File

@@ -5,6 +5,7 @@ export const ButtonLink = styled.button`
border: 0; border: 0;
background: transparent; background: transparent;
cursor: pointer; cursor: pointer;
text-align: inherit;
&:hover, &:hover,
&:active { &:active {

View File

@@ -1,6 +0,0 @@
import React from 'react';
import classNames from 'classnames';
export default function Card({ className, children }) {
return <div className={classNames('card', className)}>{children}</div>;
}

View File

@@ -0,0 +1,27 @@
import React from 'react';
import styled from 'styled-components';
export function Card({ className, children }) {
return <CardRoot className={className}>{children}</CardRoot>;
}
const CardRoot = styled.div`
padding: 15px;
margin: 15px;
background: #fff;
border: 1px solid #d2dce2;
`;
export const CardFooterActions = styled.div`
padding-top: 16px;
border-top: 1px solid #e0e7ea;
margin-top: 30px;
.bp3-button {
min-width: 70px;
+ .bp3-button {
margin-left: 10px;
}
}
`;

View File

@@ -0,0 +1,25 @@
import styled from 'styled-components';
import { Card } from '../Card';
import DataTable from '../DataTable';
export const CommercialDocBox = styled(Card)`
padding: 22px 20px;
`;
export const CommercialDocHeader = styled.div`
margin-bottom: 25px;
`;
export const CommercialDocTopHeader = styled.div`
margin-bottom: 25px;
`;
export const CommercialDocEntriesTable = styled(DataTable)`
.tbody .tr:last-child .td {
border-bottom: 1px solid #d2dce2;
}
`;
export const CommercialDocFooter = styled.div`
margin-top: 25px;
`;

View File

@@ -0,0 +1,25 @@
import React from 'react';
import * as R from 'ramda';
import { ButtonLink } from 'components';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
function CustomerDrawerLinkComponent({
// #ownProps
children,
customerId,
// #withDrawerActions
openDrawer,
}) {
// Handle view customer drawer.
const handleCustomerDrawer = () => {
openDrawer('customer-details-drawer', { customerId });
};
return <ButtonLink onClick={handleCustomerDrawer}>{children}</ButtonLink>;
}
export const CustomerDrawerLink = R.compose(withDrawerActions)(
CustomerDrawerLinkComponent,
);

View File

@@ -0,0 +1 @@
export * from './CustomerDrawerLink';

View File

@@ -1,16 +1,19 @@
import React from 'react'; import React from 'react';
import classnames from 'classnames'; import clsx from 'classnames';
import { Navbar } from '@blueprintjs/core'; import { Navbar } from '@blueprintjs/core';
export default function DashboardActionsBar({ children, name }) { export default function DashboardActionsBar({ className, children, name }) {
return ( return (
<div <div
className={classnames({ className={clsx(
'dashboard__actions-bar': true, {
[`dashboard__actions-bar--${name}`]: !!name 'dashboard__actions-bar': true,
})} [`dashboard__actions-bar--${name}`]: !!name,
},
className,
)}
> >
<Navbar className='navbar--dashboard-actions-bar'>{children}</Navbar> <Navbar className="navbar--dashboard-actions-bar">{children}</Navbar>
</div> </div>
); );
} }

View File

@@ -1,9 +1,16 @@
import React from 'react'; import React from 'react';
import { ThemeProvider } from 'styled-components'; import { ThemeProvider, StyleSheetManager } from 'styled-components';
import rtlcss from 'stylis-rtlcss';
import { useAppIntlContext } from '../AppIntlProvider'; import { useAppIntlContext } from '../AppIntlProvider';
export function DashboardThemeProvider({ children }) { export function DashboardThemeProvider({ children }) {
const { direction } = useAppIntlContext(); const { direction } = useAppIntlContext();
return <ThemeProvider theme={{ dir: direction }}>{children}</ThemeProvider>; return (
<StyleSheetManager
{...(direction === 'rtl' ? { stylisPlugins: [rtlcss] } : {})}
>
<ThemeProvider theme={{ dir: direction }}>{children}</ThemeProvider>
</StyleSheetManager>
);
} }

View File

@@ -16,6 +16,7 @@ export default function TableWrapper({ children }) {
expandable, expandable,
virtualizedRows, virtualizedRows,
className, className,
styleName,
size, size,
}, },
} = useContext(TableContext); } = useContext(TableContext);
@@ -28,6 +29,7 @@ export default function TableWrapper({ children }) {
'is-expandable': expandable, 'is-expandable': expandable,
'is-loading': loading, 'is-loading': loading,
'has-virtualized-rows': virtualizedRows, 'has-virtualized-rows': virtualizedRows,
[`table--${styleName}`]: styleName,
})} })}
> >
<ScrollSync> <ScrollSync>

View File

@@ -17,6 +17,7 @@ const useDetailsMenuContext = () => React.useContext(DetailsMenuContext);
export function DetailsMenu({ export function DetailsMenu({
children, children,
direction = DIRECTION.VERTICAL, direction = DIRECTION.VERTICAL,
textAlign,
minLabelSize, minLabelSize,
className, className,
}) { }) {
@@ -27,6 +28,7 @@ export function DetailsMenu({
{ {
'details-menu--vertical': direction === DIRECTION.VERTICAL, 'details-menu--vertical': direction === DIRECTION.VERTICAL,
'details-menu--horizantal': direction === DIRECTION.HORIZANTAL, 'details-menu--horizantal': direction === DIRECTION.HORIZANTAL,
[`align-${textAlign}`]: textAlign,
}, },
className, className,
)} )}

View File

@@ -0,0 +1,15 @@
import React from 'react';
import styled from 'styled-components';
import { Classes } from '@blueprintjs/core';
export function DialogFooter({ children }) {
return (
<DialogFooterRoot className={Classes.DIALOG_FOOTER}>
{children}
</DialogFooterRoot>
);
}
const DialogFooterRoot = styled.div`
display: flex;
`;

View File

@@ -2,6 +2,10 @@ import React from 'react';
import styled from 'styled-components'; import styled from 'styled-components';
import { Classes } from '@blueprintjs/core'; import { Classes } from '@blueprintjs/core';
/**
* Dialog footer actions.
* @returns {React.JSX}
*/
export function DialogFooterActions({ alignment = 'right', children }) { export function DialogFooterActions({ alignment = 'right', children }) {
return ( return (
<DialogFooterActionsRoot <DialogFooterActionsRoot
@@ -13,14 +17,25 @@ export function DialogFooterActions({ alignment = 'right', children }) {
); );
} }
/**
* Dialog footer.
* @returns {React.JSX}
*/
export function DialogFooter({ ...props }) {
return <DialogFooterRoot {...props} />;
}
const DialogFooterRoot = styled.div`
flex: 0 0 auto;
margin: 0 20px;
`;
const DialogFooterActionsRoot = styled.div` const DialogFooterActionsRoot = styled.div`
margin-left: -10px; ${(props) =>
margin-right: -10px; props.alignment === 'right' ? 'margin-left: auto;' : 'margin-right: auto;'};
justify-content: ${(props) =>
props.alignment === 'right' ? 'flex-end' : 'flex-start'};
.bp3-button { .bp3-button {
margin-left: 10px; margin-left: 5px;
margin-left: 10px; margin-left: 5px;
} }
`; `;

View File

@@ -3,4 +3,5 @@
export * from './Dialog'; export * from './Dialog';
export * from './DialogFooterActions'; export * from './DialogFooterActions';
export * from './DialogSuspense'; export * from './DialogSuspense';
export * from './DialogContent'; export * from './DialogContent';
export * from './DialogFooter';

View File

@@ -25,7 +25,13 @@ import NotifyReceiptViaSMSDialog from '../containers/Dialogs/NotifyReceiptViaSMS
import NotifyEstimateViaSMSDialog from '../containers/Dialogs/NotifyEstimateViaSMSDialog'; import NotifyEstimateViaSMSDialog from '../containers/Dialogs/NotifyEstimateViaSMSDialog';
import NotifyPaymentReceiveViaSMSDialog from '../containers/Dialogs/NotifyPaymentReceiveViaSMSDialog'; import NotifyPaymentReceiveViaSMSDialog from '../containers/Dialogs/NotifyPaymentReceiveViaSMSDialog';
import SMSMessageDialog from '../containers/Dialogs/SMSMessageDialog'; import SMSMessageDialog from '../containers/Dialogs/SMSMessageDialog';
import TransactionsLockingDialog from '../containers/Dialogs/TransactionsLockingDialog'; import RefundCreditNoteDialog from '../containers/Dialogs/RefundCreditNoteDialog';
import RefundVendorCreditDialog from '../containers/Dialogs/RefundVendorCreditDialog';
import ReconcileCreditNoteDialog from '../containers/Dialogs/ReconcileCreditNoteDialog';
import ReconcileVendorCreditDialog from '../containers/Dialogs/ReconcileVendorCreditDialog';
import LockingTransactionsDialog from '../containers/Dialogs/LockingTransactionsDialog';
import UnlockingTransactionsDialog from '../containers/Dialogs/UnlockingTransactionsDialog';
import UnlockingPartialTransactionsDialog from '../containers/Dialogs/UnlockingPartialTransactionsDialog';
/** /**
* Dialogs container. * Dialogs container.
@@ -59,7 +65,15 @@ export default function DialogsContainer() {
<BadDebtDialog dialogName={'write-off-bad-debt'} /> <BadDebtDialog dialogName={'write-off-bad-debt'} />
<SMSMessageDialog dialogName={'sms-message-form'} /> <SMSMessageDialog dialogName={'sms-message-form'} />
<TransactionsLockingDialog dialogName={'transactions-locking'} /> <RefundCreditNoteDialog dialogName={'refund-credit-note'} />
<RefundVendorCreditDialog dialogName={'refund-vendor-credit'} />
<ReconcileCreditNoteDialog dialogName={'reconcile-credit-note'} />
<ReconcileVendorCreditDialog dialogName={'reconcile-vendor-credit'} />
<LockingTransactionsDialog dialogName={'locking-transactions'} />
<UnlockingTransactionsDialog dialogName={'unlocking-transactions'} />
<UnlockingPartialTransactionsDialog
dialogName={'unlocking-partial-transactions'}
/>
</div> </div>
); );
} }

View File

@@ -0,0 +1,12 @@
import React from 'react';
import styled from 'styled-components';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
export function DrawerActionsBar({ ...props }) {
return <DrawerActionsBarRoot {...props} />;
}
const DrawerActionsBarRoot = styled(DashboardActionsBar)`
border-bottom: 1px solid #d9d9da;
`;

View File

@@ -1,15 +1,54 @@
import React from 'react'; import React from 'react';
import { Tabs } from '@blueprintjs/core'; import { Tabs } from '@blueprintjs/core';
import styled from 'styled-components';
/** /**
* Drawer main tabs. * Drawer main tabs.
*/ */
export function DrawerMainTabs({ children, ...restProps }) { export function DrawerMainTabs({ children, ...restProps }) {
return ( return (
<div class="drawer__main-tabs"> <DrawerMainTabsRoot>
<Tabs animate={true} large={true} {...restProps}> <Tabs animate={true} large={true} {...restProps}>
{children} {children}
</Tabs> </Tabs>
</div> </DrawerMainTabsRoot>
); );
} }
const DrawerMainTabsRoot = styled.div`
.bp3-tabs {
.bp3-tab-list {
position: relative;
background-color: #fff;
padding: 0 15px;
border-bottom: 2px solid #e1e2e8;
> *:not(:last-child) {
margin-right: 25px;
}
&.bp3-large > .bp3-tab {
font-size: 15px;
color: #7f8596;
margin: 0 1rem;
&[aria-selected='true'],
&:not([aria-disabled='true']):hover {
color: #0052cc;
}
}
.bp3-tab-indicator-wrapper .bp3-tab-indicator {
height: 2px;
bottom: -2px;
}
}
.bp3-tab-panel {
margin-top: 0;
.card {
margin: 15px;
}
}
}
`;

View File

@@ -13,3 +13,5 @@ export function DrawerLoading({ loading, mount = false, children }) {
export function DrawerBody({ children }) { export function DrawerBody({ children }) {
return <div className={Classes.DRAWER_BODY}>{children}</div>; return <div className={Classes.DRAWER_BODY}>{children}</div>;
} }
export * from './DrawerActionsBar';

View File

@@ -17,6 +17,10 @@ import CashflowTransactionDetailDrawer from '../containers/Drawers/CashflowTrans
import QuickCreateCustomerDrawer from '../containers/Drawers/QuickCreateCustomerDrawer'; import QuickCreateCustomerDrawer from '../containers/Drawers/QuickCreateCustomerDrawer';
import QuickCreateItemDrawer from '../containers/Drawers/QuickCreateItemDrawer'; import QuickCreateItemDrawer from '../containers/Drawers/QuickCreateItemDrawer';
import QuickWriteVendorDrawer from '../containers/Drawers/QuickWriteVendorDrawer'; import QuickWriteVendorDrawer from '../containers/Drawers/QuickWriteVendorDrawer';
import CreditNoteDetailDrawer from '../containers/Drawers/CreditNoteDetailDrawer';
import VendorCreditDetailDrawer from '../containers/Drawers/VendorCreditDetailDrawer';
import RefundCreditNoteDetailDrawer from '../containers/Drawers/RefundCreditNoteDetailDrawer';
import RefundVendorCreditDetailDrawer from '../containers/Drawers/RefundVendorCreditDetailDrawer';
import { DRAWERS } from 'common/drawers'; import { DRAWERS } from 'common/drawers';
@@ -47,6 +51,14 @@ export default function DrawersContainer() {
<QuickCreateCustomerDrawer name={DRAWERS.QUICK_CREATE_CUSTOMER} /> <QuickCreateCustomerDrawer name={DRAWERS.QUICK_CREATE_CUSTOMER} />
<QuickCreateItemDrawer name={DRAWERS.QUICK_CREATE_ITEM} /> <QuickCreateItemDrawer name={DRAWERS.QUICK_CREATE_ITEM} />
<QuickWriteVendorDrawer name={DRAWERS.QUICK_WRITE_VENDOR} /> <QuickWriteVendorDrawer name={DRAWERS.QUICK_WRITE_VENDOR} />
<CreditNoteDetailDrawer name={DRAWERS.CREDIT_NOTE_DETAIL_DRAWER} />
<VendorCreditDetailDrawer name={DRAWERS.VENDOR_CREDIT_DETAIL_DRAWER} />
<RefundCreditNoteDetailDrawer
name={DRAWERS.REFUND_CREDIT_NOTE_DETAIL_DRAWER}
/>
<RefundVendorCreditDetailDrawer
name={DRAWERS.REFUND_VENDOR_CREDIT_DETAIL_DRAWER}
/>
</div> </div>
); );
} }

View File

@@ -0,0 +1,14 @@
import { useDeepCompareEffect } from 'hooks/utils';
export function FormikObserver({ onChange, values }) {
useDeepCompareEffect(() => {
onChange(values);
}, [values]);
return null;
}
FormikObserver.defaultProps = {
onChange: () => null,
};

View File

@@ -1 +1,2 @@
export * from './FormObserver'; export * from './FormObserver';
export * from './FormikObserver';

View File

@@ -1,6 +1,8 @@
import React from 'react'; import React from 'react';
import { ErrorBoundary } from 'react-error-boundary'; import { ErrorBoundary } from 'react-error-boundary';
import classNames from 'classnames'; import classNames from 'classnames';
import * as R from 'ramda';
import { CLASSES } from 'common/classes'; import { CLASSES } from 'common/classes';
import PreferencesTopbar from 'components/Preferences/PreferencesTopbar'; import PreferencesTopbar from 'components/Preferences/PreferencesTopbar';
@@ -8,18 +10,28 @@ import PreferencesContentRoute from 'components/Preferences/PreferencesContentRo
import DashboardErrorBoundary from 'components/Dashboard/DashboardErrorBoundary'; import DashboardErrorBoundary from 'components/Dashboard/DashboardErrorBoundary';
import PreferencesSidebar from 'components/Preferences/PreferencesSidebar'; import PreferencesSidebar from 'components/Preferences/PreferencesSidebar';
import withDashboardActions from 'containers/Dashboard/withDashboardActions';
import 'style/pages/Preferences/Page.scss'; import 'style/pages/Preferences/Page.scss';
/** /**
* Preferences page. * Preferences page.
*/ */
export default function PreferencesPage() { function PreferencesPage({ toggleSidebarExpand }) {
// Shrink the dashboard sidebar once open application preferences page.
React.useEffect(() => {
toggleSidebarExpand(false);
}, [toggleSidebarExpand]);
return ( return (
<ErrorBoundary FallbackComponent={DashboardErrorBoundary}> <ErrorBoundary FallbackComponent={DashboardErrorBoundary}>
<div id={'dashboard'} className={classNames( <div
CLASSES.DASHBOARD_CONTENT, id={'dashboard'}
CLASSES.DASHBOARD_CONTENT_PREFERENCES, className={classNames(
)}> CLASSES.DASHBOARD_CONTENT,
CLASSES.DASHBOARD_CONTENT_PREFERENCES,
)}
>
<div className={classNames(CLASSES.PREFERENCES_PAGE)}> <div className={classNames(CLASSES.PREFERENCES_PAGE)}>
<PreferencesSidebar /> <PreferencesSidebar />
@@ -32,3 +44,5 @@ export default function PreferencesPage() {
</ErrorBoundary> </ErrorBoundary>
); );
} }
export default R.compose(withDashboardActions)(PreferencesPage);

View File

@@ -1,4 +1,5 @@
import React from 'react'; import React from 'react';
import SidebarContainer from 'components/Sidebar/SidebarContainer'; import SidebarContainer from 'components/Sidebar/SidebarContainer';
import SidebarHead from 'components/Sidebar/SidebarHead'; import SidebarHead from 'components/Sidebar/SidebarHead';
import SidebarMenu from 'components/Sidebar/SidebarMenu'; import SidebarMenu from 'components/Sidebar/SidebarMenu';
@@ -17,7 +18,20 @@ export default function Sidebar({ dashboardContentRef }) {
<SidebarMenu menu={menu} /> <SidebarMenu menu={menu} />
</div> </div>
<div class="sidebar__version">0.0.1-beta version.</div> <SidebarFooterVersion />
</SidebarContainer> </SidebarContainer>
); );
} }
/**
* Sidebar footer version.
* @returns {React.JSX}
*/
function SidebarFooterVersion() {
const { VERSION } = process.env;
if (!VERSION) {
return null;
}
return <div class="sidebar__version">v{VERSION}</div>;
}

View File

@@ -0,0 +1,33 @@
import styled from 'styled-components';
export const Table = styled.table`
width: 100%;
vertical-align: top;
border-color: #dee2e6;
border-spacing: 0;
`;
export const TBody = styled.tbody``;
export const TR = styled.tr``;
export const TD = styled.td`
padding: 0.5rem 0.5rem;
border-bottom-width: 1px;
border-bottom-color: inherit;
border-bottom-style: solid;
${(props) =>
props.textAlign === 'right' &&
`
text-align: right;`}
`;
export const TRDarkSingleLine = styled(TR)`
${TD} {
border-bottom: 1px solid #000;
}
`;
export const TRDarkDoubleLines = styled(TR)`
${TD} {
border-bottom: 3px double #000;
}
`;

View File

@@ -0,0 +1,11 @@
import styled from 'styled-components';
export const CurrencyTag = styled.span`
background: #3e9215;
color: #fff;
display: inline-block;
border-radius: 3px;
padding: 2px 4px;
line-height: 1;
margin-left: 4px;
`;

View File

@@ -0,0 +1,3 @@
export * from './CurrencyTag';

View File

@@ -0,0 +1,28 @@
import React from 'react';
import styled from 'styled-components';
export function TextStatus({ intent, children }) {
return <TextStatusRoot intent={intent}>{children}</TextStatusRoot>;
}
const TextStatusRoot = styled.span`
${(props) =>
props.intent === 'warning' &&
`
color: #ec5b0a;`}
${(props) =>
props.intent === 'success' &&
`
color: #2ba01d;`}
${(props) =>
props.intent === 'none' &&
`
color: #777;`}
${(props) =>
props.intent === 'primary' &&
`
color: #1652c8;`}
`;

View File

@@ -1,12 +0,0 @@
.total_lines {}
.total_line {
display: flex;
border-bottom: 1px solid #d2dde2;
:global .amount,
:global .title{
padding: 8px;
}
}

View File

@@ -1,23 +1,93 @@
import React from 'react'; import React from 'react';
import clsx from 'classnames'; import styled from 'styled-components';
import TotalLinesCls from './TotalLines.module.scss'; export const TotalLineBorderStyle = {
SingleDark: 'SingleDark',
DoubleDark: 'DoubleDark',
};
export function TotalLines({ children, className }) { export const TotalLineTextStyle = {
Regular: 'Regular',
Bold: 'Bold',
};
export function TotalLines({
children,
amountColWidth,
labelColWidth,
className,
}) {
return ( return (
<div className={clsx('total_lines', TotalLinesCls.total_lines, className)}> <TotalLinesRoot
className={className}
amountColWidth={amountColWidth}
labelColWidth={labelColWidth}
>
{children} {children}
</div> </TotalLinesRoot>
); );
} }
export function TotalLine({ title, value, className }) { export function TotalLine({ title, value, borderStyle, textStyle, className }) {
return ( return (
<div <TotalLineRoot
className={clsx('total_lines_line', TotalLinesCls.total_line, className)} borderStyle={borderStyle}
textStyle={textStyle}
className={className}
> >
<div class="title">{title}</div> <div class="title">{title}</div>
<div class="amount">{value}</div> <div class="amount">{value}</div>
</div> </TotalLineRoot>
); );
} }
export const TotalLinesRoot = styled.div`
display: table;
${(props) =>
props.amountColWidth &&
`
.amount{
width: ${props.amountColWidth}
}
`}
${(props) =>
props.labelColWidth &&
`
.title{
width: ${props.labelColWidth}
}
`}
`;
export const TotalLineRoot = styled.div`
display: table-row;
.amount,
.title {
display: table-cell;
padding: 8px;
border-bottom: 1px solid #d2dde2;
${(props) =>
props.borderStyle === TotalLineBorderStyle.DoubleDark &&
`
border-bottom: 3px double #000;
`}
${(props) =>
props.borderStyle === TotalLineBorderStyle.SingleDark &&
`
border-bottom: 1px double #000;
`}
${(props) =>
props.textStyle === TotalLineTextStyle.Bold &&
`
font-weight: 600;
`}
}
.amount {
text-align: right;
}
`;

View File

@@ -0,0 +1,6 @@
import React from 'react';
import clsx from 'classnames';
export function Paragraph({ className, children }) {
return <p className={clsx('paragraph', className)}>{children}</p>;
}

View File

@@ -0,0 +1,2 @@
export * from './Paragraph';

View File

@@ -0,0 +1,13 @@
import React from 'react';
export function Join({ items, sep }) {
return items.length > 0
? items.reduce((result, item) => (
<>
{result}
{sep}
{item}
</>
))
: null;
}

View File

@@ -1,4 +1,5 @@
export * from './FormatNumber'; export * from './FormatNumber';
export * from './FormatDate'; export * from './FormatDate';
export * from './Join';

View File

@@ -0,0 +1,23 @@
import React from 'react';
import * as R from 'ramda';
import { ButtonLink } from 'components';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
function VendorDrawerLinkComponent({
// #ownProps
children,
vendorId,
// #withDrawerActions
openDrawer,
}) {
// Handle view customer drawer.
const handleVendorDrawer = () => {
openDrawer('vendor-details-drawer', { vendorId });
};
return <ButtonLink onClick={handleVendorDrawer}>{children}</ButtonLink>;
}
export const VendorDrawerLink = R.compose(withDrawerActions)(VendorDrawerLinkComponent);

View File

@@ -0,0 +1 @@
export * from './VendorDrawerLink'

View File

@@ -54,7 +54,6 @@ import Postbox from './Postbox';
import AccountsSuggestField from './AccountsSuggestField'; import AccountsSuggestField from './AccountsSuggestField';
import MaterialProgressBar from './MaterialProgressBar'; import MaterialProgressBar from './MaterialProgressBar';
import { MoneyFieldCell } from './DataTableCells'; import { MoneyFieldCell } from './DataTableCells';
import Card from './Card';
import AvaterCell from './AvaterCell'; import AvaterCell from './AvaterCell';
import { ItemsMultiSelect } from './Items'; import { ItemsMultiSelect } from './Items';
@@ -87,6 +86,15 @@ export * from './Button';
export * from './IntersectionObserver'; export * from './IntersectionObserver';
export * from './SMSPreview'; export * from './SMSPreview';
export * from './Contacts'; export * from './Contacts';
export * from './Utils/Join';
export * from './Typo';
export * from './TextStatus';
export * from './Tags';
export * from './CommercialDoc';
export * from './Card';
export * from './Customers'
export * from './Vendors'
export * from './Table';
const Hint = FieldHint; const Hint = FieldHint;
@@ -153,7 +161,6 @@ export {
MaterialProgressBar, MaterialProgressBar,
MoneyFieldCell, MoneyFieldCell,
ItemsMultiSelect, ItemsMultiSelect,
Card,
AvaterCell, AvaterCell,
MoreMenuItems, MoreMenuItems,
}; };

View File

@@ -158,6 +158,10 @@ export default [
ability: SaleReceiptAction.View, ability: SaleReceiptAction.View,
}, },
}, },
{
text: <T id={'sidebar_credit_note'} />,
href: '/credit-notes',
},
{ {
text: <T id={'payment_receives'} />, text: <T id={'payment_receives'} />,
href: '/payment-receives', href: '/payment-receives',
@@ -233,6 +237,10 @@ export default [
ability: SaleReceiptAction.Create, ability: SaleReceiptAction.Create,
}, },
}, },
{
text: <T id={'credit_note.label.new_credit_note'} />,
href: '/credit-notes/new',
},
{ {
text: <T id={'new_payment_receive'} />, text: <T id={'new_payment_receive'} />,
href: '/payment-receives/new', href: '/payment-receives/new',
@@ -254,6 +262,10 @@ export default [
ability: BillAction.View, ability: BillAction.View,
}, },
}, },
{
text: <T id={'sidebar_vendor_credits'} />,
href: '/vendor-credits',
},
{ {
text: <T id={'payment_mades'} />, text: <T id={'payment_mades'} />,
href: '/payment-mades', href: '/payment-mades',
@@ -298,6 +310,14 @@ export default [
ability: BillAction.Create, ability: BillAction.Create,
}, },
}, },
{
text: <T id={'vendor_credits.label.new_vendor_credit'} />,
href: '/vendor-credits/new',
permission: {
subject: AbilitySubject.Bill,
ability: BillAction.Create,
},
},
{ {
text: <T id={'new_payment_made'} />, text: <T id={'new_payment_made'} />,
href: '/payment-mades/new', href: '/payment-mades/new',
@@ -405,14 +425,14 @@ export default [
ability: ManualJournalAction.View, ability: ManualJournalAction.View,
}, },
}, },
// { {
// text: <T id={'sidebar.transactions_locaking'} />, text: <T id={'sidebar.transactions_locaking'} />,
// href: '/transactions-locking', href: '/transactions-locking',
// permission: { // permission: {
// subject: AbilitySubject.ManualJournal, // subject: AbilitySubject.ManualJournal,
// ability: ManualJournalAction.TransactionLocking, // ability: ManualJournalAction.TransactionLocking,
// }, // },
// }, },
{ {
text: <T id={'exchange_rate'} />, text: <T id={'exchange_rate'} />,
href: '/exchange-rates', href: '/exchange-rates',

View File

@@ -46,8 +46,7 @@ function ManualJournalsListProvider({ query, tableStateChanged, ...props }) {
isEmptyStatus, isEmptyStatus,
}; };
const isPageLoading = const isPageLoading = isViewsLoading || isResourceMetaLoading;
isManualJournalsLoading || isViewsLoading || isResourceMetaLoading;
return ( return (
<DashboardInsider loading={isPageLoading} name={'manual-journals'}> <DashboardInsider loading={isPageLoading} name={'manual-journals'}>

View File

@@ -101,13 +101,13 @@ export const StatusAccessor = (row) => {
return ( return (
<Choose> <Choose>
<Choose.When condition={!!row.is_published}> <Choose.When condition={!!row.is_published}>
<Tag minimal={true}> <Tag minimal={true} round={true}>
<T id={'published'} /> <T id={'published'} />
</Tag> </Tag>
</Choose.When> </Choose.When>
<Choose.Otherwise> <Choose.Otherwise>
<Tag minimal={true} intent={Intent.WARNING}> <Tag minimal={true} intent={Intent.WARNING} round={true}>
<T id={'draft'} /> <T id={'draft'} />
</Tag> </Tag>
</Choose.Otherwise> </Choose.Otherwise>
@@ -179,6 +179,7 @@ export const ActionsMenu = ({
/> />
</Can> </Can>
<Can I={ManualJournalAction.Delete} a={AbilitySubject.ManualJournal}> <Can I={ManualJournalAction.Delete} a={AbilitySubject.ManualJournal}>
<MenuDivider />
<MenuItem <MenuItem
text={intl.get('delete_journal')} text={intl.get('delete_journal')}
icon={<Icon icon="trash-16" iconSize={16} />} icon={<Icon icon="trash-16" iconSize={16} />}

View File

@@ -151,6 +151,7 @@ export default function MakeJournalFloatingAction() {
disabled={isSubmitting} disabled={isSubmitting}
intent={Intent.PRIMARY} intent={Intent.PRIMARY}
onClick={handleSubmitPublishBtnClick} onClick={handleSubmitPublishBtnClick}
style={{ minWidth: '85px' }}
text={<T id={'save'} />} text={<T id={'save'} />}
/> />
<Popover <Popover

View File

@@ -7,7 +7,8 @@ import {
useJournal, useJournal,
useCreateJournal, useCreateJournal,
useEditJournal, useEditJournal,
useSettings useSettings,
useSettingsManualJournals
} from 'hooks/query'; } from 'hooks/query';
const MakeJournalFormContext = createContext(); const MakeJournalFormContext = createContext();
@@ -40,7 +41,7 @@ function MakeJournalProvider({ journalId, ...props }) {
const { mutateAsync: editJournalMutate } = useEditJournal(); const { mutateAsync: editJournalMutate } = useEditJournal();
// Loading the journal settings. // Loading the journal settings.
const { isLoading: isSettingsLoading } = useSettings(); const { isLoading: isSettingsLoading } = useSettingsManualJournals();
// Submit form payload. // Submit form payload.
const [submitPayload, setSubmitPayload] = useState({}); const [submitPayload, setSubmitPayload] = useState({});

View File

@@ -57,9 +57,7 @@ function BillTransactionDeleteAlert({
loading={isLoading} loading={isLoading}
> >
<p> <p>
<T <T id={`landed_cost.once_your_delete_this_located_landed_cost`} />
id={`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?`}
/>
</p> </p>
</Alert> </Alert>
); );

View File

@@ -0,0 +1,83 @@
import React from 'react';
import intl from 'react-intl-universal';
import { FormattedMessage as T, FormattedHTMLMessage } from 'components';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
import withAlertActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { useDeleteCreditNote } from 'hooks/query';
import { handleDeleteErrors } from '../../Sales/CreditNotes/CreditNotesLanding/utils';
import { compose } from 'utils';
/**
* Credit note delete alert.
*/
function CreditNoteDeleteAlert({
name,
// #withAlertStoreConnect
isOpen,
payload: { creditNoteId },
// #withAlertActions
closeAlert,
// #withDrawerActions
closeDrawer,
}) {
const { isLoading, mutateAsync: deleteCreditNoteMutate } =
useDeleteCreditNote();
// handle cancel delete credit note alert.
const handleCancelDeleteAlert = () => {
closeAlert(name);
};
const handleConfirmCreditNoteDelete = () => {
deleteCreditNoteMutate(creditNoteId)
.then(() => {
AppToaster.show({
message: intl.get('credit_note.alert.delete_message'),
intent: Intent.SUCCESS,
});
closeDrawer('credit-note-detail-drawer');
})
.catch(
({
response: {
data: { errors },
},
}) => {
handleDeleteErrors(errors);
},
)
.finally(() => {
closeAlert(name);
});
};
return (
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'delete'} />}
icon="trash"
intent={Intent.DANGER}
isOpen={isOpen}
onCancel={handleCancelDeleteAlert}
onConfirm={handleConfirmCreditNoteDelete}
loading={isLoading}
>
<p>
<FormattedHTMLMessage id={'credit_note.once_delete_this_credit_note'} />
</p>
</Alert>
);
}
export default compose(
withAlertStoreConnect(),
withAlertActions,
withDrawerActions,
)(CreditNoteDeleteAlert);

View File

@@ -0,0 +1,68 @@
import React from 'react';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { Intent, Alert } from '@blueprintjs/core';
import { useOpenCreditNote } from 'hooks/query';
import { AppToaster } from 'components';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
import withAlertActions from 'containers/Alert/withAlertActions';
import { compose } from 'utils';
/**
* Credit note opened alert.
*/
function CreditNoteOpenedAlert({
name,
// #withAlertStoreConnect
isOpen,
payload: { creditNoteId },
// #withAlertActions
closeAlert,
}) {
const { mutateAsync: openCreditNoteMutate, isLoading } = useOpenCreditNote();
// Handle cancel opened credit note alert.
const handleAlertCancel = () => {
closeAlert(name);
};
// Handle confirm credit note opened.
const handleAlertConfirm = () => {
openCreditNoteMutate(creditNoteId)
.then(() => {
AppToaster.show({
message: intl.get('credit_note_opened.alert.success_message'),
intent: Intent.SUCCESS,
});
})
.catch((error) => {})
.finally(() => {
closeAlert(name);
});
};
return (
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'open'} />}
intent={Intent.WARNING}
isOpen={isOpen}
onCancel={handleAlertCancel}
onConfirm={handleAlertConfirm}
loading={isLoading}
>
<p>
<T id={'credit_note_opened.are_sure_to_open_this_credit'} />
</p>
</Alert>
);
}
export default compose(
withAlertStoreConnect(),
withAlertActions,
)(CreditNoteOpenedAlert);

View File

@@ -0,0 +1,87 @@
import React from 'react';
import intl from 'react-intl-universal';
import { FormattedMessage as T, FormattedHTMLMessage } from 'components';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
import withAlertActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { useDeleteReconcileCredit } from 'hooks/query';
import { handleDeleteErrors } from '../../Sales/CreditNotes/CreditNotesLanding/utils';
import { compose } from 'utils';
/**
* Reconcile credit note delete alert.
*/
function ReconcileCreditNoteDeleteAlert({
name,
// #withAlertStoreConnect
isOpen,
payload: { creditNoteId },
// #withAlertActions
closeAlert,
// #withDrawerActions
closeDrawer,
}) {
const { isLoading, mutateAsync: deleteReconcileCreditMutate } =
useDeleteReconcileCredit();
// handle cancel delete credit note alert.
const handleCancelDeleteAlert = () => {
closeAlert(name);
};
const handleConfirmVendorCreditDelete = () => {
deleteReconcileCreditMutate(creditNoteId)
.then(() => {
AppToaster.show({
message: intl.get('reconcile_credit_note.alert.success_message'),
intent: Intent.SUCCESS,
});
})
.catch(
({
response: {
data: { errors },
},
}) => {
// handleDeleteErrors(errors);
},
)
.finally(() => {
closeAlert(name);
});
};
return (
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'delete'} />}
icon="trash"
intent={Intent.DANGER}
isOpen={isOpen}
onCancel={handleCancelDeleteAlert}
onConfirm={handleConfirmVendorCreditDelete}
loading={isLoading}
>
<p>
<FormattedHTMLMessage
id={
'reconcile_credit_note.once_you_delete_this_reconcile_credit_note'
}
/>
</p>
</Alert>
);
}
export default compose(
withAlertStoreConnect(),
withAlertActions,
withDrawerActions,
)(ReconcileCreditNoteDeleteAlert);

View File

@@ -0,0 +1,76 @@
import React from 'react';
import intl from 'react-intl-universal';
import { FormattedMessage as T, FormattedHTMLMessage } from 'components';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
import { useDeleteRefundCreditNote } from 'hooks/query';
import withAlertActions from 'containers/Alert/withAlertActions';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { compose } from 'utils';
/**
* Refund credit transactions delete alert
*/
function RefundCreditNoteDeleteAlert({
name,
// #withAlertStoreConnect
isOpen,
payload: { creditNoteId },
// #withAlertActions
closeAlert,
// #withDrawerActions
closeDrawer,
}) {
const { mutateAsync: deleteRefundCreditMutate, isLoading } =
useDeleteRefundCreditNote();
// Handle cancel delete.
const handleCancelAlert = () => {
closeAlert(name);
};
// Handle confirm delete .
const handleConfirmRefundCreditDelete = () => {
deleteRefundCreditMutate(creditNoteId)
.then(() => {
AppToaster.show({
message: intl.get('refund_credit_transactions.alert.delete_message'),
intent: Intent.SUCCESS,
});
closeDrawer('refund-credit-detail-drawer');
})
.catch(() => {})
.finally(() => {
closeAlert(name);
});
};
return (
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'delete'} />}
icon="trash"
intent={Intent.DANGER}
isOpen={isOpen}
onCancel={handleCancelAlert}
onConfirm={handleConfirmRefundCreditDelete}
loading={isLoading}
>
<p>
<T
id={`refund_credit_transactions.once_your_delete_this_refund_credit_note`}
/>
</p>
</Alert>
);
}
export default compose(
withAlertStoreConnect(),
withAlertActions,
withDrawerActions,
)(RefundCreditNoteDeleteAlert);

View File

@@ -0,0 +1,81 @@
import React from 'react';
import intl from 'react-intl-universal';
import { FormattedMessage as T } from 'components';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
import { useCancelUnlockingPartialTransactions } from 'hooks/query';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
import withAlertActions from 'containers/Alert/withAlertActions';
import { compose } from 'utils';
/**
* Cancel Unlocking partial transactions alerts.
*/
function CancelUnlockingPartialTarnsactions({
name,
// #withAlertStoreConnect
isOpen,
payload: { module },
// #withAlertActions
closeAlert,
}) {
const { mutateAsync: cancelUnlockingPartial, isLoading } =
useCancelUnlockingPartialTransactions();
// Handle cancel.
const handleCancel = () => {
closeAlert(name);
};
// Handle confirm.
const handleConfirm = () => {
const values = {
module: module,
};
cancelUnlockingPartial(values)
.then(() => {
AppToaster.show({
message: intl.get(
'unlocking_partial_transactions.alert.cancel_message',
),
intent: Intent.SUCCESS,
});
})
.catch(
({
response: {
data: { errors },
},
}) => {},
)
.finally(() => {
closeAlert(name);
});
};
return (
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'yes'} />}
intent={Intent.DANGER}
isOpen={isOpen}
onCancel={handleCancel}
onConfirm={handleConfirm}
loading={isLoading}
>
<p>
<T id={'unlocking_partial_transactions.alert.message'} />
</p>
</Alert>
);
}
export default compose(
withAlertStoreConnect(),
withAlertActions,
)(CancelUnlockingPartialTarnsactions);

View File

@@ -0,0 +1,83 @@
import React from 'react';
import intl from 'react-intl-universal';
import { FormattedMessage as T, FormattedHTMLMessage } from 'components';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
import withAlertActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { useDeleteReconcileVendorCredit } from 'hooks/query';
import { compose } from 'utils';
/**
* Reconcile vendor credit delete alert.
*/
function ReconcileVendorCreditDeleteAlert({
name,
// #withAlertStoreConnect
isOpen,
payload: { vendorCreditId },
// #withAlertActions
closeAlert,
// #withDrawerActions
closeDrawer,
}) {
const { isLoading, mutateAsync: deleteReconcileVendorCreditMutate } =
useDeleteReconcileVendorCredit();
// handle cancel delete credit note alert.
const handleCancelDeleteAlert = () => {
closeAlert(name);
};
const handleConfirmReconcileVendorCreditDelete = () => {
deleteReconcileVendorCreditMutate(vendorCreditId)
.then(() => {
AppToaster.show({
message: intl.get('reconcile_vendor_credit.alert.success_message'),
intent: Intent.SUCCESS,
});
// closeDrawer('vendor-credit-detail-drawer');
})
.catch(
({
response: {
data: { errors },
},
}) => {},
)
.finally(() => {
closeAlert(name);
});
};
return (
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'delete'} />}
icon="trash"
intent={Intent.DANGER}
isOpen={isOpen}
onCancel={handleCancelDeleteAlert}
onConfirm={handleConfirmReconcileVendorCreditDelete}
loading={isLoading}
>
<p>
<FormattedHTMLMessage
id={'reconcile_vendor_credit.alert.once_you_delete_this_reconcile_vendor_credit'}
/>
</p>
</Alert>
);
}
export default compose(
withAlertStoreConnect(),
withAlertActions,
withDrawerActions,
)(ReconcileVendorCreditDeleteAlert);

View File

@@ -0,0 +1,78 @@
import React from 'react';
import intl from 'react-intl-universal';
import { FormattedMessage as T, FormattedHTMLMessage } from 'components';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
import { useDeleteRefundVendorCredit } from 'hooks/query';
import withAlertActions from 'containers/Alert/withAlertActions';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { compose } from 'utils';
/**
* Refund Vendor transactions delete alert.
*/
function RefundVendorCreditDeleteAlert({
name,
// #withAlertStoreConnect
isOpen,
payload: { vendorCreditId },
// #withAlertActions
closeAlert,
// #withDrawerActions
closeDrawer,
}) {
const { mutateAsync: deleteRefundVendorCreditMutate, isLoading } =
useDeleteRefundVendorCredit();
// Handle cancel delete.
const handleCancelAlert = () => {
closeAlert(name);
};
// Handle confirm delete .
const handleConfirmRefundVendorCreditDelete = () => {
deleteRefundVendorCreditMutate(vendorCreditId)
.then(() => {
AppToaster.show({
message: intl.get(
'refund_vendor_credit_transactions.alert.delete_message',
),
intent: Intent.SUCCESS,
});
closeDrawer('refund-vendor-detail-drawer');
})
.catch(() => {})
.finally(() => {
closeAlert(name);
});
};
return (
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'delete'} />}
icon="trash"
intent={Intent.DANGER}
isOpen={isOpen}
onCancel={handleCancelAlert}
onConfirm={handleConfirmRefundVendorCreditDelete}
loading={isLoading}
>
<p>
<T
id={`refund_vendor_credit_transactions.once_your_delete_this_refund_vendor_credit`}
/>
</p>
</Alert>
);
}
export default compose(
withAlertStoreConnect(),
withAlertActions,
withDrawerActions,
)(RefundVendorCreditDeleteAlert);

View File

@@ -0,0 +1,84 @@
import React from 'react';
import intl from 'react-intl-universal';
import { FormattedMessage as T, FormattedHTMLMessage } from 'components';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
import withAlertActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { handleDeleteErrors } from '../../Purchases/CreditNotes/CreditNotesLanding/utils';
import { useDeleteVendorCredit } from 'hooks/query';
import { compose } from 'utils';
/**
* Vendor Credit delete alert.
*/
function VendorCreditDeleteAlert({
name,
// #withAlertStoreConnect
isOpen,
payload: { vendorCreditId },
// #withAlertActions
closeAlert,
// #withDrawerActions
closeDrawer,
}) {
const { isLoading, mutateAsync: deleteVendorCreditMutate } =
useDeleteVendorCredit();
// handle cancel delete credit note alert.
const handleCancelDeleteAlert = () => {
closeAlert(name);
};
const handleConfirmCreditDelete = () => {
deleteVendorCreditMutate(vendorCreditId)
.then(() => {
AppToaster.show({
message: intl.get('vendor_credits.alert.delete_message'),
intent: Intent.SUCCESS,
});
closeDrawer('vendor-credit-detail-drawer');
})
.catch(
({
response: {
data: { errors },
},
}) => {
handleDeleteErrors(errors);
},
)
.finally(() => {
closeAlert(name);
});
};
return (
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'delete'} />}
icon="trash"
intent={Intent.DANGER}
isOpen={isOpen}
onCancel={handleCancelDeleteAlert}
onConfirm={handleConfirmCreditDelete}
loading={isLoading}
>
<p>
<FormattedHTMLMessage
id={'vendor_credits.note.once_delete_this_vendor_credit_note'}
/>
</p>
</Alert>
);
}
export default compose(
withAlertStoreConnect(),
withAlertActions,
withDrawerActions,
)(VendorCreditDeleteAlert);

View File

@@ -0,0 +1,69 @@
import React from 'react';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { Intent, Alert } from '@blueprintjs/core';
import { useOpenVendorCredit } from 'hooks/query';
import { AppToaster } from 'components';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
import withAlertActions from 'containers/Alert/withAlertActions';
import { compose } from 'utils';
/**
* Vendor credit opened alert.
*/
function VendorCreditOpenedAlert({
name,
// #withAlertStoreConnect
isOpen,
payload: { vendorCreditId },
// #withAlertActions
closeAlert,
}) {
const { mutateAsync: openVendorCreditMutate, isLoading } =
useOpenVendorCredit();
// Handle cancel opened credit note alert.
const handleAlertCancel = () => {
closeAlert(name);
};
// Handle confirm vendor credit as opened.
const handleAlertConfirm = () => {
openVendorCreditMutate(vendorCreditId)
.then(() => {
AppToaster.show({
message: intl.get('vendor_credit_opened.alert.success_message'),
intent: Intent.SUCCESS,
});
})
.catch((error) => {})
.finally(() => {
closeAlert(name);
});
};
return (
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'open'} />}
intent={Intent.WARNING}
isOpen={isOpen}
onCancel={handleAlertCancel}
onConfirm={handleAlertConfirm}
loading={isLoading}
>
<p>
<T id={'vendor_credit_opened.are_sure_to_open_this_credit'} />
</p>
</Alert>
);
}
export default compose(
withAlertStoreConnect(),
withAlertActions,
)(VendorCreditOpenedAlert);

View File

@@ -17,6 +17,9 @@ import AccountTransactionsAlerts from '../CashFlow/AccountTransactions/AccountTr
import UsersAlerts from '../Preferences/Users/UsersAlerts'; import UsersAlerts from '../Preferences/Users/UsersAlerts';
import CurrenciesAlerts from '../Preferences/Currencies/CurrenciesAlerts'; import CurrenciesAlerts from '../Preferences/Currencies/CurrenciesAlerts';
import RolesAlerts from '../Preferences/Users/Roles/RolesAlerts'; import RolesAlerts from '../Preferences/Users/Roles/RolesAlerts';
import CreditNotesAlerts from '../Sales/CreditNotes/CreditNotesAlerts';
import VendorCreditNotesAlerts from '../Purchases/CreditNotes/VendorCreditNotesAlerts';
import TransactionsLockingAlerts from '../TransactionsLocking/TransactionsLockingAlerts'
export default [ export default [
...AccountsAlerts, ...AccountsAlerts,
@@ -38,4 +41,7 @@ export default [
...UsersAlerts, ...UsersAlerts,
...CurrenciesAlerts, ...CurrenciesAlerts,
...RolesAlerts, ...RolesAlerts,
...CreditNotesAlerts,
...VendorCreditNotesAlerts,
...TransactionsLockingAlerts
]; ];

View File

@@ -18,7 +18,6 @@ import { useAccountTransactionsContext } from './AccountTransactionsProvider';
import { handleCashFlowTransactionType } from './utils'; import { handleCashFlowTransactionType } from './utils';
import { compose } from 'utils'; import { compose } from 'utils';
import { whenRtl, whenLtr } from 'utils/styled-components';
/** /**
* Account transactions data table. * Account transactions data table.
@@ -129,8 +128,7 @@ const CashflowTransactionsTable = styled(DashboardConstrantTable)`
.tbody-inner { .tbody-inner {
.tr .td:not(:first-child) { .tr .td:not(:first-child) {
${whenLtr(`border-left: 1px solid #e6e6e6;`)} border-left: 1px solid #e6e6e6;
${whenRtl(`border-right: 1px solid #e6e6e6;`)}
} }
} }
} }

View File

@@ -14,7 +14,6 @@ import { curry } from 'lodash/fp';
import { Icon } from '../../../components'; import { Icon } from '../../../components';
import { useAccountTransactionsContext } from './AccountTransactionsProvider'; import { useAccountTransactionsContext } from './AccountTransactionsProvider';
import { whenRtl, whenLtr } from 'utils/styled-components';
function AccountSwitchButton() { function AccountSwitchButton() {
const { currentAccount } = useAccountTransactionsContext(); const { currentAccount } = useAccountTransactionsContext();
@@ -23,7 +22,7 @@ function AccountSwitchButton() {
<AccountSwitchButtonBase <AccountSwitchButtonBase
minimal={true} minimal={true}
rightIcon={<Icon icon={'arrow-drop-down'} iconSize={24} />} rightIcon={<Icon icon={'arrow-drop-down'} iconSize={24} />}
> >
<AccountSwitchText>{currentAccount.name}</AccountSwitchText> <AccountSwitchText>{currentAccount.name}</AccountSwitchText>
</AccountSwitchButtonBase> </AccountSwitchButtonBase>
); );
@@ -161,8 +160,7 @@ const AccountBalanceAmount = styled.span`
font-weight: 600; font-weight: 600;
display: inline-block; display: inline-block;
color: rgb(31, 50, 85); color: rgb(31, 50, 85);
${whenLtr(`margin-left: 10px;`)} margin-left: 10px;
${whenRtl(`margin-right: 10px;`)}
`; `;
const AccountSwitchItemName = styled.div` const AccountSwitchItemName = styled.div`
@@ -180,7 +178,6 @@ const AccountSwitchItemUpdatedAt = styled.div`
const AccountSwitchButtonBase = styled(Button)` const AccountSwitchButtonBase = styled(Button)`
.bp3-button-text { .bp3-button-text {
${whenLtr(`margin-right: 5px;`)} margin-right: 5px;
${whenRtl(`margin-left: 5px;`)}
} }
`; `;

View File

@@ -71,6 +71,18 @@ export const handleCashFlowTransactionType = (reference, openDrawer) => {
return openDrawer('payment-made-detail-drawer', { return openDrawer('payment-made-detail-drawer', {
paymentMadeId: reference.reference_id, paymentMadeId: reference.reference_id,
}); });
case 'RefundCreditNote':
return openDrawer('refund-credit-detail-drawer', {
refundTransactionId: reference.reference_id,
});
case 'RefundVendorCredit':
return openDrawer('refund-vendor-detail-drawer', {
refundTransactionId: reference.reference_id,
});
case 'InventoryAdjustment':
return openDrawer('inventory-adjustment-drawer', {
inventoryId: reference.reference_id,
});
default: default:
return openDrawer('cashflow-transaction-drawer', { return openDrawer('cashflow-transaction-drawer', {

View File

@@ -271,6 +271,7 @@ function CashflowAccountContextMenu({
</If> </If>
</Can> </Can>
<Can I={CashflowAction.Delete} a={AbilitySubject.Cashflow}> <Can I={CashflowAction.Delete} a={AbilitySubject.Cashflow}>
<MenuDivider />
<MenuItem <MenuItem
text={intl.get('delete_account')} text={intl.get('delete_account')}
icon={<Icon icon="trash-16" iconSize={16} />} icon={<Icon icon="trash-16" iconSize={16} />}

View File

@@ -53,7 +53,7 @@ function CustomersListProvider({ tableState, tableStateChanged, ...props }) {
return ( return (
<DashboardInsider <DashboardInsider
loading={isViewsLoading || isResourceMetaLoading || isCustomersLoading} loading={isViewsLoading || isResourceMetaLoading }
name={'customers-list'} name={'customers-list'}
> >
<CustomersListContext.Provider value={state} {...props} /> <CustomersListContext.Provider value={state} {...props} />

View File

@@ -1,5 +1,13 @@
import React, { useMemo } from 'react'; import React, { useMemo } from 'react';
import { Menu, MenuItem, MenuDivider, Intent } from '@blueprintjs/core'; import {
Menu,
MenuItem,
MenuDivider,
Intent,
Tooltip,
Position,
Classes,
} from '@blueprintjs/core';
import clsx from 'classnames'; import clsx from 'classnames';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
@@ -63,6 +71,7 @@ export function ActionsMenu({
</If> </If>
</Can> </Can>
<Can I={CustomerAction.Delete} a={AbilitySubject.Customer}> <Can I={CustomerAction.Delete} a={AbilitySubject.Customer}>
<MenuDivider />
<MenuItem <MenuItem
icon={<Icon icon="trash-16" iconSize={16} />} icon={<Icon icon="trash-16" iconSize={16} />}
text={intl.get('delete_customer')} text={intl.get('delete_customer')}
@@ -78,7 +87,7 @@ export function ActionsMenu({
* Phone number accessor. * Phone number accessor.
*/ */
export function PhoneNumberAccessor(row) { export function PhoneNumberAccessor(row) {
return <div className={'work_phone'}>{row.work_phone}</div>; return <div className={'work_phone'}>{row.personal_phone}</div>;
} }
/** /**
@@ -88,6 +97,24 @@ export function BalanceAccessor(row) {
return <Money amount={row.closing_balance} currency={row.currency_code} />; return <Money amount={row.closing_balance} currency={row.currency_code} />;
} }
/**
* Note column accessor.
*/
export function NoteAccessor(row) {
return (
<If condition={row.note}>
<Tooltip
className={Classes.TOOLTIP_INDICATOR}
content={row.note}
position={Position.LEFT_TOP}
hoverOpenDelay={50}
>
<Icon icon={'file-alt'} iconSize={16} />
</Tooltip>
</If>
);
}
/** /**
* Retrieve customers table columns. * Retrieve customers table columns.
*/ */
@@ -122,12 +149,20 @@ export function useCustomersTableColumns() {
}, },
{ {
id: 'work_phone', id: 'work_phone',
Header: intl.get('work_phone'), Header: intl.get('phone_number'),
accessor: PhoneNumberAccessor, accessor: PhoneNumberAccessor,
className: 'phone_number', className: 'phone_number',
width: 100, width: 100,
clickable: true, clickable: true,
}, },
{
id: 'note',
Header: intl.get('note'),
accessor: NoteAccessor,
disableSortBy: true,
width: 85,
clickable: true,
},
{ {
id: 'balance', id: 'balance',
Header: intl.get('receivable_balance'), Header: intl.get('receivable_balance'),

View File

@@ -1,5 +1,6 @@
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import * as R from 'ramda'; import * as R from 'ramda';
import { isEmpty } from 'lodash';
export const transformApiErrors = (errors) => { export const transformApiErrors = (errors) => {
const fields = {}; const fields = {};
@@ -42,12 +43,18 @@ const mergeWithAccount = R.curry((transformed, account) => {
}; };
}); });
/**
* Default account payload transformer.
*/
const defaultPayloadTransform = () => ({});
/** /**
* Defined payload transformers. * Defined payload transformers.
*/ */
function getConditions() { function getConditions() {
return [ return [
['edit', transformEditMode], ['edit'],
['new_child', transformEditMode],
['NEW_ACCOUNT_DEFINED_TYPE', transformNewAccountDefinedType], ['NEW_ACCOUNT_DEFINED_TYPE', transformNewAccountDefinedType],
]; ];
} }
@@ -59,9 +66,13 @@ export const transformAccountToForm = (account, payload) => {
const conditions = getConditions(); const conditions = getConditions();
const results = conditions.map((condition) => { const results = conditions.map((condition) => {
const transformer = !isEmpty(condition[1])
? condition[1]
: defaultPayloadTransform;
return [ return [
condition[0] === payload.action ? R.T : R.F, condition[0] === payload.action ? R.T : R.F,
mergeWithAccount(condition[1](payload)), mergeWithAccount(transformer(payload)),
]; ];
}); });
return R.cond(results)(account); return R.cond(results)(account);

View File

@@ -1,6 +1,16 @@
import React from 'react'; import React from 'react';
import { defaultTo, get } from 'lodash';
import { DialogContent } from 'components'; import { DialogContent } from 'components';
import { useBill, useCreateLandedCost } from 'hooks/query'; import {
useBill,
useCreateLandedCost,
useLandedCostTransaction,
} from 'hooks/query';
import {
getEntriesByTransactionId,
getCostTransactionById,
getTransactionEntryById,
} from './utils';
const AllocateLandedCostDialogContext = React.createContext(); const AllocateLandedCostDialogContext = React.createContext();
@@ -13,22 +23,79 @@ function AllocateLandedCostDialogProvider({
dialogName, dialogName,
...props ...props
}) { }) {
const [transactionsType, setTransactionsType] = React.useState(null);
const [transactionId, setTransactionId] = React.useState(null);
const [transactionEntryId, setTransactionEntryId] = React.useState(null);
// Handle fetch bill details. // Handle fetch bill details.
const { isLoading: isBillLoading, data: bill } = useBill(billId, { const { isLoading: isBillLoading, data: bill } = useBill(billId, {
enabled: !!billId, enabled: !!billId,
}); });
// Retrieve the landed cost transactions based on the given transactions type.
const {
data: { transactions: landedCostTransactions },
} = useLandedCostTransaction(transactionsType, {
enabled: !!transactionsType,
});
// Landed cost selected transaction.
const costTransaction = React.useMemo(
() =>
transactionId
? getCostTransactionById(transactionId, landedCostTransactions)
: null,
[transactionId, landedCostTransactions],
);
// Retrieve the cost transaction entry.
const costTransactionEntry = React.useMemo(
() =>
costTransaction && transactionEntryId
? getTransactionEntryById(costTransaction, transactionEntryId)
: null,
[costTransaction, transactionEntryId],
);
// Retrieve entries of the given transaction id.
const costTransactionEntries = React.useMemo(
() =>
transactionId
? getEntriesByTransactionId(landedCostTransactions, transactionId)
: [],
[landedCostTransactions, transactionId],
);
// Create landed cost mutations. // Create landed cost mutations.
const { mutateAsync: createLandedCostMutate } = useCreateLandedCost(); const { mutateAsync: createLandedCostMutate } = useCreateLandedCost();
// provider payload. // Retrieve the unallocate cost amount of cost transaction.
const unallocatedCostAmount = defaultTo(
get(costTransactionEntry, 'unallocated_cost_amount'),
0,
);
// Retrieve the unallocate cost amount of cost transaction.
const formattedUnallocatedCostAmount = defaultTo(
get(costTransactionEntry, 'formatted_unallocated_cost_amount'),
0,
);
// Provider payload.
const provider = { const provider = {
isBillLoading, isBillLoading,
bill, bill,
dialogName, dialogName,
query, query,
createLandedCostMutate, createLandedCostMutate,
costTransaction,
costTransactionEntries,
transactionsType,
landedCostTransactions,
setTransactionsType,
setTransactionId,
setTransactionEntryId,
costTransactionEntry,
transactionEntryId,
transactionId,
billId, billId,
unallocatedCostAmount,
formattedUnallocatedCostAmount,
}; };
return ( return (

View File

@@ -1,7 +1,10 @@
import React from 'react'; import React from 'react';
import intl from 'react-intl-universal'; import styled from 'styled-components';
import { MoneyFieldCell, DataTableEditable } from 'components';
import { DataTableEditable } from 'components';
import { compose, updateTableCell } from 'utils'; import { compose, updateTableCell } from 'utils';
import { useAllocateLandedCostEntriesTableColumns } from './utils';
/** /**
* Allocate landed cost entries table. * Allocate landed cost entries table.
@@ -11,42 +14,7 @@ export default function AllocateLandedCostEntriesTable({
entries, entries,
}) { }) {
// Allocate landed cost entries table columns. // Allocate landed cost entries table columns.
const columns = React.useMemo( const columns = useAllocateLandedCostEntriesTableColumns();
() => [
{
Header: intl.get('item'),
accessor: 'item.name',
disableSortBy: true,
width: '150',
},
{
Header: intl.get('quantity'),
accessor: 'quantity',
disableSortBy: true,
width: '100',
},
{
Header: intl.get('rate'),
accessor: 'rate',
disableSortBy: true,
width: '100',
},
{
Header: intl.get('amount'),
accessor: 'amount',
disableSortBy: true,
width: '100',
},
{
Header: intl.get('cost'),
accessor: 'cost',
width: '150',
Cell: MoneyFieldCell,
disableSortBy: true,
},
],
[],
);
// Handle update data. // Handle update data.
const handleUpdateData = React.useCallback( const handleUpdateData = React.useCallback(
@@ -60,7 +28,7 @@ export default function AllocateLandedCostEntriesTable({
); );
return ( return (
<DataTableEditable <AllocateLandeedCostEntriesEditableTable
columns={columns} columns={columns}
data={entries} data={entries}
payload={{ payload={{
@@ -70,3 +38,18 @@ export default function AllocateLandedCostEntriesTable({
/> />
); );
} }
export const AllocateLandeedCostEntriesEditableTable = styled(
DataTableEditable,
)`
.table {
.thead .tr .th {
padding-top: 8px;
padding-bottom: 8px;
}
.tbody .tr .td {
padding: 0.25rem;
}
}
`;

View File

@@ -1,19 +1,31 @@
import React from 'react'; import React from 'react';
import { Intent, Button, Classes } from '@blueprintjs/core'; import { Intent, Button } from '@blueprintjs/core';
import { FormattedMessage as T } from 'components';
import { useFormikContext } from 'formik'; import { useFormikContext } from 'formik';
import styled from 'styled-components';
import {
DialogFooter,
DialogFooterActions,
FormattedMessage as T,
} from 'components';
import { useAllocateLandedConstDialogContext } from './AllocateLandedCostDialogProvider'; import { useAllocateLandedConstDialogContext } from './AllocateLandedCostDialogProvider';
import withDialogActions from 'containers/Dialog/withDialogActions'; import withDialogActions from 'containers/Dialog/withDialogActions';
import { compose } from 'utils'; import { compose } from 'utils';
/**
* Allocate landed cost floating actions.
* @returns {React.JSX}
*/
function AllocateLandedCostFloatingActions({ function AllocateLandedCostFloatingActions({
// #withDialogActions // #withDialogActions
closeDialog, closeDialog,
}) { }) {
// Formik context. // Formik context.
const { isSubmitting } = useFormikContext(); const { isSubmitting } = useFormikContext();
const { dialogName } = useAllocateLandedConstDialogContext();
// Allocate landed cost dialog context.
const { dialogName, costTransactionEntry, formattedUnallocatedCostAmount } =
useAllocateLandedConstDialogContext();
// Handle cancel button click. // Handle cancel button click.
const handleCancelBtnClick = (event) => { const handleCancelBtnClick = (event) => {
@@ -21,22 +33,45 @@ function AllocateLandedCostFloatingActions({
}; };
return ( return (
<div className={Classes.DIALOG_FOOTER}> <AllocateDialogFooter>
<div className={Classes.DIALOG_FOOTER_ACTIONS}> <DialogFooterActions alignment={'left'}>
{costTransactionEntry && (
<UnallocatedAmount>
<T id={'landed_cost.dialog.label_unallocated_cost_amount'}/>
<strong>{formattedUnallocatedCostAmount}</strong>
</UnallocatedAmount>
)}
</DialogFooterActions>
<DialogFooterActions alignment={'right'}>
<Button onClick={handleCancelBtnClick} style={{ minWidth: '85px' }}> <Button onClick={handleCancelBtnClick} style={{ minWidth: '85px' }}>
<T id={'cancel'} /> <T id={'cancel'} />
</Button> </Button>
<Button <Button
intent={Intent.PRIMARY} intent={Intent.PRIMARY}
style={{ minWidth: '85px' }} style={{ minWidth: '95px' }}
type="submit" type="submit"
loading={isSubmitting} loading={isSubmitting}
> >
{<T id={'save'} />} {<T id={'save'} />}
</Button> </Button>
</div> </DialogFooterActions>
</div> </AllocateDialogFooter>
); );
} }
export default compose(withDialogActions)(AllocateLandedCostFloatingActions); export default compose(withDialogActions)(AllocateLandedCostFloatingActions);
const AllocateDialogFooter = styled(DialogFooter)`
display: flex;
`;
const UnallocatedAmount = styled.div`
color: #3f5278;
align-self: center;
strong {
color: #353535;
padding-left: 4px;
}
`;

View File

@@ -2,8 +2,6 @@ import React from 'react';
import { Formik } from 'formik'; import { Formik } from 'formik';
import { Intent } from '@blueprintjs/core'; import { Intent } from '@blueprintjs/core';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import moment from 'moment';
import { sumBy } from 'lodash';
import 'style/pages/AllocateLandedCost/AllocateLandedCostForm.scss'; import 'style/pages/AllocateLandedCost/AllocateLandedCostForm.scss';
@@ -13,22 +11,7 @@ import { useAllocateLandedConstDialogContext } from './AllocateLandedCostDialogP
import AllocateLandedCostFormContent from './AllocateLandedCostFormContent'; import AllocateLandedCostFormContent from './AllocateLandedCostFormContent';
import withDialogActions from 'containers/Dialog/withDialogActions'; import withDialogActions from 'containers/Dialog/withDialogActions';
import { compose, transformToForm } from 'utils'; import { compose, transformToForm } from 'utils';
import { defaultInitialValues } from './utils';
// Default form initial values.
const defaultInitialValues = {
transaction_type: 'Bill',
transaction_date: moment(new Date()).format('YYYY-MM-DD'),
transaction_id: '',
transaction_entry_id: '',
amount: '',
allocation_method: 'quantity',
items: [
{
entry_id: '',
cost: '',
},
],
};
/** /**
* Allocate landed cost form. * Allocate landed cost form.
@@ -49,11 +32,9 @@ function AllocateLandedCostForm({
cost: '', cost: '',
})), })),
}; };
const amount = sumBy(initialValues.items, 'amount');
// Handle form submit. // Handle form submit.
const handleFormSubmit = (values, { setSubmitting }) => { const handleFormSubmit = (values, { setSubmitting }) => {
setSubmitting(false); setSubmitting(true);
// Filters the entries has no cost. // Filters the entries has no cost.
const entries = values.items const entries = values.items
@@ -61,7 +42,10 @@ function AllocateLandedCostForm({
.map((entry) => transformToForm(entry, defaultInitialValues.items[0])); .map((entry) => transformToForm(entry, defaultInitialValues.items[0]));
if (entries.length <= 0) { if (entries.length <= 0) {
AppToaster.show({ message: 'Something wrong!', intent: Intent.DANGER }); AppToaster.show({
message: intl.get('something_wrong'),
intent: Intent.DANGER,
});
return; return;
} }
const form = { const form = {
@@ -77,17 +61,34 @@ function AllocateLandedCostForm({
setSubmitting(false); setSubmitting(false);
closeDialog(dialogName); closeDialog(dialogName);
}; };
// Handle the request error. // Handle the request error.
const onError = () => { const onError = (res) => {
const { errors } = res.response.data;
setSubmitting(false); setSubmitting(false);
AppToaster.show({ message: 'Something went wrong!', intent: Intent.DANGER });
if (
errors.some(
(e) => e.type === 'COST_AMOUNT_BIGGER_THAN_UNALLOCATED_AMOUNT',
)
) {
AppToaster.show({
message: intl.get(
'landed_cost.error.the_total_located_cost_is_bigger_than_the_transaction_line',
),
intent: Intent.DANGER,
});
} else {
AppToaster.show({
message: intl.get('something_went_wrong'),
intent: Intent.DANGER,
});
}
}; };
createLandedCostMutate([billId, form]).then(onSuccess).catch(onError); createLandedCostMutate([billId, form]).then(onSuccess).catch(onError);
}; };
// Computed validation schema. // Computed validation schema.
const validationSchema = AllocateLandedCostFormSchema(amount); const validationSchema = AllocateLandedCostFormSchema();
return ( return (
<Formik <Formik

View File

@@ -1,13 +1,13 @@
import * as Yup from 'yup'; import * as Yup from 'yup';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
export const AllocateLandedCostFormSchema = (minAmount) => export const AllocateLandedCostFormSchema = () =>
Yup.object().shape({ Yup.object().shape({
transaction_type: Yup.string().label(intl.get('transaction_type')), transaction_type: Yup.string().label(intl.get('transaction_type')),
transaction_date: Yup.date().label(intl.get('transaction_date')), transaction_date: Yup.date().label(intl.get('transaction_date')),
transaction_id: Yup.string().label(intl.get('transaction_number')), transaction_id: Yup.string().label(intl.get('transaction_number')),
transaction_entry_id: Yup.string().label(intl.get('transaction_line')), transaction_entry_id: Yup.string().label(intl.get('transaction_line')),
amount: Yup.number().max(minAmount).label(intl.get('amount')), amount: Yup.number().label(intl.get('amount')),
allocation_method: Yup.string().trim(), allocation_method: Yup.string().trim(),
items: Yup.array().of( items: Yup.array().of(
Yup.object().shape({ Yup.object().shape({

View File

@@ -1,16 +1,37 @@
import React from 'react'; import React from 'react';
import { Form } from 'formik'; import { Form, useFormikContext } from 'formik';
import { FormObserver } from 'components';
import AllocateLandedCostFormFields from './AllocateLandedCostFormFields'; import AllocateLandedCostFormFields from './AllocateLandedCostFormFields';
import { useAllocateLandedConstDialogContext } from './AllocateLandedCostDialogProvider';
import AllocateLandedCostFloatingActions from './AllocateLandedCostFloatingActions'; import AllocateLandedCostFloatingActions from './AllocateLandedCostFloatingActions';
/** /**
* Allocate landed cost form content. * Allocate landed cost form content.
*/ */
export default function AllocateLandedCostFormContent() { export default function AllocateLandedCostFormContent() {
const { values } = useFormikContext();
// Allocate landed cost dialog context.
const { setTransactionsType, setTransactionId, setTransactionEntryId } =
useAllocateLandedConstDialogContext();
// Handle the form change.
const handleFormChange = (values) => {
if (values.transaction_type) {
setTransactionsType(values.transaction_type);
}
if (values.transaction_id) {
setTransactionId(values.transaction_id);
}
if (values.transaction_entry_id) {
setTransactionEntryId(values.transaction_entry_id);
}
};
return ( return (
<Form> <Form>
<AllocateLandedCostFormFields /> <AllocateLandedCostFormFields />
<AllocateLandedCostFloatingActions /> <AllocateLandedCostFloatingActions />
<FormObserver values={values} onChange={handleFormChange} />
</Form> </Form>
); );
} }

View File

@@ -1,5 +1,5 @@
import React from 'react'; import React from 'react';
import { FastField, Field, ErrorMessage, useFormikContext } from 'formik'; import { FastField, Field, ErrorMessage } from 'formik';
import { import {
Classes, Classes,
FormGroup, FormGroup,
@@ -14,31 +14,31 @@ import { inputIntent, handleStringChange } from 'utils';
import { FieldRequiredHint, ListSelect } from 'components'; import { FieldRequiredHint, ListSelect } from 'components';
import { CLASSES } from 'common/classes'; import { CLASSES } from 'common/classes';
import allocateLandedCostType from 'common/allocateLandedCostType'; import allocateLandedCostType from 'common/allocateLandedCostType';
import { useLandedCostTransaction } from 'hooks/query';
import AllocateLandedCostFormBody from './AllocateLandedCostFormBody'; import AllocateLandedCostFormBody from './AllocateLandedCostFormBody';
import { getEntriesByTransactionId, allocateCostToEntries } from './utils'; import {
transactionsSelectShouldUpdate,
allocateCostToEntries,
resetAllocatedCostEntries,
} from './utils';
import { useAllocateLandedConstDialogContext } from './AllocateLandedCostDialogProvider';
/** /**
* Allocate landed cost form fields. * Allocate landed cost form fields.
*/ */
export default function AllocateLandedCostFormFields() { export default function AllocateLandedCostFormFields() {
const { values } = useFormikContext(); // Allocated landed cost dialog.
const { costTransactionEntries, landedCostTransactions } =
const { useAllocateLandedConstDialogContext();
data: { transactions },
} = useLandedCostTransaction(values.transaction_type);
// Retrieve entries of the given transaction id.
const transactionEntries = React.useMemo(
() => getEntriesByTransactionId(transactions, values.transaction_id),
[transactions, values.transaction_id],
);
return ( return (
<div className={Classes.DIALOG_BODY}> <div className={Classes.DIALOG_BODY}>
{/*------------Transaction type -----------*/} {/*------------Transaction type -----------*/}
<FastField name={'transaction_type'}> <FastField
name={'transaction_type'}
transactions={allocateLandedCostType}
shouldUpdate={transactionsSelectShouldUpdate}
>
{({ {({
form: { values, setFieldValue }, form: { values, setFieldValue },
field: { value }, field: { value },
@@ -55,9 +55,14 @@ export default function AllocateLandedCostFormFields() {
<ListSelect <ListSelect
items={allocateLandedCostType} items={allocateLandedCostType}
onItemSelect={(type) => { onItemSelect={(type) => {
const { items } = values;
setFieldValue('transaction_type', type.value); setFieldValue('transaction_type', type.value);
setFieldValue('transaction_id', ''); setFieldValue('transaction_id', '');
setFieldValue('transaction_entry_id', ''); setFieldValue('transaction_entry_id', '');
setFieldValue('amount', '');
setFieldValue('items', resetAllocatedCostEntries(items));
}} }}
filterable={false} filterable={false}
selectedItem={value} selectedItem={value}
@@ -70,7 +75,11 @@ export default function AllocateLandedCostFormFields() {
</FastField> </FastField>
{/*------------ Transaction -----------*/} {/*------------ Transaction -----------*/}
<Field name={'transaction_id'}> <Field
name={'transaction_id'}
transactions={landedCostTransactions}
shouldUpdate={transactionsSelectShouldUpdate}
>
{({ form, field: { value }, meta: { error, touched } }) => ( {({ form, field: { value }, meta: { error, touched } }) => (
<FormGroup <FormGroup
label={<T id={'transaction_id'} />} label={<T id={'transaction_id'} />}
@@ -81,17 +90,23 @@ export default function AllocateLandedCostFormFields() {
inline={true} inline={true}
> >
<ListSelect <ListSelect
items={transactions} items={landedCostTransactions}
onItemSelect={({ id }) => { onItemSelect={({ id }) => {
const { items } = form.values;
form.setFieldValue('transaction_id', id); form.setFieldValue('transaction_id', id);
form.setFieldValue('transaction_entry_id', ''); form.setFieldValue('transaction_entry_id', '');
form.setFieldValue('amount', '');
form.setFieldValue('items', resetAllocatedCostEntries(items));
}} }}
filterable={false} filterable={false}
selectedItem={value} selectedItem={value}
selectedItemProp={'id'} selectedItemProp={'id'}
textProp={'name'} textProp={'name'}
labelProp={'id'} labelProp={'formatted_unallocated_cost_amount'}
defaultText={intl.get('Select transaction')} defaultText={intl.get(
'landed_cost.dialog.label_select_transaction',
)}
popoverProps={{ minimal: true }} popoverProps={{ minimal: true }}
/> />
</FormGroup> </FormGroup>
@@ -99,8 +114,12 @@ export default function AllocateLandedCostFormFields() {
</Field> </Field>
{/*------------ Transaction line -----------*/} {/*------------ Transaction line -----------*/}
<If condition={transactionEntries.length > 0}> <If condition={costTransactionEntries.length > 0}>
<Field name={'transaction_entry_id'}> <Field
name={'transaction_entry_id'}
transactions={costTransactionEntries}
shouldUpdate={transactionsSelectShouldUpdate}
>
{({ form, field: { value }, meta: { error, touched } }) => ( {({ form, field: { value }, meta: { error, touched } }) => (
<FormGroup <FormGroup
label={<T id={'transaction_line'} />} label={<T id={'transaction_line'} />}
@@ -113,23 +132,31 @@ export default function AllocateLandedCostFormFields() {
inline={true} inline={true}
> >
<ListSelect <ListSelect
items={transactionEntries} items={costTransactionEntries}
onItemSelect={({ id, amount }) => { onItemSelect={(entry) => {
const { id, unallocated_cost_amount: unallocatedAmount } =
entry;
const { items, allocation_method } = form.values; const { items, allocation_method } = form.values;
form.setFieldValue('amount', amount); form.setFieldValue('amount', unallocatedAmount);
form.setFieldValue('transaction_entry_id', id); form.setFieldValue('transaction_entry_id', id);
form.setFieldValue( form.setFieldValue(
'items', 'items',
allocateCostToEntries(amount, allocation_method, items), allocateCostToEntries(
unallocatedAmount,
allocation_method,
items,
),
); );
}} }}
filterable={false} filterable={false}
selectedItem={value} selectedItem={value}
selectedItemProp={'id'} selectedItemProp={'id'}
textProp={'name'} textProp={'name'}
defaultText={intl.get('Select transaction entry')} labelProp={'formatted_unallocated_cost_amount'}
defaultText={intl.get(
'landed_cost.dialog.label_select_transaction_entry',
)}
popoverProps={{ minimal: true }} popoverProps={{ minimal: true }}
/> />
</FormGroup> </FormGroup>
@@ -177,12 +204,12 @@ export default function AllocateLandedCostFormFields() {
> >
<RadioGroup <RadioGroup
onChange={handleStringChange((_value) => { onChange={handleStringChange((_value) => {
const { amount, items, allocation_method } = form.values; const { amount, items } = form.values;
form.setFieldValue('allocation_method', _value); form.setFieldValue('allocation_method', _value);
form.setFieldValue( form.setFieldValue(
'items', 'items',
allocateCostToEntries(amount, allocation_method, items), allocateCostToEntries(amount, _value, items),
); );
})} })}
selectedValue={value} selectedValue={value}

View File

@@ -1,5 +1,26 @@
import React from 'react';
import { sumBy, round } from 'lodash'; import { sumBy, round } from 'lodash';
import * as R from 'ramda'; import * as R from 'ramda';
import intl from 'react-intl-universal';
import { defaultFastFieldShouldUpdate } from 'utils';
import { MoneyFieldCell } from 'components';
export const defaultInitialItem = {
entry_id: '',
cost: '',
};
// Default form initial values.
export const defaultInitialValues = {
transaction_type: 'Bill',
transaction_id: '',
transaction_entry_id: '',
amount: '',
allocation_method: 'quantity',
items: [defaultInitialItem],
};
/** /**
* Retrieve transaction entries of the given transaction id. * Retrieve transaction entries of the given transaction id.
*/ */
@@ -8,6 +29,23 @@ export function getEntriesByTransactionId(transactions, id) {
return transaction ? transaction.entries : []; return transaction ? transaction.entries : [];
} }
/**
*
* @param {*} transaction
* @param {*} transactionEntryId
* @returns
*/
export function getTransactionEntryById(transaction, transactionEntryId) {
return transaction.entries.find((entry) => entry.id === transactionEntryId);
}
/**
*
* @param {*} total
* @param {*} allocateType
* @param {*} entries
* @returns
*/
export function allocateCostToEntries(total, allocateType, entries) { export function allocateCostToEntries(total, allocateType, entries) {
return R.compose( return R.compose(
R.when( R.when(
@@ -30,12 +68,12 @@ export function allocateCostToEntries(total, allocateType, entries) {
export function allocateCostByValue(total, entries) { export function allocateCostByValue(total, entries) {
const totalAmount = sumBy(entries, 'amount'); const totalAmount = sumBy(entries, 'amount');
const _entries = entries.map((entry) => ({ const entriesMapped = entries.map((entry) => ({
...entry, ...entry,
percentageOfValue: entry.amount / totalAmount, percentageOfValue: entry.amount / totalAmount,
})); }));
return _entries.map((entry) => ({ return entriesMapped.map((entry) => ({
...entry, ...entry,
cost: round(entry.percentageOfValue * total, 2), cost: round(entry.percentageOfValue * total, 2),
})); }));
@@ -60,3 +98,73 @@ export function allocateCostByQuantity(total, entries) {
cost: round(entry.percentageOfQuantity * total, 2), cost: round(entry.percentageOfQuantity * total, 2),
})); }));
} }
/**
* Retrieve the landed cost transaction by the given id.
*/
export function getCostTransactionById(id, transactions) {
return transactions.find((trans) => trans.id === id);
}
/**
* Detarmines the transactions selet field when should update.
*/
export function transactionsSelectShouldUpdate(newProps, oldProps) {
return (
newProps.transactions !== oldProps.transactions ||
defaultFastFieldShouldUpdate(newProps, oldProps)
);
}
/**
*
* @param {*} entries
* @returns
*/
export function resetAllocatedCostEntries(entries) {
return entries.map((entry) => ({ ...entry, cost: 0 }));
}
/**
* Retrieves allocate landed cost entries table columns.
*/
export const useAllocateLandedCostEntriesTableColumns = () => {
return React.useMemo(
() => [
{
Header: intl.get('item'),
accessor: 'item.name',
disableSortBy: true,
width: '150',
},
{
Header: intl.get('quantity'),
accessor: 'quantity',
disableSortBy: true,
width: '100',
},
{
Header: intl.get('rate'),
accessor: 'rate',
disableSortBy: true,
width: '100',
align: 'right',
},
{
Header: intl.get('amount'),
accessor: 'amount',
disableSortBy: true,
align: 'right',
width: '100',
},
{
Header: intl.get('cost'),
accessor: 'cost',
width: '150',
Cell: MoneyFieldCell,
disableSortBy: true,
},
],
[],
);
};

View File

@@ -0,0 +1,102 @@
import React from 'react';
import intl from 'react-intl-universal';
import { useSaveSettings } from 'hooks/query';
import { CreditNoteNumberDialogProvider } from './CreditNoteNumberDialogProvider';
import ReferenceNumberForm from 'containers/JournalNumber/ReferenceNumberForm';
import withDialogActions from 'containers/Dialog/withDialogActions';
import withSettings from 'containers/Settings/withSettings';
import withSettingsActions from 'containers/Settings/withSettingsActions';
import { compose } from 'utils';
import {
transformFormToSettings,
transformSettingsToForm,
} from 'containers/JournalNumber/utils';
/**
* credit note number dialog content
*/
function CreditNoteNumberDialogContent({
// #ownProps
initialValues,
onConfirm,
// #withSettings
nextNumber,
numberPrefix,
autoIncrement,
// #withDialogActions
closeDialog,
}) {
const { mutateAsync: saveSettings } = useSaveSettings();
const [referenceFormValues, setReferenceFormValues] = React.useState(null);
// Handle the submit form.
const handleSubmitForm = (values, { setSubmitting }) => {
// Handle the form success.
const handleSuccess = () => {
setSubmitting(false);
closeDialog('credit-number-form');
onConfirm(values);
};
// Handle the form errors.
const handleErrors = () => {
setSubmitting(false);
};
if (values.incrementMode === 'manual-transaction') {
handleSuccess();
return;
}
// Transformes the form values to settings to save it.
const options = transformFormToSettings(values, 'credit_note');
// Save the settings.
saveSettings({ options }).then(handleSuccess).catch(handleErrors);
};
// Handle the dialog close.
const handleClose = () => {
closeDialog('credit-number-form');
};
// Handle form change.
const handleChange = (values) => {
setReferenceFormValues(values);
};
// Description.
const description =
referenceFormValues?.incrementMode === 'auto'
? intl.get('credit_note.auto_increment.auto')
: intl.get('credit_note.auto_increment.manually');
return (
<CreditNoteNumberDialogProvider>
<ReferenceNumberForm
initialValues={{
...transformSettingsToForm({
nextNumber,
numberPrefix,
autoIncrement,
}),
...initialValues,
}}
description={description}
onSubmit={handleSubmitForm}
onClose={handleClose}
onChange={handleChange}
/>
</CreditNoteNumberDialogProvider>
);
}
export default compose(
withDialogActions,
withSettingsActions,
withSettings(({ creditNoteSettings }) => ({
autoIncrement: creditNoteSettings?.autoIncrement,
nextNumber: creditNoteSettings?.nextNumber,
numberPrefix: creditNoteSettings?.numberPrefix,
})),
)(CreditNoteNumberDialogContent);

View File

@@ -0,0 +1,28 @@
import React from 'react';
import { DialogContent } from 'components';
import { useSettingsCreditNotes } from 'hooks/query';
const CreditNoteNumberDialogContext = React.createContext();
/**
*Credit Note number dialog provider
*/
function CreditNoteNumberDialogProvider({ query, ...props }) {
const { isLoading: isSettingsLoading } = useSettingsCreditNotes();
// Provider payload.
const provider = {
isSettingsLoading,
};
return (
<DialogContent isLoading={isSettingsLoading}>
<CreditNoteNumberDialogContext.Provider value={provider} {...props} />
</DialogContent>
);
}
const useCreditNoteNumberDialogContext = () =>
React.useContext(CreditNoteNumberDialogContext);
export { CreditNoteNumberDialogProvider, useCreditNoteNumberDialogContext };

View File

@@ -0,0 +1,40 @@
import React from 'react';
import { Dialog, DialogSuspense, FormattedMessage as T } from 'components';
import withDialogRedux from 'components/DialogReduxConnect';
import { compose, saveInvoke } from 'utils';
const CreditNoteNumberDialogContent = React.lazy(() =>
import('./CreditNoteNumberDialogContent'),
);
/**
* Credit note number dialog.
*/
function CreditNoteNumberDialog({
dialogName,
payload: { initialFormValues },
isOpen,
onConfirm,
}) {
const handleConfirm = (values) => {
saveInvoke(onConfirm, values);
};
return (
<Dialog
title={<T id={'credit_note_number_settings'} />}
name={dialogName}
autoFocus={true}
canEscapeKeyClose={true}
isOpen={isOpen}
>
<DialogSuspense>
<CreditNoteNumberDialogContent
initialValues={{ ...initialFormValues }}
onConfirm={handleConfirm}
/>
</DialogSuspense>
</Dialog>
);
}
export default compose(withDialogRedux())(CreditNoteNumberDialog);

View File

@@ -24,7 +24,7 @@ function InviteUserFormContent({
const handleClose = () => { const handleClose = () => {
closeDialog(dialogName); closeDialog(dialogName);
}; };
console.log(roles, 'XX');
return ( return (
<Form> <Form>
<div className={CLASSES.DIALOG_BODY}> <div className={CLASSES.DIALOG_BODY}>
@@ -49,7 +49,7 @@ function InviteUserFormContent({
<FastField name={'role_id'}> <FastField name={'role_id'}>
{({ form, field: { value }, meta: { error, touched } }) => ( {({ form, field: { value }, meta: { error, touched } }) => (
<FormGroup <FormGroup
label={<T id={'roles.label.role_name'} />} label={<T id={'invite_user.label.role_name'} />}
labelInfo={<FieldRequiredHint />} labelInfo={<FieldRequiredHint />}
helperText={<ErrorMessage name="role_id" />} helperText={<ErrorMessage name="role_id" />}
className={classNames(CLASSES.FILL, 'form-group--role_name')} className={classNames(CLASSES.FILL, 'form-group--role_name')}

View File

@@ -0,0 +1,24 @@
import React from 'react';
import { LockingTransactionsFormProvider } from './LockingTransactionsFormProvider';
import LockingTransactionsForm from './LockingTransactionsForm';
/**
* Locking transactions dialog content.
*/
export default function LockingTransactionsDialogContent({
// #ownProps
dialogName,
moduleName,
isEnabled,
}) {
return (
<LockingTransactionsFormProvider
isEnabled={isEnabled}
moduleName={moduleName}
dialogName={dialogName}
>
<LockingTransactionsForm />
</LockingTransactionsFormProvider>
);
}

View File

@@ -0,0 +1,89 @@
import React from 'react';
import moment from 'moment';
import { Intent } from '@blueprintjs/core';
import { Formik } from 'formik';
import intl from 'react-intl-universal';
import '../../../style/pages/TransactionsLocking/TransactionsLockingDialog.scss';
import { AppToaster } from 'components';
import { CreateLockingTransactionsFormSchema } from './LockingTransactionsForm.schema';
import { useLockingTransactionsContext } from './LockingTransactionsFormProvider';
import LockingTransactionsFormContent from './LockingTransactionsFormContent';
import withDialogActions from 'containers/Dialog/withDialogActions';
import { compose, transformToForm } from 'utils';
const defaultInitialValues = {
module: '',
lock_to_date: moment(new Date()).format('YYYY-MM-DD'),
reason: '',
};
/**
* Locking Transactions Form.
*/
function LockingTransactionsForm({
// #withDialogActions
closeDialog,
}) {
const {
dialogName,
moduleName,
transactionLocking,
isEnabled,
createLockingTransactionMutate,
} = useLockingTransactionsContext();
// Initial form values.
const initialValues = React.useMemo(
() => ({
...(isEnabled
? {
...transformToForm(transactionLocking, defaultInitialValues),
module: moduleName,
}
: {
...defaultInitialValues,
module: moduleName,
}),
}),
[isEnabled],
);
// Handles the form submit.
const handleFormSubmit = (values, { setSubmitting, setErrors }) => {
setSubmitting(true);
// Handle request response success.
const onSuccess = (response) => {
AppToaster.show({
message: intl.get('locking_transactions.dialog.success_message'),
intent: Intent.SUCCESS,
});
closeDialog(dialogName);
};
// Handle request response errors.
const onError = ({
response: {
data: { errors },
},
}) => {
setSubmitting(false);
};
createLockingTransactionMutate(values).then(onSuccess).catch(onError);
};
return (
<Formik
validationSchema={CreateLockingTransactionsFormSchema}
initialValues={initialValues}
onSubmit={handleFormSubmit}
component={LockingTransactionsFormContent}
/>
);
}
export default compose(withDialogActions)(LockingTransactionsForm);

View File

@@ -0,0 +1,14 @@
import * as Yup from 'yup';
import intl from 'react-intl-universal';
import { DATATYPES_LENGTH } from 'common/dataTypes';
const Schema = Yup.object().shape({
lock_to_date: Yup.date().required().label(intl.get('date')),
module: Yup.string().required(),
reason: Yup.string()
.required()
.min(3)
.max(DATATYPES_LENGTH.TEXT)
.label(intl.get('reason')),
});
export const CreateLockingTransactionsFormSchema = Schema;

View File

@@ -0,0 +1,17 @@
import React from 'react';
import { Form } from 'formik';
import LockingTransactionsFormFields from './LockingTransactionsFormFields';
import LockingTransactionsFormFloatingActions from './LockingTransactionsFormFloatingActions';
/**
* locking Transactions form content.
*/
export default function LockingTransactionsFormContent() {
return (
<Form>
<LockingTransactionsFormFields />
<LockingTransactionsFormFloatingActions />
</Form>
);
}

View File

@@ -14,28 +14,28 @@ import {
} from 'utils'; } from 'utils';
/** /**
* Transactions locking form fields. * locking Transactions form fields.
*/ */
export default function TransactionsLockingFormFields() { export default function LockingTransactionsFormFields() {
const dateFieldRef = useAutofocus(); const reasonFieldRef = useAutofocus();
return ( return (
<div className={Classes.DIALOG_BODY}> <div className={Classes.DIALOG_BODY}>
{/*------------ Date -----------*/} {/*------------ Locking Date -----------*/}
<FastField name={'date'}> <FastField name={'lock_to_date'}>
{({ form, field: { value }, meta: { error, touched } }) => ( {({ form, field: { value }, meta: { error, touched } }) => (
<FormGroup <FormGroup
label={<T id={'date'} />} label={<T id={'locking_transactions.dialog.locking_date'} />}
labelInfo={<FieldRequiredHint />} labelInfo={<FieldRequiredHint />}
intent={inputIntent({ error, touched })} intent={inputIntent({ error, touched })}
helperText={<ErrorMessage name="date" />} helperText={<ErrorMessage name="lock_to_date" />}
minimal={true} minimal={true}
className={classNames(CLASSES.FILL, 'form-group--date')} className={classNames(CLASSES.FILL, 'form-group--date')}
> >
<DateInput <DateInput
{...momentFormatter('YYYY/MM/DD')} {...momentFormatter('YYYY/MM/DD')}
onChange={handleDateChange((formattedDate) => { onChange={handleDateChange((formattedDate) => {
form.setFieldValue('date', formattedDate); form.setFieldValue('lock_to_date', formattedDate);
})} })}
value={tansformDateValue(value)} value={tansformDateValue(value)}
popoverProps={{ popoverProps={{
@@ -43,16 +43,16 @@ export default function TransactionsLockingFormFields() {
minimal: true, minimal: true,
}} }}
intent={inputIntent({ error, touched })} intent={inputIntent({ error, touched })}
inputRef={(ref) => (dateFieldRef.current = ref)}
/> />
</FormGroup> </FormGroup>
)} )}
</FastField> </FastField>
{/*------------ reasons -----------*/}
{/*------------ Locking Reason -----------*/}
<FastField name={'reason'}> <FastField name={'reason'}>
{({ field, meta: { error, touched } }) => ( {({ field, meta: { error, touched } }) => (
<FormGroup <FormGroup
label={<T id={'reason'} />} label={<T id={'locking_transactions.dialog.reason'} />}
labelInfo={<FieldRequiredHint />} labelInfo={<FieldRequiredHint />}
className={'form-group--reason'} className={'form-group--reason'}
intent={inputIntent({ error, touched })} intent={inputIntent({ error, touched })}
@@ -62,6 +62,7 @@ export default function TransactionsLockingFormFields() {
growVertically={true} growVertically={true}
large={true} large={true}
intent={inputIntent({ error, touched })} intent={inputIntent({ error, touched })}
inputRef={(ref) => (reasonFieldRef.current = ref)}
{...field} {...field}
/> />
</FormGroup> </FormGroup>

View File

@@ -3,21 +3,21 @@ import { Intent, Button, Classes } from '@blueprintjs/core';
import { useFormikContext } from 'formik'; import { useFormikContext } from 'formik';
import { FormattedMessage as T } from 'components'; import { FormattedMessage as T } from 'components';
import { useTransactionLockingContext } from './TransactionsLockingFormProvider'; import { useLockingTransactionsContext } from './LockingTransactionsFormProvider';
import withDialogActions from 'containers/Dialog/withDialogActions'; import withDialogActions from 'containers/Dialog/withDialogActions';
import { compose } from 'utils'; import { compose } from 'utils';
/** /**
* Transactions locking floating actions. * locking Transactions floating actions.
*/ */
function TransactionsLockingFloatingActions({ function LockingTransactionsFormFloatingActions({
// #withDialogActions // #withDialogActions
closeDialog, closeDialog,
}) { }) {
// Formik context. // Formik context.
const { isSubmitting } = useFormikContext(); const { isSubmitting } = useFormikContext();
const { dialogName } = useTransactionLockingContext(); const { dialogName } = useLockingTransactionsContext();
// Handle cancel button click. // Handle cancel button click.
const handleCancelBtnClick = (event) => { const handleCancelBtnClick = (event) => {
@@ -27,24 +27,22 @@ function TransactionsLockingFloatingActions({
return ( return (
<div className={Classes.DIALOG_FOOTER}> <div className={Classes.DIALOG_FOOTER}>
<div className={Classes.DIALOG_FOOTER_ACTIONS}> <div className={Classes.DIALOG_FOOTER_ACTIONS}>
<Button
disabled={isSubmitting}
onClick={handleCancelBtnClick}
style={{ minWidth: '75px' }}
>
<T id={'cancel'} />
</Button>
<Button <Button
intent={Intent.PRIMARY} intent={Intent.PRIMARY}
loading={isSubmitting} style={{ minWidth: '95px' }}
style={{ minWidth: '75px' }}
type="submit" type="submit"
loading={isSubmitting}
> >
{<T id={'submit'} />} {<T id={'save'} />}
</Button>
<Button onClick={handleCancelBtnClick} style={{ minWidth: '85px' }}>
<T id={'cancel'} />
</Button> </Button>
</div> </div>
</div> </div>
); );
} }
export default compose(withDialogActions)(TransactionsLockingFloatingActions); export default compose(withDialogActions)(
LockingTransactionsFormFloatingActions,
);

View File

@@ -0,0 +1,46 @@
import React from 'react';
import { DialogContent } from 'components';
import {
useCreateLockingTransactoin,
useEditTransactionsLocking,
} from 'hooks/query';
const LockingTransactionsContext = React.createContext();
/**
* Locking transactions form provider.
*/
function LockingTransactionsFormProvider({
moduleName,
isEnabled,
dialogName,
...props
}) {
// Create locking transactions mutations.
const { mutateAsync: createLockingTransactionMutate } =
useCreateLockingTransactoin();
const { data: transactionLocking, isLoading: isTransactionsLockingLoading } =
useEditTransactionsLocking(moduleName, {
enabled: !!isEnabled,
});
// State provider.
const provider = {
dialogName,
moduleName,
createLockingTransactionMutate,
transactionLocking,
isEnabled,
};
return (
<DialogContent isLoading={isTransactionsLockingLoading}>
<LockingTransactionsContext.Provider value={provider} {...props} />
</DialogContent>
);
}
const useLockingTransactionsContext = () =>
React.useContext(LockingTransactionsContext);
export { LockingTransactionsFormProvider, useLockingTransactionsContext };

View File

@@ -0,0 +1,38 @@
import React from 'react';
import { Dialog, DialogSuspense, FormattedMessage as T } from 'components';
import withDialogRedux from 'components/DialogReduxConnect';
import { compose } from 'utils';
const LockingTransactionsDialogContent = React.lazy(() =>
import('./LockingTransactionsDialogContent'),
);
/**
* Locking Transactions dialog
*/
function LockingTransactionsDialog({
dialogName,
payload: { module, isEnabled },
isOpen,
}) {
return (
<Dialog
name={dialogName}
autoFocus={true}
title={<T id={'locking_transactions.dialog.label'} />}
canEscapeKeyClose={true}
isOpen={isOpen}
className={'dialog--transaction--locking'}
>
<DialogSuspense>
<LockingTransactionsDialogContent
moduleName={module}
dialogName={dialogName}
isEnabled={isEnabled}
/>
</DialogSuspense>
</Dialog>
);
}
export default compose(withDialogRedux())(LockingTransactionsDialog);

View File

@@ -86,7 +86,7 @@ function MoneyInForm({
}); });
}) })
.finally(() => { .finally(() => {
setSubmitting(true); setSubmitting(false);
}); });
}; };

View File

@@ -86,7 +86,7 @@ function MoneyOutForm({
}); });
}) })
.finally(() => { .finally(() => {
setSubmitting(true); setSubmitting(false);
}); });
}; };
return ( return (

View File

@@ -106,6 +106,6 @@ export default compose(
paymentReceiveNextNumber: paymentReceiveSettings?.nextNumber, paymentReceiveNextNumber: paymentReceiveSettings?.nextNumber,
paymentReceiveNumberPrefix: paymentReceiveSettings?.numberPrefix, paymentReceiveNumberPrefix: paymentReceiveSettings?.numberPrefix,
paymentReceiveAutoIncrement: paymentReceiveSettings?.autoIncrement, paymentReceiveAutoIncrement: paymentReceiveSettings?.autoIncrement,
preferredDepositAccount: paymentReceiveSettings?.depositAccount, preferredDepositAccount: paymentReceiveSettings?.preferredDepositAccount,
})), })),
)(QuickPaymentReceiveForm); )(QuickPaymentReceiveForm);

Some files were not shown because too many files have changed in this diff Show More