ramster cath / new_xado

Go to a project
Toggle navigation Toggle navigation pinning
Рамиз Мирзаев
e6e42e02 1 parent 6910c7d9

Init commit

Inline Side-by-side
Showing 11 changed files with 9 additions and 12 deletions
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 "braintree/braintree_php" : "3.40.0", 12 "braintree/braintree_php" : "3.40.0",
13 "cardinity/cardinity-sdk-php": "^v2.0", 13 "cardinity/cardinity-sdk-php": "^v2.0",
14 "divido/divido-php": ">=1.15", 14 "divido/divido-php": ">=1.15",
15 - "php": ">=7.3.0", 15 + "php": ">=8.3.7",
16 "scssphp/scssphp": "^1.13.0", 16 "scssphp/scssphp": "^1.13.0",
17 "zoujingli/wechat-developer": "^1.2", 17 "zoujingli/wechat-developer": "^1.2",
18 "twig/twig": "^3.3", 18 "twig/twig": "^3.3",
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 - "content-hash": "bebfab293209d0467e1fa76ace0e7a9e", 7 + "content-hash": "066d509665b741afda5f6b797e6e0422",
8 "packages": [ 8 "packages": [
9 { 9 {
10 "name": "braintree/braintree_php", 10 "name": "braintree/braintree_php",
...@@ -1681,7 +1681,7 @@ ...@@ -1681,7 +1681,7 @@
1681 "prefer-stable": false, 1681 "prefer-stable": false,
1682 "prefer-lowest": false, 1682 "prefer-lowest": false,
1683 "platform": { 1683 "platform": {
1684 - "php": ">=7.3.0" 1684 + "php": ">=8.3.7"
1685 }, 1685 },
1686 "platform-dev": [], 1686 "platform-dev": [],
1687 "plugin-api-version": "2.6.0" 1687 "plugin-api-version": "2.6.0"
......
1 -"2"
...\ No newline at end of file ...\ No newline at end of file
1 -"2"
...\ No newline at end of file ...\ No newline at end of file
1 -"1"
...\ No newline at end of file ...\ No newline at end of file
1 -[]
...\ No newline at end of file ...\ No newline at end of file
This diff could not be displayed because it is too large.
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 'name' => 'opencart/opencart', 3 'name' => 'opencart/opencart',
4 'pretty_version' => 'dev-master', 4 'pretty_version' => 'dev-master',
5 'version' => 'dev-master', 5 'version' => 'dev-master',
6 - 'reference' => '996087ba419c80d45c04e7d931ff9efb9997e37e', 6 + 'reference' => '6910c7d907054a6d8fbb80c010c6ae70e68ee1ec',
7 'type' => 'project', 7 'type' => 'project',
8 'install_path' => __DIR__ . '/../../../', 8 'install_path' => __DIR__ . '/../../../',
9 'aliases' => array(), 9 'aliases' => array(),
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
76 'opencart/opencart' => array( 76 'opencart/opencart' => array(
77 'pretty_version' => 'dev-master', 77 'pretty_version' => 'dev-master',
78 'version' => 'dev-master', 78 'version' => 'dev-master',
79 - 'reference' => '996087ba419c80d45c04e7d931ff9efb9997e37e', 79 + 'reference' => '6910c7d907054a6d8fbb80c010c6ae70e68ee1ec',
80 'type' => 'project', 80 'type' => 'project',
81 'install_path' => __DIR__ . '/../../../', 81 'install_path' => __DIR__ . '/../../../',
82 'aliases' => array(), 82 'aliases' => array(),
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
4 4
5 $issues = array(); 5 $issues = array();
6 6
7 -if (!(PHP_VERSION_ID >= 80100)) { 7 +if (!(PHP_VERSION_ID >= 80307)) {
8 - $issues[] = 'Your Composer dependencies require a PHP version ">= 8.1.0". You are running ' . PHP_VERSION . '.'; 8 + $issues[] = 'Your Composer dependencies require a PHP version ">= 8.3.7". You are running ' . PHP_VERSION . '.';
9 } 9 }
10 10
11 if ($issues) { 11 if ($issues) {
......
...@@ -113,7 +113,7 @@ class ControllerExtensionDashboardSale extends Controller { ...@@ -113,7 +113,7 @@ class ControllerExtensionDashboardSale extends Controller {
113 } elseif ($sale_total > 1000) { 113 } elseif ($sale_total > 1000) {
114 $data['total'] = round($sale_total / 1000, 1) . 'K'; 114 $data['total'] = round($sale_total / 1000, 1) . 'K';
115 } else { 115 } else {
116 - $data['total'] = round($sale_total); 116 + $data['total'] = round(($sale_total === null) ? 0 : $sale_total);
117 } 117 }
118 118
119 $data['sale'] = $this->url->link('sale/order', 'user_token=' . $this->session->data['user_token'], true); 119 $data['sale'] = $this->url->link('sale/order', 'user_token=' . $this->session->data['user_token'], true);
......
1 <?php 1 <?php
2 class ControllerStartupSass extends Controller { 2 class ControllerStartupSass extends Controller {
3 public function index() { 3 public function index() {
4 + return false;
4 $files = glob(DIR_APPLICATION . 'view/stylesheet/*.scss'); 5 $files = glob(DIR_APPLICATION . 'view/stylesheet/*.scss');
5 6
6 if ($files) { 7 if ($files) {
......