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

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)