Skip to content

Commit ca4d425

Browse files
abidlovskyiabidlovskyi
committed
Merged in develop (pull request #16)
APITOCART-14028 changes
2 parents fd04cb3 + 30d4fd3 commit ca4d425

File tree

10 files changed

+416
-10
lines changed

10 files changed

+416
-10
lines changed

‎src/.phpstorm.meta.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
/**
77
* PhpStorm Meta file, to provide autocomplete information for PhpStorm
8-
* Generated on 2020-06-23 06:16:36.
8+
* Generated on 2020-06-24 09:54:16.
99
*
1010
* @author Barry vd. Heuvel <[email protected]>
1111
* @see https://github.com/barryvdh/laravel-ide-helper

‎src/_ide_helper.php‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
/**
55
* A helper file for Laravel, to provide autocomplete information to your IDE
6-
* Generated for Laravel 7.16.1 on 2020-06-23 06:16:35.
6+
* Generated for Laravel 7.17.1 on 2020-06-24 09:54:16.
77
*
88
* This file should not be included in your code, only analyzed by your IDE!
99
*
@@ -779,6 +779,19 @@ public static function getLoadedProviders()
779779
return $instance->getLoadedProviders();
780780
}
781781

782+
/**
783+
* Determine if the given service provider is loaded.
784+
*
785+
* @param string $provider
786+
* @return bool
787+
* @static
788+
*/
789+
public static function providerIsLoaded($provider)
790+
{
791+
/** @var \Illuminate\Foundation\Application $instance */
792+
return $instance->providerIsLoaded($provider);
793+
}
794+
782795
/**
783796
* Get the application's deferred services.
784797
*

‎src/app/Http/Controllers/BusinessCases/AutomaticPriceUpdatingController.php‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?php
2+
3+
namespace App\Http\Controllers\BusinessCases;
4+
5+
use App\Http\Controllers\Controller;
6+
use Illuminate\Http\Request;
7+
use Illuminate\Support\Facades\Log;
8+
use Illuminate\Support\Facades\Mail;
9+
10+
11+
use App\Services\Api2Cart;
12+
13+
14+
class AutomaticPriceUpdatingController extends Controller
15+
{
16+
17+
private $api2cart;
18+
19+
public function __construct(Api2Cart $api2Cart)
20+
{
21+
$this->api2cart = $api2Cart;
22+
}
23+
24+
public function index()
25+
{
26+
27+
// $result = $this->api2cart->getProductList( "1316ad9a66ac871ce46a3d59005acc9c", null, null, null, null , null );
28+
// session()->put('automatic_price_updating', collect( $result['result']['product'] ) );
29+
//
30+
// $products = session()->get('automatic_price_updating');
31+
//
32+
// print_r($products);
33+
34+
return view('business_cases.automatic_price_updating.index');
35+
}
36+
37+
38+
public function create(Request $request)
39+
{
40+
if ( $request->ajax() ){
41+
return response()->json(['data' => view('business_cases.automatic_price_updating.form')->render(), 'log' => $this->api2cart->getLog() ]);
42+
}
43+
44+
return redirect(route('business_cases.automatic_price_updating'));
45+
}
46+
}

‎src/app/Services/Api2Cart.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ public function addCart($fields)
255255
(isset($fields['ftp_host'])) ? $fields['ftp_host'] : null,
256256
(isset($fields['ftp_user'])) ? $fields['ftp_user'] : null,
257257
(isset($fields['ftp_password'])) ? $fields['ftp_password'] : null,
258-
(isset($fields['ftp_port'])) ? $fields['ftp_port'] : '21',
259-
(isset($fields['ftp_store_dir'])) ? $fields['ftp_store_dir'] : '/',
258+
(isset($fields['ftp_port']) && intval($fields['ftp_port'])) ? $fields['ftp_port'] : null,
259+
(isset($fields['ftp_store_dir'])) ? $fields['ftp_store_dir'] : null,
260260
(isset($fields['_3dcartapi_api_key'])) ? $fields['_3dcartapi_api_key'] : null,
261261
(isset($fields['amazon_access_token'])) ? $fields['amazon_access_token'] : null,
262262
(isset($fields['amazon_seller_id'])) ? $fields['amazon_seller_id'] : null,

‎src/composer.lock‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/public/images/automatic-price-updating.jpg‎

125 KB
Loading

‎src/resources/views/business_cases/automatic_price_updating/form.blade.php‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
@php
2+
$faker = Faker\Factory::create();
3+
@endphp
4+
@if(isset($product_id))
5+
{!! Form::open(['url' => route('businessCases.automatic_price_updating.update', [$store_id, $product_id]) ]) !!}
6+
@else
7+
{!! Form::open(['url' => route('businessCases.automatic_price_updating.create') ]) !!}
8+
@endif
9+
10+
<div class="alert alert-danger" role="alert" style="display: none;">
11+
<div id="_form_errors" class="text-left"></div>
12+
</div>
13+
14+
<div class="row">
15+
<div class="col-12">
16+
<div class="form-group row">
17+
<label for="name" class="col-4 col-form-label">Name</label>
18+
<div class="col-8">
19+
<input type="text" class="form-control" id="name" name="name" value="{{ (isset($product['name'])) ? $product['name'] : $faker->sentence() }}">
20+
<div class="invalid-feedback"></div>
21+
</div>
22+
</div>
23+
</div>
24+
</div>
25+
26+
<div class="row">
27+
<div class="col-12">
28+
<div class="form-group row">
29+
<label for="name" class="col-4 col-form-label">SKU</label>
30+
<div class="col-8">
31+
<input type="text" class="form-control" id="name" name="name" value="{{ (isset($product['sku'])) ? $product['sku'] : $faker->uuid }}">
32+
<div class="invalid-feedback"></div>
33+
</div>
34+
</div>
35+
</div>
36+
</div>
37+
38+
<div class="row">
39+
<div class="col-12">
40+
<div class="form-group row">
41+
<label for="description" class="col-4 col-form-label">Description</label>
42+
<div class="col-8">
43+
<textarea class="form-control" rows="6" id="description" name="description">{!! (isset($product['description'])) ? $product['description'] : $faker->text() !!}</textarea>
44+
<div class="invalid-feedback"></div>
45+
</div>
46+
</div>
47+
</div>
48+
</div>
49+
50+
<div class="row">
51+
<div class="col-12">
52+
<div class="form-group row">
53+
<label for="price" class="col-4 col-form-label">Price</label>
54+
<div class="col-8">
55+
<input type="number" class="form-control" id="price" name="price" value="{{ ( isset($product['price']) ) ? $product['price'] : $faker->randomFloat(2,1,100) }}" step="0.01" >
56+
<div class="invalid-feedback"></div>
57+
</div>
58+
</div>
59+
</div>
60+
</div>
61+
62+
<div class="row">
63+
<div class="col-12">
64+
<div class="form-group row">
65+
<label for="price" class="col-4 col-form-label">Quantity</label>
66+
<div class="col-8">
67+
<input type="number" class="form-control" id="quantity" name="quantity" value="{{ ( isset($product['quantity']) ) ? $product['quantity'] : $faker->randomNumber(2) }}" step="1" >
68+
<div class="invalid-feedback"></div>
69+
</div>
70+
</div>
71+
</div>
72+
</div>
73+
74+
75+
{!! Form::close() !!}

0 commit comments

Comments
 (0)