Commit Graph

73 Commits

Author SHA1 Message Date
omair saleh d64cd0bfe4 download billing documents 2022-03-02 03:22:47 +08:00
omair saleh e5d0c89c98 download billing documents 2022-03-02 03:21:22 +08:00
omair saleh 7e8c196048 download billing documents 2022-03-02 03:20:24 +08:00
omair saleh 753950f615 download billing documents 2022-03-02 03:19:34 +08:00
omair saleh c061725291 download billing documents 2022-03-02 03:15:58 +08:00
omair saleh 86bf52f7bf fix billing page 2022-03-02 02:28:40 +08:00
omair saleh 07d1bbd921 fix billing page 2022-03-02 02:24:54 +08:00
ahmedsophyudden 5eb24878f9 Create download api for booking document (invoice, purchase order, deliver order, supplier deliver order) 2022-02-27 23:09:12 +08:00
omair saleh 4ac7a1b004 wallet batch polishing 2022-02-06 23:55:28 +08:00
edmondlang c52621c405 Merge branch 'wallet-ui' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-up-with-api
# Conflicts:
#	resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
#	routes/web.php
2022-02-05 21:39:31 +08:00
edmondlang e3e4b490b0 Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-ui
# Conflicts:
#	resources/views/partials/header.blade.php
#	routes/web.php
2022-02-04 22:22:07 +08:00
omair saleh a9aabc781e fix regenerate invoice function 2022-01-12 04:15:32 +08:00
omair saleh 7f6b254d30 fix regenerate invoice function 2022-01-12 04:14:10 +08:00
omair saleh 85ba5f074e delete duplicated purchase orders on approval 2021-12-23 12:00:30 +08:00
omair saleh 5591790fc8 Merge remote-tracking branch 'origin/development' into development 2021-12-04 15:04:57 +08:00
omair saleh c7af5dd557 fix update booking amount bug 2021-12-04 15:04:52 +08:00
omair saleh 3227078e8d fix update booking amount bug 2021-12-04 15:04:38 +08:00
edmondlang 49b7bb8fc3 fix bug from testing - slide 7
change label 'this payment is made on behalf of'
to
'This payment is made for transfer ref. '.$booking->marking
2021-12-03 16:03:28 +08:00
edmondlang cd30329b0e fix bug from testing - slide 7
change label 'this payment is made on behalf of'
to
'This payment is made for transfer '.$booking->marking
2021-12-03 12:23:22 +08:00
omair saleh 8b914045fc performa invoice 2021-11-29 11:15:32 +08:00
omair saleh 83cd6db0e7 performa invoice 2021-11-29 11:14:11 +08:00
omair saleh cc5a593941 performa invoice 2021-11-29 11:10:14 +08:00
omair saleh ced88a20e5 performa invoice 2021-11-29 11:02:38 +08:00
omair saleh 6163afc862 performa invoice 2021-11-28 21:23:27 +08:00
edmondlang fb4d17b46f rename performa to proforma 2021-11-28 21:10:46 +08:00
edmondlang bcbb3f53f6 create proforma invoice transaction 2021-11-28 20:51:30 +08:00
edmondlang 2153774cde Merge branch 'change-booking-price' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2021-11-25 15:20:34 +08:00
omair saleh 49c4362ba1 fix payment gateway & add regenerate invoices button 2021-11-21 23:30:59 +08:00
omair saleh 419f3ca88b Merge branch 'regenerate-invoice' into 'development'
regenerate booking invoice

See merge request CIEFWorldwideSdnBhd/exchange-2.0!65
2021-11-19 05:52:54 +00:00
omair saleh 6b6ac591a0 Merge branch 'development' into 'wallet-ui'
# Conflicts:
#   app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
2021-11-19 05:20:18 +00:00
edmondlang 5f5b7cf119 wallet-ui
request refund
online-transfer (payment gateway)
2021-11-17 02:27:25 +08:00
ahmedsophyudden cdc9ef449b Refund API - Booking Resources' include refund data, prevent unlimited refund 2021-11-16 09:56:17 +08:00
ahmedsophyudden b4c1a2e333 Merge branch 'task/EXC-353' into development 2021-11-08 16:15:05 +08:00
ahmedsophyudden 39a8ac83b2 Merge branch 'online-payment-billplz-integration' into development 2021-11-08 09:43:09 +08:00
ahmedsophyudden f12f538884 Merge branch 'payment-refund' into development 2021-11-08 09:33:50 +08:00
edmondlang 87614bdcec tidy up change booking price 2021-11-05 12:24:00 +08:00
glovetleong c907903244 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into task/EXC-353
# Conflicts:
#	app/Models/Company.php
2021-10-25 21:43:55 +08:00
glovetleong 2ffefc03bb fix MorphMany transaction 2021-10-22 14:47:01 +08:00
glovetleong 30884201bd regenerate booking invoice 2021-10-19 21:51:47 +08:00
omair saleh 7def78eacf fix bug with balance payment by rounding up to 2 decimal 2021-10-11 16:33:59 +08:00
omair saleh f5d7da493c fix bug with balance payment by rounding up to 2 decimal 2021-10-11 16:33:21 +08:00
ahmedsophyudden 223caa2c33 integrate create billplz bill with create booking payment, and a new billplz callback url 2021-10-07 11:00:50 +08:00
ahmedsophyudden fb84e47d43 integrate create billplz bill with create booking payment, and a new billplz callback url 2021-10-04 15:09:36 +08:00
ahmedsophyudden fa4042ecff edit refund calculation to correct formulat 2021-09-08 23:41:56 +08:00
ahmedsophyudden 1c4669a857 add partial refund credit note flow 2021-09-06 09:21:56 +08:00
ahmedsophyudden 2b167b1950 add partial refund credit note flow 2021-09-05 22:52:33 +08:00
ahmedsophyudden 67a0a63b9b edit booking quotation calculation for partial refund request 2021-09-05 20:27:41 +08:00
ahmedsophyudden 579f6df6ba add booking quotation calculation for partial refund request 2021-09-05 12:15:32 +08:00
ahmedsophyudden 410c55e2bf Add credit note controller and logic 2021-08-29 20:52:43 +08:00
ahmedsophyudden 43530352ee Add credit note controller and logic 2021-08-28 11:40:04 +08:00