Skip to content

Commit 04c2da4

Browse files
alexandrdrvnalexandrdrvn
committed
fix: fix bug
1 parent 8fd7d2a commit 04c2da4

File tree

14 files changed

+67
-54
lines changed

14 files changed

+67
-54
lines changed

‎controllers/admin/AdminVuefrontAjaxController.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function ajaxProcessVfTurnOff()
2727
)
2828
));
2929
}
30-
$content = file_get_contents(_PS_ROOT_DIR_ . '/modules/vuefront/.htaccess.txt');
30+
$content = Tools::file_get_contents(_PS_ROOT_DIR_ . '/modules/vuefront/.htaccess.txt');
3131
file_put_contents(_PS_ROOT_DIR_ . '/.htaccess', $content);
3232
unlink(_PS_ROOT_DIR_ . '/modules/vuefront/.htaccess.txt');
3333
}
@@ -46,7 +46,7 @@ public function ajaxProcessVfAppsRemove() {
4646
} catch(Exception $e) {
4747

4848
}
49-
unset($setting[$_POST['key']]);
49+
unset($setting[Tools::getValue('key')]);
5050
Configuration::updateValue('vuefront-apps', Tools::jsonEncode($setting), null,0,0);
5151
}
5252

@@ -65,8 +65,8 @@ public function ajaxProcessVfAppsCreate() {
6565
$d = new DateTime();
6666

6767
$setting[] = array(
68-
'codename' => $_POST['codename'],
69-
'jwt' => $_POST['jwt'],
68+
'codename' => Tools::getValue('codename'),
69+
'jwt' => Tools::getValue('jwt'),
7070
'dateAdded' => $d->format('Y-m-d\TH:i:s.u')
7171
);
7272

@@ -91,10 +91,10 @@ public function ajaxProcessVfAppsEdit()
9191
} catch(Exception $e) {
9292

9393
}
94-
$app = Tools::jsonDecode(html_entity_decode($_POST['app'], ENT_QUOTES, 'UTF-8'), true);
94+
$app = Tools::jsonDecode(html_entity_decode(Tools::getValue('app'), ENT_QUOTES, 'UTF-8'), true);
9595

9696
foreach ($app as $key => $value) {
97-
$setting[$_POST['key']][$key] = $value;
97+
$setting[Tools::getValue('key')][$key] = $value;
9898
}
9999

100100
Configuration::updateValue('vuefront-apps', Tools::jsonEncode($setting), null,0,0);
@@ -211,7 +211,7 @@ public function ajaxProcessVfTurnOn() {
211211
RewriteCond %{DOCUMENT_ROOT}".$document_path."vuefront/$1.html !-f
212212
RewriteRule ^([^?]*) vuefront/200.html [L,QSA]";
213213

214-
$content = file_get_contents(_PS_ROOT_DIR_ . '/.htaccess');
214+
$content = Tools::file_get_contents(_PS_ROOT_DIR_ . '/.htaccess');
215215

216216
file_put_contents(_PS_ROOT_DIR_ . '/modules/vuefront/.htaccess.txt', $content);
217217

@@ -237,7 +237,7 @@ public function ajaxProcessVfUpdate() {
237237
try {
238238
$tmpFile = tempnam(sys_get_temp_dir(), 'TMP_');
239239
rename($tmpFile, $tmpFile .= '.tar');
240-
file_put_contents($tmpFile, file_get_contents($_POST['url']));
240+
file_put_contents($tmpFile, Tools::file_get_contents($_POST['url']));
241241
$this->removeDir(_PS_ROOT_DIR_ . '/vuefront');
242242
$phar = new PharData($tmpFile);
243243
$phar->extractTo(_PS_ROOT_DIR_ . '/vuefront');
@@ -278,7 +278,7 @@ public function ajaxProcessVfSettings()
278278

279279
public function ajaxProcessVfSettingsEdit()
280280
{
281-
$vfSetting = Tools::jsonDecode(html_entity_decode($_POST['setting'], ENT_QUOTES, 'UTF-8'), true);
281+
$vfSetting = Tools::jsonDecode(html_entity_decode(Tools::getValue('setting'), ENT_QUOTES, 'UTF-8'), true);
282282

283283
Configuration::updateValue('vuefront-settings', Tools::jsonEncode($vfSetting), null,0,0);
284284

@@ -330,22 +330,22 @@ public function ajaxProcessVfInformation() {
330330
);
331331
}
332332

333-
public function ajaxProcessProxy()
334-
{
335-
$body = Tools::file_get_contents('php://input');;
336-
if (!function_exists('getallheaders')) {
337-
function getallheaders()
333+
public function getallheaders()
338334
{
339335
$headers = [];
340336
foreach ($_SERVER as $name => $value) {
341-
if (substr($name, 0, 5) == 'HTTP_') {
342-
$headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
337+
if (Tools::substr($name, 0, 5) == 'HTTP_') {
338+
$headers[str_replace(' ', '-', ucwords(Tools::strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
343339
}
344340
}
345341
return $headers;
346342
}
347-
}
348-
$headers = getallheaders();
343+
344+
public function ajaxProcessProxy()
345+
{
346+
$body = Tools::file_get_contents('php://input');;
347+
348+
$headers = $this->getallheaders();
349349

350350
$cHeaders = array('Content-Type: application/json');
351351

‎model/common/vuefront.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function pushEvent($name, $data)
108108
{
109109
$apps = $this->getAppsForEvent();
110110

111-
foreach ($apps as $key => $value) {
111+
foreach ($apps as $value) {
112112
$output = $this->request($value['eventUrl'], [
113113
'name' => $name,
114114
'data' => $data,

‎model/store/cart.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ public function prepareCart() {
1515
$sql->where('pac.`id_product_attribute` = ' . (int) $value['id_product_attribute']);
1616

1717
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
18-
foreach ($result as $key => $attribute) {
18+
foreach ($result as $attribute) {
1919
$attribute = new Attribute($attribute['id_attribute']);
2020

21-
$option_data[] = array(
21+
$options[] = array(
2222
'option_id' => $attribute->id_attribute_group,
2323
'option_value_id' => $attribute->id
2424
);

‎model/store/checkout.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function getJwt($codename) {
2626

2727
$result = false;
2828

29-
foreach ($setting as $key => $value) {
29+
foreach ($setting as $value) {
3030
if($value['codename'] == $codename) {
3131
$result = $value['jwt'];
3232
}

‎resolver/common/country.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,6 @@ public function getList($args)
5353
$results = $this->model_common_country->getCountries($filter_data);
5454
$country_total = $this->model_common_country->getTotalCountries($filter_data);
5555

56-
if (Configuration::get('PS_RESTRICT_DELIVERED_COUNTRIES')) {
57-
$availableCountries = Carrier::getDeliveredCountries($this->context->language->id, true, true);
58-
} else {
59-
$availableCountries = Country::getCountries($this->context->language->id, true);
60-
}
61-
6256
foreach ($results as $value) {
6357
$countries[] = $this->get(array( 'id' => $value['id_country'] ));
6458
}

‎resolver/common/page.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ public function get($args)
1717
{
1818
$this->load->model('common/page');
1919
$page_info = $this->model_common_page->getPage($args['id']);
20-
20+
$that = $this;
2121
return array(
2222
'id' => $page_info['id'],
2323
'name' => $page_info['title'],
2424
'title' => $page_info['title'],
2525
'description' => $page_info['description'],
2626
'sort_order' => (int) $page_info['sort_order'],
2727
'keyword' => $page_info['keyword'],
28-
'url' => function ($root, $args) {
29-
return $this->load->resolver('common/page/url', array(
28+
'url' => function ($root, $args) use ($that) {
29+
return $that->load->resolver('common/page/url', array(
3030
'parent' => $root,
3131
'args' => $args
3232
));

‎resolver/store/checkout.php‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ResolverStoreCheckout extends Resolver
2222
*/
2323
private $checkoutSession;
2424

25-
function __construct($registry)
25+
public function __construct($registry)
2626
{
2727
parent::__construct($registry);
2828
$deliveryOptionsFinder = new DeliveryOptionsFinder(
@@ -64,7 +64,7 @@ public function paymentMethods()
6464

6565
$methods = array();
6666

67-
foreach ($response['payments'] as $key => $value) {
67+
foreach ($response['payments'] as $value) {
6868
if ($value['status']) {
6969
$methods[] = array(
7070
'id' => $value['codename'],
@@ -473,7 +473,6 @@ public function confirmOrder($args)
473473

474474
if (empty($this->context->cart->getProducts())) {
475475
throw new Exception("Empty cart");
476-
return;
477476
}
478477

479478
$order = new Order();
@@ -519,7 +518,6 @@ public function confirmOrder($args)
519518
$order->round_mode = Configuration::get('PS_PRICE_ROUND_MODE');
520519
$order->round_type = Configuration::get('PS_ROUND_TYPE');
521520

522-
$order_total = $order->total_paid;
523521

524522
$result = $order->add();
525523

@@ -531,9 +529,6 @@ public function confirmOrder($args)
531529

532530
$order_detail->createList($order, $this->context->cart, Configuration::get('PS_OS_PREPARATION'), $order->product_list);
533531

534-
$order_list[] = $order;
535-
$order_detail_list[] = $order_detail;
536-
537532
$new_history = new OrderHistory();
538533
$new_history->id_order = (int) $order->id;
539534
$new_history->changeIdOrderState((int) Configuration::get('PS_OS_PREPARATION'), $order, true);
@@ -547,7 +542,7 @@ public function confirmOrder($args)
547542
}',
548543
array(
549544
'paymentMethod' => $paymentMethod['codename'],
550-
'total' => floatval($order->getOrdersTotalPaid()),
545+
'total' => (float)$order->getOrdersTotalPaid(),
551546
'customerId' => $order->id_customer,
552547
'customerEmail' => $customer->email,
553548
'callback' => Tools::getHttpHost(true) .
@@ -574,7 +569,7 @@ public function confirmOrder($args)
574569

575570
public function callback()
576571
{
577-
$order_id = $_GET['order_id'];
572+
$order_id = Tools::getValue('order_id');
578573
$rawInput = Tools::file_get_contents('php://input');
579574

580575
$input = json_decode($rawInput, true);

‎resolver/store/manufacturer.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,16 @@ public function get($args)
2424
return array();
2525
}
2626

27+
$that = $this;
28+
2729
return array(
2830
'id' => $manufacturer_info['id'],
2931
'name' => html_entity_decode($manufacturer_info['name'], ENT_QUOTES, 'UTF-8'),
3032
'image' => $manufacturer_info['image'],
3133
'imageLazy' => $manufacturer_info['imageLazy'],
3234
'imageBig' => $manufacturer_info['imageBig'],
33-
'url' => function($root, $args) {
34-
return $this->url(array(
35+
'url' => function($root, $args) use ($that) {
36+
return $that->url(array(
3537
'parent' => $root,
3638
'args' => $args
3739
));

‎resolver/store/option.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@ public function get($args)
6262
return array();
6363
}
6464

65-
65+
$that = $this;
6666
return array(
6767
'id' => $option_info['id_attribute_group'],
6868
'name' => html_entity_decode($option_info['name'], ENT_QUOTES, 'UTF-8'),
6969
'type' => $option_info['group_type'],
7070
'sort_order' => $option_info['position'],
71-
'values' => function($root, $args) {
72-
return $this->getValues(array(
71+
'values' => function($root, $args) use ($that) {
72+
return $that->getValues(array(
7373
'parent' => $root,
7474
'args' => $args
7575
));
@@ -84,7 +84,7 @@ public function getValues($data) {
8484

8585
$option_values = $this->model_store_option->getOptionValues($data['parent']['id']);
8686

87-
foreach ($option_values as $key => $value) {
87+
foreach ($option_values as $value) {
8888
$results[] = array(
8989
'id' => $value['id_attribute'],
9090
'name' => $value['name']

‎resolver/store/product.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ public function get($args)
7676
'stock' => $product->quantity > 0,
7777
'rating' => (float)0,
7878
'manufacturerId' => $product->id_manufacturer,
79-
'manufacturer' => function($root, $args) {
80-
return $this->manufacturer(array(
79+
'manufacturer' => function($root, $args) use ($that) {
80+
return $that->manufacturer(array(
8181
'parent' => $root,
8282
'args' => $args
8383
));
@@ -118,8 +118,8 @@ public function get($args)
118118
'args' => $args
119119
));
120120
},
121-
'url' => function($root, $args) {
122-
return $this->url(array(
121+
'url' => function($root, $args) use ($that) {
122+
return $that->url(array(
123123
'parent' => $root,
124124
'args' => $args
125125
));

0 commit comments

Comments
 (0)