webmaster/crewsportswear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 11_4_2019

Browse Source
This commit is contained in:
Frank John Begornia
2019-11-04 17:21:09 +08:00
parent 2680ddc5bd
commit eef4d27944
10 changed files with 58 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/designer/DesignerController.php
View File

@@ -252,7 +252,12 @@ class DesignerController extends Controller {
$templateCode = $post['templateCode'];
$default_template_color_array = $newDesignerModel->selectDefaultTemplateColor($templateCode);
echo json_encode($default_template_color_array);
// var_dump($default_template_color_array);
return response()->json(array(
'success' => true,
'default_template_color_array' => $default_template_color_array
));
}

2
app/Http/Controllers/paypal/PaypalController.php
View File

@@ -114,7 +114,7 @@ class PaypalController extends Controller {
// $tax_value = 0.10;
if($grouped_item[0]->StoreId == 76){
if($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78){
$tax_value = 0;
}else{
$tax_value = 0.10;

4
app/Http/Controllers/user/UserController.php
View File

@@ -958,14 +958,14 @@ class UserController extends Controller {
function showStoreOrderDetails(Request $request){
$post = $request->all();
$post = $request->all();
// var_dump($post['pid']);
$UserModel = new UserModel;
$array_payment_details = $UserModel->selectPaymentDetails('CartKey', $post['ck']);
$array_shipping_add = $UserModel->selectShippingAddress('PaymentDetail_Id', $array_payment_details[0]->Id);
$array_thumbnail_display = $UserModel->selectDisplayItemThumbById($post['pid']);
$array_item = $UserModel->selectOrder('Id', $post['id']);
$handle_order_detail_body = view('user-layouts.order-details-body')
->with('array_payment_details', $array_payment_details)
->with('array_shipping_add', $array_shipping_add)

5
app/Models/designer/DesignerModel.php
View File

@@ -42,9 +42,8 @@ class DesignerModel extends Model {
$pdo = DB::connection()->getPdo();
$query = $pdo->prepare("SELECT NULL AS RGBIndex, RGBColor AS default_Color, DisplayName FROM template_body_colors WHERE TemplateCode = '$templateCode' UNION SELECT TrimNumber, RGBColor AS default_Color, DisplayName FROM template_trim_colors WHERE TemplateCode = '$templateCode'");
$query->execute();//$query->execute(array($bindings ));
// $row=$query->fetch(\PDO::FETCH_OBJ);
$query->execute();
while($row=$query->fetch(\PDO::FETCH_OBJ)) {
if($row->RGBIndex == NULL){
$IndexName = "default_mainColor";

2
app/Models/user/UserModel.php
View File

@@ -161,7 +161,7 @@ class UserModel extends Model {
}
function selectStoreOrders($store_id){
$i = DB::table('orders')->select('orders.*', 'payment_details.InvoiceNumber', 'payment_details.Currency', 'payment_details.Payer_Email', 'payment_details.Payer_Firstname', 'payment_details.Payer_Lastname', 'shipping_addresses.*')
$i = DB::table('orders')->select('orders.*', 'orders.Id as Order_Id', 'payment_details.InvoiceNumber', 'payment_details.Currency', 'payment_details.Payer_Email', 'payment_details.Payer_Firstname', 'payment_details.Payer_Lastname', 'shipping_addresses.*')
->leftjoin('payment_details', 'payment_details.CartKey','=','orders.CartKey')
->leftjoin('shipping_addresses', 'shipping_addresses.PaymentDetail_Id','=','payment_details.Id')
->where('orders.StoreId', $store_id)