Skip to content

F
fazo
Commit b686777e authored by Shahzod's avatar Shahzod
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 5f11b416 808a3ad2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 313 additions and 282 deletions
app/Http/Controllers/DeliverySytemsController.php
View file @ b686777e
...@@ -74,24 +74,24 @@ class DeliverySytemsController extends Controller ...@@ -74,24 +74,24 @@ class DeliverySytemsController extends Controller
if ($order == null) { if ($order == null) {
return response()->json(['warning' => 'Order not found'], 200); return response()->json(['warning' => 'Order not found'], 200);
} elseif ($order['label_url'] == null) { } elseif ($order['label_url'] == null) {
$street = $sender[0]->street; //'test str'; $street = $sender[0]->street; //'97 Quentin Rd, 1st Floor';
$city = $sender[0]->city_name; // 'Unit C1 Brooklyn'; $city = $sender[0]->city_name; // 'Brooklyn';
$stateOrProvinceCode = $sender[0]->city_name; // 'NY'; $stateOrProvinceCode = $sender[0]->city_name; // 'NY';
$postalCode = $sender[0]->zip; // '11229'; $postalCode = $sender[0]->zip; // '11223';
$countryCode = 'US'; //'US'; $countryCode = 'US'; //'US';
$weight = ($order['weight'] > 0) ? $order['weight'] : 1; // 10; $weight = ($order['weight'] > 0) ? $order['weight'] : 1; // 20;
$userCredential = new WebAuthenticationCredential(); $userCredential = new WebAuthenticationCredential();
$userCredential $userCredential
->setKey('dXw7hhDl5lS6mwqs') ->setKey('WZmcVJM6rADSDHRA')
->setPassword('DDOWpwxnnmPsUxWNSM8gXLIdD'); ->setPassword('RFdr6uqXNvFpZVvwtoEaGLuRG');
$webAuthenticationDetail = new WebAuthenticationDetail(); $webAuthenticationDetail = new WebAuthenticationDetail();
$webAuthenticationDetail->setUserCredential($userCredential); $webAuthenticationDetail->setUserCredential($userCredential);
$clientDetail = new ClientDetail(); $clientDetail = new ClientDetail();
$clientDetail $clientDetail
->setAccountNumber('510087100') ->setAccountNumber('647927254')
->setMeterNumber('119157536'); ->setMeterNumber('250557652');
$version = new VersionId(); $version = new VersionId();
$version $version
->setMajor(23) ->setMajor(23)
...@@ -100,20 +100,23 @@ class DeliverySytemsController extends Controller ...@@ -100,20 +100,23 @@ class DeliverySytemsController extends Controller
->setServiceId('ship'); ->setServiceId('ship');
$shipperAddress = new Address(); $shipperAddress = new Address();
$shipperAddress $shipperAddress
->setStreetLines([$street]) ->setStreetLines(['56 Christopher Columbus Dr'])
->setCity($city) // ->setStreetLines([$street])
->setStateOrProvinceCode($stateOrProvinceCode) ->setCity('Jersey City')
->setPostalCode($postalCode) // ->setCity($city)
->setCountryCode($countryCode); ->setStateOrProvinceCode('NJ')
// ->setStateOrProvinceCode($stateOrProvinceCode)
->setPostalCode('07302')
->setCountryCode('US');
$shipperContact = new Contact(); $shipperContact = new Contact();
$shipperContact $shipperContact
// ->setCompanyName('TuronExpresss') // ->setCompanyName('FAZO CARGO INC.')
// ->setEMailAddress('test@example.com') // ->setEMailAddress('test@example.com')
->setPersonName($sender[0]->firstname.' '.$sender[0]->secondname.' '.$sender[0]->fathername) ->setPersonName($sender[0]->firstname . ' ' . $sender[0]->secondname . ' ' . $sender[0]->fathername)
->setPhoneNumber(($sender[0]->phone)); ->setPhoneNumber(($sender[0]->phone));
$shipper = new Party(); $shipper = new Party();
$shipper $shipper
->setAccountNumber('510087100') ->setAccountNumber('250557652')
->setAddress($shipperAddress) ->setAddress($shipperAddress)
->setContact($shipperContact); ->setContact($shipperContact);
$recipientAddress = new Address(); $recipientAddress = new Address();
...@@ -121,13 +124,13 @@ class DeliverySytemsController extends Controller ...@@ -121,13 +124,13 @@ class DeliverySytemsController extends Controller
->setStreetLines(['97 Quentin Rd, 1st floor']) ->setStreetLines(['97 Quentin Rd, 1st floor'])
->setCity('Brooklyn') ->setCity('Brooklyn')
->setStateOrProvinceCode('NY') ->setStateOrProvinceCode('NY')
->setPostalCode('11229') ->setPostalCode('11223')
->setCountryCode('US'); ->setCountryCode('US');
$recipientContact = new Contact(); $recipientContact = new Contact();
$recipientContact $recipientContact
->setCompanyName('Fazo Cargo') ->setCompanyName('FAZO CARGO INC.')
->setPersonName('Test FullName') ->setPersonName('Sheroz Mamayev')
->setPhoneNumber('+1 347 547 9797'); ->setPhoneNumber('+1 347 547.9797');
$recipient = new Party(); $recipient = new Party();
$recipient $recipient
->setAddress($recipientAddress) ->setAddress($recipientAddress)
......
app/Http/Controllers/OrderController.php
View file @ b686777e
...@@ -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,12 +119,15 @@ class OrderController extends Controller ...@@ -119,12 +119,15 @@ 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 and client_id='.$id.') as count FROM status s');
$count = DB::select('SELECT COUNT(*) as count FROM orders'); $count = DB::select('SELECT COUNT(*) as count FROM orders where client_id='.$id);
// dd($orders); // dd($orders);
...@@ -214,7 +217,7 @@ class OrderController extends Controller ...@@ -214,7 +217,7 @@ class OrderController extends Controller
$order = Orders::create([ $order = Orders::create([
'client_id' => $request->get('client_id'), 'client_id' => $user->id,
'name' => $request->get('name'), 'name' => $request->get('name'),
'flight_id' => 0, 'flight_id' => 0,
'added' => Carbon::now(), 'added' => Carbon::now(),
...@@ -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'),
......
app/Http/Controllers/Postman/DeclarationController.php
View file @ b686777e
...@@ -120,6 +120,14 @@ class DeclarationController extends Controller ...@@ -120,6 +120,14 @@ class DeclarationController extends Controller
'order_id', 'order_id',
])->where('order_id', '=', $orderData[0]->id)->get(); ])->where('order_id', '=', $orderData[0]->id)->get();
// return view('templates.declaration', [
// 'title' => 'Declaration #',
// 'client' => $clientData,
// 'order' => $orderData[0],
// 'recipient' => $recipient[0],
// 'sender' => $sender[0],
// 'product' => $products
// ]);
$pdf = \Barryvdh\DomPDF\Facade::loadView('templates.declaration', [ $pdf = \Barryvdh\DomPDF\Facade::loadView('templates.declaration', [
'title' => 'Declaration #', 'title' => 'Declaration #',
'client' => $clientData, 'client' => $clientData,
...@@ -134,7 +142,7 @@ class DeclarationController extends Controller ...@@ -134,7 +142,7 @@ class DeclarationController extends Controller
$pdf->save($path . $filename); $pdf->save($path . $filename);
// Activity::appendLog("Сгенерирована декларация в PDF формате.", Activity::NOTICE); // Activity::appendLog("Сгенерирована декларация в PDF формате.", Activity::NOTICE);
return redirect(url($path . $filename)); return redirect(url($path . $filename));
// return response()->json(['url' => url($path.$filename).''], 200); // return response()->json(['url' => url($path . $filename) . ''], 200);
// return $pdf->download('declaration.pdf'); // return $pdf->download('declaration.pdf');
} }
......
app/Models/Orders.php
View file @ b686777e
...@@ -44,6 +44,7 @@ class Orders extends Authenticatable ...@@ -44,6 +44,7 @@ class Orders extends Authenticatable
'delivery_info', 'delivery_info',
'label_url', 'label_url',
'payment_info', 'payment_info',
'comment',
'status_id' 'status_id'
]; ];
......
composer.lock
View file @ b686777e
...@@ -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",
......
resources/views/pages/parcels/order_create.blade.php
View file @ b686777e
...@@ -955,7 +955,7 @@ ...@@ -955,7 +955,7 @@
' </td>\n' + ' </td>\n' +
' <td class="col-2">\n' + ' <td class="col-2">\n' +
' <div class="input-group input-group-sm">\n' + ' <div class="input-group input-group-sm">\n' +
' <input type="number" name="products[' + counter + '][1]" class="form-control form-control-sm count" id="" value="1" required>\n' + ' <input type="number" name="products[' + counter + '][1]" class="form-control form-control-sm count" value="1" required>\n' +
' <div class="invalid-feedback" >\n' + ' <div class="invalid-feedback" >\n' +
' Укажите количество единиц товара\n' + ' Укажите количество единиц товара\n' +
' </div>\n' + ' </div>\n' +
...@@ -963,7 +963,7 @@ ...@@ -963,7 +963,7 @@
' </td>\n' + ' </td>\n' +
' <td class="col-2">\n' + ' <td class="col-2">\n' +
' <div class="input-group input-group-sm">\n' + ' <div class="input-group input-group-sm">\n' +
' <input type="number" name="products[' + counter + '][2]" class="form-control form-control-sm cost" id="" placeholder="Username" value="2" required>\n' + ' <input type="number" name="products[' + counter + '][2]" class="form-control form-control-sm cost" value="2" required>\n' +
' <div class="invalid-feedback" >\n' + ' <div class="invalid-feedback" >\n' +
' Укажите стоимость за единицу товара\n' + ' Укажите стоимость за единицу товара\n' +
' </div>\n' + ' </div>\n' +
...@@ -971,7 +971,7 @@ ...@@ -971,7 +971,7 @@
' </td>\n' + ' </td>\n' +
' <td class="col-2">\n' + ' <td class="col-2">\n' +
' <div class="input-group input-group-sm">\n' + ' <div class="input-group input-group-sm">\n' +
' <input type="text" step="0.1" name="products[' + counter + '][3]" class="form-control form-control-sm" id="username" required>\n' + ' <input type="text" name="products[' + counter + '][3]" class="form-control form-control-sm" required>\n' +
' <div class="invalid-feedback" >\n' + ' <div class="invalid-feedback" >\n' +
' Your username is required.\n' + ' Your username is required.\n' +
' </div>\n' + ' </div>\n' +
......
routes/web.php
View file @ b686777e
...@@ -66,8 +66,6 @@ Route::get('/refresh', 'Auth\LoginController@refresh')->name('refresh'); ...@@ -66,8 +66,6 @@ Route::get('/refresh', 'Auth\LoginController@refresh')->name('refresh');
Route::post('/feedback/add', 'FeedbackController@addGuest'); Route::post('/feedback/add', 'FeedbackController@addGuest');
// //
//Route::get('/packages/pay', 'PackagesController@pay');
//Route::get('/packages/addr', 'PackagesController@addr');
Route::get('/packages', 'OrderController@index')->name('package')->middleware('auth'); Route::get('/packages', 'OrderController@index')->name('package')->middleware('auth');
Route::get('/packages/create/{id}', 'OrderController@create')->name('package.create')->middleware('auth'); Route::get('/packages/create/{id}', 'OrderController@create')->name('package.create')->middleware('auth');
Route::post('/packages/order-store', 'OrderController@orderStore')->name('package.store')->middleware('auth'); Route::post('/packages/order-store', 'OrderController@orderStore')->name('package.store')->middleware('auth');
...@@ -82,17 +80,6 @@ Route::get('/profile', 'ProfileController@profile')->middleware('auth'); ...@@ -82,17 +80,6 @@ Route::get('/profile', 'ProfileController@profile')->middleware('auth');
Route::post('/profile/save', 'ProfileController@save')->name('profile.save')->middleware('auth'); Route::post('/profile/save', 'ProfileController@save')->name('profile.save')->middleware('auth');
Route::get('/get-fedex-label/{id}', 'DeliverySytemsController@getFedexData')->middleware('auth'); Route::get('/get-fedex-label/{id}', 'DeliverySytemsController@getFedexData')->middleware('auth');
// //
//Route::get('/packages/list', 'PackagesController@pending_packages');
//Route::get('/packages/pending', 'PackagesController@pending_packages')->name('packagePending');
//Route::get('/packages/warehouse', 'PackagesController@inwarehouse_packages')->name('packageInwarehouse');
//Route::post('/packages/warehouse', 'PackagesController@inwarehouse_packages');
//Route::get('/packages/packing', 'PackagesController@onpacking_packages')->name('packagePacking');
//Route::get('/packages/register', 'PackagesController@register');
//Route::post('/packages/register', 'PackagesController@register');
//Route::get('/packages/sent', 'PackagesController@sent_packages')->name('packageSent');
//Route::get('/packages/all', 'PackagesController@all_packages')->name('packageAll');
//Route::get('/package/{id}/delivered', 'PackagesController@make_delivered')->where(['id' => '[0-9]+'])->name('makeDelivered');
//Route::get('packages/delivered', 'PackagesController@delivered_packages')->name('packageDelivered');
Route::get('/profile/info', 'ProfileController@info')->middleware('auth'); Route::get('/profile/info', 'ProfileController@info')->middleware('auth');
Route::post('/profile/address/add', 'ProfileController@address_add')->middleware('auth'); Route::post('/profile/address/add', 'ProfileController@address_add')->middleware('auth');
......
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