updated apis
This commit is contained in:
@@ -81,6 +81,8 @@ class ApiController extends Controller
|
||||
{
|
||||
$ApiModel = new ApiModel;
|
||||
$invoice = Input::get('invoice');
|
||||
$getStep = Input::get('step');
|
||||
|
||||
|
||||
// $response = $ApiModel->getTrackingStatus($invoice);
|
||||
$selectPaymentDetails = $ApiModel->selectPaymentDetails($invoice);
|
||||
@@ -91,9 +93,12 @@ class ApiController extends Controller
|
||||
$selectOrderList = $ApiModel->selectOrderList($selectPaymentDetails[0]->CartKey);
|
||||
$getCurrentTrackingSteps = $ApiModel->getCurrentTrackingSteps($invoice);
|
||||
$selectPaymentDetails[0]->tracking_steps = $getCurrentTrackingSteps;
|
||||
|
||||
$currentStep = $ApiModel->selectCurrentStep($invoice);
|
||||
$selectPaymentDetails[0]->current_step = $currentStep;
|
||||
|
||||
$stp = ($getStep != "") ? $getStep : $currentStep->Order; // check if step
|
||||
foreach ($selectOrderList as $k => $order) {
|
||||
$table_fields[] = $ApiModel->selectOrderListTableFields($order->CartKey, $order->ProductId);
|
||||
$table_fields[] = $ApiModel->selectOrderListTableFields($order->CartKey, $order->ProductId, $stp);
|
||||
$product_images[] = $ApiModel->selectProductImages($order->ProductId);
|
||||
|
||||
$selectOrderList[$k]->table_fields = $table_fields[$k];
|
||||
@@ -127,5 +132,18 @@ class ApiController extends Controller
|
||||
], 200);
|
||||
}
|
||||
|
||||
|
||||
public function getSteps(){
|
||||
$ApiModel = new ApiModel;
|
||||
$selectSteps = $ApiModel->selectSteps();
|
||||
|
||||
if (!$selectSteps) {
|
||||
return response()->json(['status' => false, 'data' => ""], 404);
|
||||
}
|
||||
|
||||
return response()->json([
|
||||
'status' => true,
|
||||
'data' => $selectSteps
|
||||
], 200);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -71,6 +71,13 @@ class PaypalController extends Controller
|
||||
return Redirect::back();
|
||||
}
|
||||
|
||||
// $request->session()->forget('cartkey');
|
||||
if(!$request->session()->has('cartkey')){
|
||||
$message = 'Your cart is empty';
|
||||
Session::flash('cartkeyError', $message);
|
||||
return Redirect::back();
|
||||
}
|
||||
|
||||
$payer = PayPal::Payer();
|
||||
$payer->setPaymentMethod('paypal');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user