cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-23 06:14:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug

Browse Source 
# Conflicts:
#	resources/assets/js/components/LocaleDropdown.vue
#	resources/assets/js/pages/home.vue
This commit is contained in:
Jack Goh
2018-07-22 15:39:35 +08:00
parent 5772a3c540 51e4072a00
commit 7229d71109
38 changed files with 1797 additions and 829 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BookingController.php
+58 -41
View File
@@ -11,6 +11,8 @@ use App\UserBankSlip;
use App\User;
use App\Invoice;
use App\SettingCredit;
use App\SettingTaxRate;
use App\SettingBillingCharge;
use Auth;
use Validator;
use DateTime;
@@ -149,7 +151,7 @@ class BookingController extends Controller
$booking = Booking::where('user_id',Auth::user()->id)->where('id', $id)->first();
$user_bankslip = $booking->userBankSlip()->first();
$china_bankslip = $booking->chinaBankSlip()->first();
$china_bankslip = $booking->chinaBankSlip()->get();
$po = $booking->purchaseOrder()->first();
$invoice = $booking->invoice()->first();
@@ -164,7 +166,10 @@ class BookingController extends Controller
}
if($china_bankslip){
$booking->china_bankslip_path = Storage::url($china_bankslip->china_bank_slip_path);
for($index = 0;$index < $booking->chinaBankSlip()->count();$index++){
$china_bankslip[$index] = Storage::url($china_bankslip[$index]->china_bank_slip_path);
}
$booking->china_bankslip_path = $china_bankslip;
}
if($po){
@@ -197,12 +202,11 @@ class BookingController extends Controller
$user_bankslip = $booking->userBankSlip()->first();
$china_bankslip = $booking->chinaBankSlip()->first();
$china_bankslip = $booking->chinaBankSlip()->get();
$po = $booking->purchaseOrder()->first();
$invoice = $booking->invoice()->first();
if($booking){
if ($user_bankslip){
$booking->user_bankslip_path = Storage::url($user_bankslip->bankslip_path);
$booking->reject_reason = $user_bankslip->reject_reason;
@@ -210,7 +214,10 @@ class BookingController extends Controller
}
if($china_bankslip){
$booking->china_bankslip_path = Storage::url($china_bankslip->china_bank_slip_path);
for($index = 0;$index < $booking->chinaBankSlip()->count();$index++){
$china_bankslip[$index] = Storage::url($china_bankslip[$index]->china_bank_slip_path);
}
$booking->china_bankslip_path = $china_bankslip;
}
if($po){
@@ -372,16 +379,16 @@ class BookingController extends Controller
/* Validation*/
if (!$booking)
{
return response()->json(['message'=>'Access denied'], 200);
return response()->json(['message'=>'Access denied'], 403);
}
$validator = Validator::make($request->all(), [
'file' => 'image|mimes:jpg,jpeg,bmp,png'
'file' => 'mimes:jpg,jpeg,bmp,png,xls,xlsx,doc,docx,pdf'
]);
if($validator->fails())
{
return response()->json(['message'=>'Incorrect format'],200);
return response()->json(['message'=>'Incorrect format'],400);
}
$validator = Validator::make($request->all(), [
@@ -452,16 +459,16 @@ class BookingController extends Controller
/* Validation */
if (!$booking)
{
return response()->json(['message'=>'Access denied'], 200);
return response()->json(['message'=>'Access denied'], 403);
}
$validator = Validator::make($request->all(), [
'file' => 'image|mimes:jpg,jpeg,bmp,png'
'file' => 'mimes:jpg,jpeg,bmp,png,xls,xlsx,doc,docx,pdf'
]);
if($validator->fails())
{
return response()->json(['message'=>'Incorrect format'],200);
return response()->json(['message'=>'Incorrect format'],400);
}
$validator = Validator::make($request->all(), [
@@ -470,12 +477,12 @@ class BookingController extends Controller
if($validator->fails())
{
return response()->json(['message'=>'Image too large, upload files up to 3 MB'], 400);
return response()->json(['message'=>'File too large, upload files up to 3 MB'], 400);
}
if(!$user_input_file = $request->file('file'))
{
return response()->json(['message' => 'No file detected'], 400);
return response()->json(['message' => 'No file detected'], 404);
}
/* End Validation */
@@ -495,7 +502,8 @@ class BookingController extends Controller
$user_po->save();
$booking->status = 6;
$booking->admin_status = 7;
// $booking->admin_status = 7;
$booking->admin_status = 6;
$booking->save();
return response()->json(['message'=>'Success'],200);
@@ -523,7 +531,7 @@ class BookingController extends Controller
{
if (!$booking = Booking::where('user_id',Auth::user()->id)->where('id',$book_id)->first())
{
return response()->json(['message'=>'Access denied'], 200);
return response()->json(['message'=>'Access denied'],403);
}
$booking->is_cancel = true;
@@ -539,6 +547,8 @@ class BookingController extends Controller
$china_beneficiary = $request->input('china_beneficiary');
$rates = Rate::orderby('updated_at','desc')->first();
$marking = $user = Auth::user()->marking;
$taxrate = SettingTaxRate::latest()->first()->tax_rate;
$billingChargeRate = SettingBillingCharge::latest()->first()->billing_charge_rate;
$creditLimit = SettingCredit::orderby('updated_at','desc')->first();
@@ -589,18 +599,24 @@ class BookingController extends Controller
} else {
$svcharge = 20.00;
}
$bankin_amount = round(($amount + $svcharge) / $rate + (0 * ($amount + $svcharge)), 2);
$subtotal = round($amount + $svcharge / $rate,2);
$taxAmount = round($subtotal * $taxrate,2);
$billingChargeAmount = round(($amount + $svcharge) * $billingChargeRate, 2);
$bankin_amount = round($subtotal + $taxAmount + $billingChargeAmount , 2);
return response()->json([
'date' => date('Y-m-d'),
'marking' => $marking,
'amount' => $amount,
'payment_method' => $payment_method,
'china_beneficary' => $china_beneficiary,
'amount' => $amount,
'service_charge' => $svcharge,
'rate' => $rate,
'subtotal' => $subtotal,
'taxAmount' => $taxAmount,
'billingChargeAmount' => $billingChargeAmount,
'bankin_amount' => $bankin_amount,
'china_beneficary' => $china_beneficiary
], 200);
}
@@ -645,12 +661,12 @@ class BookingController extends Controller
$booking = Booking::where('id',$book_id)->first();
if (!$booking)
{
return response()->json(['message'=>'Access denied'], 200);
return response()->json(['message'=>'Access denied'], 403);
}
if(!$userBankSlip = UserBankSlip::where('booking_id',$booking->id)->first())
{
return response()->json(['message'=>'Access denied'], 200);
return response()->json(['message'=>'Access denied'], 403);
}
// approved bankslip cannot be reject again
@@ -678,16 +694,16 @@ class BookingController extends Controller
/* Validation */
if (!$booking)
{
return response()->json(['message'=>'Access denied'], 200);
return response()->json(['message'=>'Access denied'], 403);
}
$validator = Validator::make($request->all(), [
'invoice_path' => 'mimes:jpg,jpeg,bmp,png,pdf,doc,docx'
'invoice_path' => 'mimes:jpg,jpeg,bmp,png,xls,xlsx,doc,docx,pdf'
]);
if($validator->fails())
{
return response()->json(['message'=>'Incorrect format'],200);
return response()->json(['message'=>'Incorrect format'],400);
}
$validator = Validator::make($request->all(), [
@@ -739,6 +755,7 @@ class BookingController extends Controller
$booking = Booking::where('user_id',Auth::user()->id)->where('id',$id)->first();
$purchase_order = $booking->purchaseOrder()->first();
return($purchase_order);
if(!$purchase_order){
return response()->json(["message"=> "Please upload your purchase order"],400);
@@ -768,23 +785,23 @@ class BookingController extends Controller
}
}
public function adminShowCompletedOrders()
{
$bookings = Booking::select('id','created_at','user_id','rate','amount', 'bia', 'admin_status')
->where('admin_status', 7)
->orderBy('id', 'desc')
->get();
// public function adminShowCompletedOrders()
// {
// $bookings = Booking::select('id','created_at','user_id','rate','amount', 'bia', 'admin_status')
// ->where('admin_status', 7)
// ->orderBy('id', 'desc')
// ->get();
foreach ($bookings as $booking) {
$booking->id;
$booking->created_at;
$booking->marking = $booking->user->marking;
$booking->rate;
$booking->amount;
$booking->bia;
$booking->admin_status = "(". $booking->admin_status ."/7)";;
}
return $bookings;
}
// foreach ($bookings as $booking) {
// $booking->id;
// $booking->created_at;
// $booking->marking = $booking->user->marking;
// $booking->rate;
// $booking->amount;
// $booking->bia;
// $booking->admin_status = "(". $booking->admin_status ."/7)";;
// }
// return $bookings;
// }
}