Merge remote-tracking branch 'origin/Abshode_Khanegi' into Abshode_Khanegi
# Conflicts: # app/Http/Controllers/Site/ReportController.php
This commit is contained in:
@@ -183,10 +183,10 @@ class ReportController extends Controller
|
|||||||
// }
|
// }
|
||||||
$pr_product = Product::find($main_product_id);
|
$pr_product = Product::find($main_product_id);
|
||||||
|
|
||||||
try {
|
// try {
|
||||||
$taban_gohar = Http::timeout(2)->get('https://tabangohar.com/GheymatKhan/prices_in_table.html')->json();
|
// $taban_gohar = Http::timeout(2)->get('https://tabangohar.com/GheymatKhan/prices_in_table.html')->json();
|
||||||
$tgn = (int)$taban_gohar['c']*10;
|
// $tgn = (int)$taban_gohar['c']*10;
|
||||||
}catch (\Exception $e){$tgn = 0;}
|
// }catch (\Exception $e){$tgn = 0;}
|
||||||
|
|
||||||
if($this->Config('goldir_price') == 'true') {
|
if($this->Config('goldir_price') == 'true') {
|
||||||
$priceValue = (int)$goldir_price;
|
$priceValue = (int)$goldir_price;
|
||||||
@@ -227,13 +227,8 @@ class ReportController extends Controller
|
|||||||
'price_last' => $price->price + $difference,
|
'price_last' => $price->price + $difference,
|
||||||
'price' => $priceValue,
|
'price' => $priceValue,
|
||||||
'main_product' => $pr_product['price'] + $pr_product['price_profit'],
|
'main_product' => $pr_product['price'] + $pr_product['price_profit'],
|
||||||
'taban_gohar' => $tgn,
|
'taban_gohar' => $tgn ?? 0,
|
||||||
'goldir' => $goldir_price ?? 0,
|
'goldir' => $goldir_price ?? 0
|
||||||
// 'refpricer' => $ref
|
|
||||||
// 'tala_ir' => $tala_ir,
|
|
||||||
// 'henzagold' => $henzagold_18,
|
|
||||||
// 'Ounce' => $henzagold_ons_gold,
|
|
||||||
// 'milli' => $milli,
|
|
||||||
];
|
];
|
||||||
} else {
|
} else {
|
||||||
return [];
|
return [];
|
||||||
|
|||||||
Reference in New Issue
Block a user