Skip to content

F
fazo
Commit 37acfe61 authored by Khumoyunmirzo Sodiqov's avatar Khumoyunmirzo Sodiqov
Browse files
Options

fix

parent 97475a79
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 26 deletions
app/Http/Controllers/OrderController.php
View file @ 37acfe61
...@@ -78,7 +78,7 @@ class OrderController extends Controller ...@@ -78,7 +78,7 @@ class OrderController extends Controller
DB::raw('(SELECT color_class FROM status WHERE id=orders.status_id) as status_class'), DB::raw('(SELECT color_class FROM status WHERE id=orders.status_id) as status_class'),
DB::raw('(SELECT concat(firstname,\' \',secondname,\' \',fathername) FROM address_info WHERE id=orders.to_address_id) as recipient'), DB::raw('(SELECT concat(firstname,\' \',secondname,\' \',fathername) FROM address_info WHERE id=orders.to_address_id) as recipient'),
DB::raw('(SELECT concat(country,\' \',city,\' \',street,\' \',house,\' \',apartment,\' \',zip) FROM address_info WHERE id=orders.to_address_id) as recipient_address'), DB::raw('(SELECT concat(country,\' \',city,\' \',street,\' \',house,\' \',apartment,\' \',zip) FROM address_info WHERE id=orders.to_address_id) as recipient_address'),
])->get(); ])->where('client_id', '=', $id)->get();
} else { } else {
...@@ -119,7 +119,10 @@ class OrderController extends Controller ...@@ -119,7 +119,10 @@ class OrderController extends Controller
DB::raw('(SELECT color_class FROM status WHERE id=orders.status_id) as status_class'), DB::raw('(SELECT color_class FROM status WHERE id=orders.status_id) as status_class'),
DB::raw('(SELECT concat(firstname,\' \',secondname,\' \',fathername) FROM address_info WHERE id=orders.to_address_id) as recipient'), DB::raw('(SELECT concat(firstname,\' \',secondname,\' \',fathername) FROM address_info WHERE id=orders.to_address_id) as recipient'),
DB::raw('(SELECT concat(country,\' \',city,\' \',street,\' \',house,\' \',apartment,\' \',zip) FROM address_info WHERE id=orders.to_address_id) as recipient_address'), DB::raw('(SELECT concat(country,\' \',city,\' \',street,\' \',house,\' \',apartment,\' \',zip) FROM address_info WHERE id=orders.to_address_id) as recipient_address'),
])->where('status_id', '=', $status_id)->get(); ])->where([
['client_id', '=', $id],
['status_id', '=', $status_id]
])->get();
} }
$statuses = DB::select('SELECT s.id, s.sort, s.title, s.color_class, (SELECT count(*) FROM orders where status_id=s.id) as count FROM status s'); $statuses = DB::select('SELECT s.id, s.sort, s.title, s.color_class, (SELECT count(*) FROM orders where status_id=s.id) as count FROM status s');
...@@ -222,7 +225,7 @@ class OrderController extends Controller ...@@ -222,7 +225,7 @@ class OrderController extends Controller
'summa' => ($request->get('weight') * 8) + $serSum, 'summa' => ($request->get('weight') * 8) + $serSum,
'weight' => $request->get('weight'), 'weight' => $request->get('weight'),
'total' => $price, 'total' => $price,
'track_number' => '98'.$this->generateUniqNumber(4), 'track_number' => '98' . $this->generateUniqNumber(4),
'is_site' => $request->get('is_site'), 'is_site' => $request->get('is_site'),
'is_payment_uzb' => 0, 'is_payment_uzb' => 0,
'from_address' => $request->get('from_address'), 'from_address' => $request->get('from_address'),
......
composer.lock
View file @ 37acfe61
...@@ -504,27 +504,28 @@ ...@@ -504,27 +504,28 @@
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "6.3.3", "version": "6.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba" "reference": "0895c932405407fd3a7368b6910c09a24d26db11"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11",
"reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba", "reference": "0895c932405407fd3a7368b6910c09a24d26db11",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.0", "guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "^1.4", "guzzlehttp/psr7": "^1.6.1",
"php": ">=5.5" "php": ">=5.5"
}, },
"require-dev": { "require-dev": {
"ext-curl": "*", "ext-curl": "*",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
"psr/log": "^1.0" "psr/log": "^1.1"
}, },
"suggest": { "suggest": {
"psr/log": "Required for using the Log middleware" "psr/log": "Required for using the Log middleware"
...@@ -536,12 +537,12 @@ ...@@ -536,12 +537,12 @@
} }
}, },
"autoload": { "autoload": {
"files": [
"src/functions_include.php"
],
"psr-4": { "psr-4": {
"GuzzleHttp\\": "src/" "GuzzleHttp\\": "src/"
} },
"files": [
"src/functions_include.php"
]
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
...@@ -565,7 +566,7 @@ ...@@ -565,7 +566,7 @@
"rest", "rest",
"web service" "web service"
], ],
"time": "2018-04-22T15:46:56+00:00" "time": "2019-10-23T15:58:00+00:00"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
...@@ -1918,16 +1919,16 @@ ...@@ -1918,16 +1919,16 @@
}, },
{ {
"name": "psr/log", "name": "psr/log",
"version": "1.1.0", "version": "1.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-fig/log.git", "url": "https://github.com/php-fig/log.git",
"reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", "url": "https://api.github.com/repos/php-fig/log/zipball/bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2",
"reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1936,7 +1937,7 @@ ...@@ -1936,7 +1937,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0.x-dev" "dev-master": "1.1.x-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -1961,7 +1962,7 @@ ...@@ -1961,7 +1962,7 @@
"psr", "psr",
"psr-3" "psr-3"
], ],
"time": "2018-11-20T15:27:04+00:00" "time": "2019-10-25T08:06:51+00:00"
}, },
{ {
"name": "psr/simple-cache", "name": "psr/simple-cache",
...@@ -3626,21 +3627,23 @@ ...@@ -3626,21 +3627,23 @@
}, },
{ {
"name": "tijsverkoyen/css-to-inline-styles", "name": "tijsverkoyen/css-to-inline-styles",
"version": "2.2.1", "version": "2.2.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
"reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757" "reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757", "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/dda2ee426acd6d801d5b7fd1001cde9b5f790e15",
"reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757", "reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-dom": "*",
"ext-libxml": "*",
"php": "^5.5 || ^7.0", "php": "^5.5 || ^7.0",
"symfony/css-selector": "^2.7 || ^3.0 || ^4.0" "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
...@@ -3669,7 +3672,7 @@ ...@@ -3669,7 +3672,7 @@
], ],
"description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
"time": "2017-11-27T11:13:29+00:00" "time": "2019-10-24T08:53:34+00:00"
}, },
{ {
"name": "vlucas/phpdotenv", "name": "vlucas/phpdotenv",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment