omair/exchange
1
0
Fork 0
mirror of https://gitlab.com/omair-personal/exchange.git synced 2026-08-19 04:24:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing totals to include service charge for x2 payments

Browse Source
This commit is contained in:
Omair Saleh
2019-04-19 15:33:56 +08:00
parent dbdf1d07cc
commit dc9287490d
3 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BookingController.php
+7 -24
View File
@@ -51,8 +51,6 @@ class BookingController extends Controller
$booking->track_status = "(". $booking->status ."/5)";
if ($booking->amount < 10000){
$booking->service_charge = 20;
$booking->amount += 20;
$booking->bia = number_format((float)$booking->bia + ($booking->service_charge/$booking->rate), 2, '.', '');
}
}
@@ -114,10 +112,8 @@ class BookingController extends Controller
$booking->service_charge = 0;
if ($booking->term === "x2_cash" || $booking->term === "x2_cheque" || $booking->term === "x2_ba"){
$booking->track_status = "(". $booking->status ."/5)";
if ($booking->amount < 10000){
if ($booking->amount < 10000) {
$booking->service_charge = 20;
$booking->amount += 20;
$booking->bia = number_format((float)$booking->bia + ($booking->service_charge/$booking->rate), 2, '.', '');
}
}
@@ -151,10 +147,8 @@ class BookingController extends Controller
$booking->service_charge = 0;
if ($booking->term === "x2_cash" || $booking->term === "x2_cheque" || $booking->term === "x2_ba"){
$booking->track_status = "(". $booking->admin_status ."/6)";
if ($booking->amount < 10000){
if ($booking->amount < 10000) {
$booking->service_charge = 20;
$booking->amount += 20;
$booking->bia = number_format((float)$booking->bia + ($booking->service_charge/$booking->rate), 2, '.', '');
}
}
else{
@@ -224,10 +218,8 @@ class BookingController extends Controller
$booking->service_charge = 0;
if ($booking->term === "x2_cash" || $booking->term === "x2_cheque" || $booking->term === "x2_ba"){
$booking->track_status = "(". $booking->admin_status ."/6)";
if ($booking->amount < 10000){
if ($booking->amount < 10000) {
$booking->service_charge = 20;
$booking->amount += 20;
$booking->bia = number_format((float)$booking->bia + ($booking->service_charge/$booking->rate), 2, '.', '');
}
}
else{
@@ -286,7 +278,6 @@ class BookingController extends Controller
if($booking){
if ($booking->amount < 10000 && ($booking->term == 'x2_cash' || $booking->term == 'x2_cheque' || $booking->term == 'x2_ba')) {
$booking->service_charge = 20;
$booking->bia = number_format((float)$booking->bia + ($booking->service_charge/$booking->rate), 2, '.', '');
}
}
@@ -347,12 +338,10 @@ class BookingController extends Controller
$booking->invoice_path = Storage::url($invoice->invoice_path);
}
$booking->service_charge = 0;
if($booking){
if ($booking->amount < 10000 && ($booking->term == 'x2_cash' || $booking->term == 'x2_cheque' || $booking->term == 'x2_ba')) {
$booking->service_charge = 20;
$booking->bia = number_format((float)$booking->bia + ($booking->service_charge/$booking->rate), 2, '.', '');
}
}
@@ -418,13 +407,10 @@ class BookingController extends Controller
], 422);
break;
}
$svcharge = 0;
// Service charge (RMB) : if amount higher than 10,000 or term x2 no service charge.
if ($amount >= 10000 && ($term == 'x2_cash' || $term == 'x2_cheque' || $term == 'x2_ba')) {
$svcharge = 0;
} else {
if ($amount < 10000 && ($term == 'x2_cash' || $term == 'x2_cheque' || $term == 'x2_ba')) {
$svcharge = 20;
//$svcharge = 0; // UPDATE ON : 15-8-2018 from PM
}
$subtotal = round(($amount + $svcharge) / $rate, 2);
@@ -761,12 +747,9 @@ class BookingController extends Controller
], 422);
break;
}
if ($amount >= 10000 && ($term == 'x2_cash' || $term == 'x2_cheque' || $term == 'x2_ba')) {
$svcharge = 0;
} else {
$svcharge = 0;
if ($amount < 10000 && ($term === 'x2_cash' || $term === 'x2_cheque' || $term === 'x2_ba')) {
$svcharge = 20;
//$svcharge = 0; // UPDATE ON : 15-8-2018 from PM
}
$subtotal = round(($amount + $svcharge) / $rate,2);
resources/assets/js/pages/admin/home.vue
+1 -1
View File
@@ -316,7 +316,7 @@ export default {
BookingStatus (status, booking_id, term) {
// TODO : Get booking status from server
this.status = status
switch (this.status) {
switch (Number(status)) {
case 1:
this.$router.push({
name: 'booking.admin.booking.detail',
resources/assets/js/pages/home.vue
+1 -1
View File
@@ -784,7 +784,7 @@ export default {
BookingStatus (status, booking_id, term) {
// TODO : Get booking status from server
// this.status = status;
switch (status) {
switch (Number(status)) {
case 1:
this.$router.push({
name: 'booking.user.upload',