cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-20 13:04:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,652 Commits 175 Branches 0 Tags
development
Commit Graph

631 Commits

Author SHA1 Message Date
Jia Sheng ce5045e14f Merge branch 'white-form-list-upload-bank-slips' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	app/Console/Kernel.php
 2024-10-31 19:43:27 +08:00
Dillon Ngo bf5dd998e0 New website under maintenance page 2024-10-15 21:24:34 +08:00
edmondlang 97b783d668 Merge branch 'fix-proforma-invoice' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-23 16:59:48 +08:00
edmondlang eecb351fb3 fix proforma invoice 2024-08-23 16:59:05 +08:00
edmondlang 755f8c266a Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-23 11:05:20 +08:00
edmondlang 8963d5ff28 fix Proforma Invoice 2024-08-23 11:04:38 +08:00
Dillon Ngo 714e1ad340 Merge branch 'dillon/66.1-payment-bank-details' into development 2024-08-07 07:13:08 +08:00
Dillon Ngo 6160ec0651 Merge branch 'master' into dillon/66.1-payment-bank-details 2024-08-07 06:49:31 +08:00
Dillon Ngo 3bd708ed0e Recipient Bank Details to follow payment overriding the default attached to Booking 2024-08-07 06:46:17 +08:00
Dillon Ngo de11cdb13c Merge branch 'dillon/63.2-sorry-voucher' into 'master' 
Sorry Voucher Implementation

See merge request CIEFWorldwideSdnBhd/exchange-2.0!166
 2024-08-03 15:09:34 +00:00
edmondlang 6b2f674c17 Merge branch 'admin-1688-work-flow-aqqill' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-02 01:20:15 +08:00
Dillon Ngo 2a04ef5bd2 Merge branch 'dillon/63.2-sorry-voucher' into development 2024-07-23 19:12:40 +08:00
Dillon Ngo 0d60226c44 Sorry Voucher with new features enhancement requested by KS 2024-07-23 19:11:36 +08:00
edmondlang 31282492fe Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into admin-1688-work-flow-aqqill 2024-07-21 18:31:23 +08:00
Jia Sheng 9b0fbb66f4 Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-16 00:22:43 +08:00
Jia Sheng 26177eba66 add account holder name for usd order whiteform 2024-07-16 00:22:21 +08:00
Jia Sheng 53071e21a7 Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-15 21:10:28 +08:00
Jia Sheng 8debbd4ef4 add order reference to white form 2024-07-15 21:09:57 +08:00
edmondlang 91ce365c62 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-08 19:07:29 +08:00
Jia Sheng e8cb4b8f5a update pdf top header 2024-07-05 20:46:48 +08:00
Jia Sheng 0758123216 Merge branch 'change-credit-note-to-refund-note' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-04 22:29:10 +08:00
Jia Sheng c43c635661 update 2024-07-04 22:28:44 +08:00
Jia Sheng 79dd0554b1 Merge branch 'change-credit-note-to-refund-note' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-04 22:08:30 +08:00
Jia Sheng 77140ec751 -change the heading in pdf from credit note to refund note for those transaction after 02 April 2024 2024-07-04 22:07:24 +08:00
Dillon Ngo f0205bb674 Merge branch 'dillon/63-voucherify-updates' into development 2024-07-03 12:13:24 +08:00
Dillon Ngo ad06bd4c4c Fix welcome voucher email out of alignment issue in yahoo mail 2024-07-03 12:08:57 +08:00
edmondlang 60b1bbeee6 admin 1688 work flow template 2024-06-21 15:11:10 +08:00
edmondlang 939fcdcff8 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-06-12 10:17:14 +08:00
edmondlang 9a4dba7fdd fix the error mock up white form cannot be created 2024-06-12 10:16:31 +08:00
edmondlang a5d90d7049 Merge branch 'ga4-user-id' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-06-09 22:14:40 +08:00
edmondlang b7b2ab602a gtag push user id 2024-06-09 22:13:56 +08:00
JiaSheng 764b82dc1c Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-06-09 14:45:14 +08:00
JiaSheng ff88dcecf4 -check group total not tally with bill group total due to transfer fee not being included 
-include the transfer fee calculation
-script to update the bill group to include the transfer fee calculation
 2024-06-09 14:44:06 +08:00
edmondlang d0c009443b Merge branch 'export-currency-vendor-order-module' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-20 11:42:16 +08:00
edmondlang 3f5c735a43 update export currency vendor order 2024-05-20 11:41:21 +08:00
Aqqil Azman 3b4f3281b1 Merge branch 'export-currency-vendor-order-module' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-17 10:46:54 +08:00
Aqqil Azman 94680e3cbb renamed blade.php 2024-05-16 19:19:07 +08:00
Aqqil Azman f65702d72b refactor: renamed blade.php to supplier_deliver_order_group_invoice 2024-05-16 19:18:07 +08:00
Aqqil Azman 7fd8d2f1b5 initial commit 2024-05-16 12:25:26 +08:00
Aqqil Azman 97a8e34f3d initial commit 2024-05-13 09:58:28 +08:00
edmondlang 29bf3f4295 Merge branch 'fix-invoice-not-tally-with-voucherify' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-04-09 00:20:45 +08:00
edmondlang aeb0be11bf remove - in the invoice discount section, amount is already in negative 2024-04-09 00:20:19 +08:00
edmondlang a4cb2b2066 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-04-02 11:53:43 +08:00
Dillon Ngo d1bcda8029 Merge branch 'dillon/57-second-voucher-first-milestone' into development 2024-04-01 14:04:41 +08:00
Dillon Ngo eb30d41941 Second voucher (first milestone) for user upon reaching 2 completed bookings 2024-04-01 13:56:25 +08:00
Dillon Ngo 7ba34965e3 Merge branch 'dillon/53-voucherify-email-reminder-to-user' into development 2024-03-18 12:22:31 +08:00
Dillon Ngo 01bbb1e21a Amendment on welcome voocher email requested by kexin 2024-03-17 16:06:47 +08:00
JiaSheng 27ca11f0c2 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-15 10:34:50 +08:00
JiaSheng 81c81e3b48 -show remark and categorized in export refund booking 
-make refund function available for internal only, not for customer
 2024-03-15 10:34:21 +08:00
Dillon Ngo 36cde82a19 Send welcome email with voucher to user upon successful verification of customer email adddress 2024-03-14 15:52:20 +08:00