diff --git a/CHANGELOG.md b/CHANGELOG.md index 6544d4d0..83f8a37d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,16 @@ # Changelog + +## 1.0.3-alpha - 2018-08-20 +- Added new feature - Rate is realtime now +- Updated active bank setting now with bank account with bank name +- Updated required field on bank setting (acc no, bank name, comp name) +- Removed "Please key in the data in Chinese" note at bank setting +- Fixed completed booking showing in normal booking table +- Fixed booking page not found +- Fixed refresh button for both normal and completed booking +- Temporary removed notification +- Working Progress Feature: Realtime notification, Cancel booking, Sort booking + ## 1.0.2-alpha - 2018-08-13 - Added completed booking tab feature - Removed login remember me checkbox diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index ec1c7ccb..ef35dd35 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -486,8 +486,8 @@ class BookingController extends Controller if ($amount >= 10000 && ($term == 'x2_cash' || $term == 'x2_cheque' || $term == 'x2_ba')) { $svcharge = 0; } else { - //$svcharge = 20.00; - $svcharge = 0; // UPDATE ON : 15-8-2018 from PM + $svcharge = 20.00; + //$svcharge = 0; // UPDATE ON : 15-8-2018 from PM } $subtotal = round(($amount + $svcharge) / $rate, 2); @@ -807,8 +807,8 @@ class BookingController extends Controller if ($amount >= 10000 && ($term == 'x2_cash' || $term == 'x2_cheque' || $term == 'x2_ba')) { $svcharge = 0; } else { - //$svcharge = 20.00; - $svcharge = 0; // UPDATE ON : 15-8-2018 from PM + $svcharge = 20.00; + //$svcharge = 0; // UPDATE ON : 15-8-2018 from PM } $subtotal = round(($amount + $svcharge) / $rate,2);