+
+
+
+
+
+
+ {{ __('admin::app.configuration.tax.title') }}
+
+
+
diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
index 9d36faa78..6082d60d4 100644
--- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
+++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
@@ -21,7 +21,7 @@ class AttributeController extends Controller
* @var array
*/
protected $_config;
-
+
/**
* AttributeRepository object
*
@@ -37,6 +37,8 @@ class AttributeController extends Controller
*/
public function __construct(Attribute $attribute)
{
+ $this->middleware('admin');
+
$this->attribute = $attribute;
$this->_config = request('_config');
@@ -109,7 +111,7 @@ class AttributeController extends Controller
'admin_name' => 'required',
'type' => 'required'
]);
-
+
$this->attribute->update(request()->all(), $id);
session()->flash('success', 'Attribute updated successfully.');
diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php
index 24914510e..330f33f96 100644
--- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php
+++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php
@@ -22,7 +22,7 @@ class AttributeFamilyController extends Controller
* @var array
*/
protected $_config;
-
+
/**
* AttributeFamilyRepository object
*
@@ -38,6 +38,8 @@ class AttributeFamilyController extends Controller
*/
public function __construct(AttributeFamily $attributeFamily)
{
+ $this->middleware('admin');
+
$this->attributeFamily = $attributeFamily;
$this->_config = request('_config');
@@ -62,7 +64,7 @@ class AttributeFamilyController extends Controller
public function create(Attribute $attribute)
{
$attributeFamily = $this->attributeFamily->with(['attribute_groups.custom_attributes'])->findOneByField('code', 'default');
-
+
$custom_attributes = $attribute->all(['id', 'code', 'admin_name', 'type']);
return view($this->_config['view'], compact('custom_attributes', 'attributeFamily'));
@@ -116,7 +118,7 @@ class AttributeFamilyController extends Controller
'code' => ['required', 'unique:attribute_families,code,' . $id, new \Webkul\Core\Contracts\Validations\Code],
'name' => 'required'
]);
-
+
$this->attributeFamily->update(request()->all(), $id);
diff --git a/packages/Webkul/Attribute/src/Providers/AttributeServiceProvider.php b/packages/Webkul/Attribute/src/Providers/AttributeServiceProvider.php
index b7f1ee95b..f23d9b830 100644
--- a/packages/Webkul/Attribute/src/Providers/AttributeServiceProvider.php
+++ b/packages/Webkul/Attribute/src/Providers/AttributeServiceProvider.php
@@ -4,6 +4,7 @@ namespace Webkul\Attribute\Providers;
use Illuminate\Support\ServiceProvider;
use Illuminate\Routing\Router;
+use Webkul\User\Http\Middleware\RedirectIfNotAdmin;
class AttributeServiceProvider extends ServiceProvider
{
@@ -14,6 +15,8 @@ class AttributeServiceProvider extends ServiceProvider
*/
public function boot(Router $router)
{
+ $router->aliasMiddleware('admin', RedirectIfNotAdmin::class);
+
$this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations');
}
@@ -24,6 +27,6 @@ class AttributeServiceProvider extends ServiceProvider
*/
public function register()
{
-
+
}
}
\ No newline at end of file
diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
index 7a29ff54a..da1d28cf5 100644
--- a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
+++ b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
@@ -20,7 +20,7 @@ class CategoryController extends Controller
* @var array
*/
protected $_config;
-
+
/**
* CategoryRepository object
*
@@ -36,6 +36,8 @@ class CategoryController extends Controller
*/
public function __construct(Category $category)
{
+ $this->middleware('admin');
+
$this->category = $category;
$this->_config = request('_config');
diff --git a/packages/Webkul/Category/src/Providers/CategoryServiceProvider.php b/packages/Webkul/Category/src/Providers/CategoryServiceProvider.php
index a832e33d8..fe9c0d086 100644
--- a/packages/Webkul/Category/src/Providers/CategoryServiceProvider.php
+++ b/packages/Webkul/Category/src/Providers/CategoryServiceProvider.php
@@ -5,6 +5,7 @@ namespace Webkul\Category\Providers;
use Illuminate\Support\ServiceProvider;
use Illuminate\Foundation\AliasLoader;
use Illuminate\Routing\Router;
+use Webkul\User\Http\Middleware\RedirectIfNotAdmin;
class CategoryServiceProvider extends ServiceProvider
{
@@ -15,6 +16,8 @@ class CategoryServiceProvider extends ServiceProvider
*/
public function boot(Router $router)
{
+ $router->aliasMiddleware('admin', RedirectIfNotAdmin::class);
+
$this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations');
}
@@ -25,6 +28,6 @@ class CategoryServiceProvider extends ServiceProvider
*/
public function register()
{
-
+
}
}
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_08_30_064755_create_tax_rules_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_08_30_064755_create_tax_rules_table.php
new file mode 100644
index 000000000..fb26ebe5b
--- /dev/null
+++ b/packages/Webkul/Core/src/Database/Migrations/2018_08_30_064755_create_tax_rules_table.php
@@ -0,0 +1,42 @@
+increments('id');
+
+ $table->integer('channel_id')->unsigned();
+
+ $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade');
+
+ $table->string('code')->unique();
+
+ $table->string('name')->unique();
+
+ $table->longtext('description');
+
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('tax_rules');
+ }
+}
diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_08_30_065042_create_tax_rates_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_08_30_065042_create_tax_rates_table.php
new file mode 100644
index 000000000..5b8c860b1
--- /dev/null
+++ b/packages/Webkul/Core/src/Database/Migrations/2018_08_30_065042_create_tax_rates_table.php
@@ -0,0 +1,46 @@
+increments('id');
+
+ $table->string('identifier')->unique();
+
+ $table->boolean('is_zip_from')->default(0);
+
+ $table->integer('zip_from')->unsigned()->nullable();
+
+ $table->integer('zip_to')->unsigned()->nullable();
+
+ $table->string('state');
+
+ $table->string('country');
+
+ $table->float('tax_rate', 6, 4);
+
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('tax_rates');
+ }
+}
diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_08_30_065840_create_tax_map_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_08_30_065840_create_tax_map_table.php
new file mode 100644
index 000000000..fa88e16b5
--- /dev/null
+++ b/packages/Webkul/Core/src/Database/Migrations/2018_08_30_065840_create_tax_map_table.php
@@ -0,0 +1,42 @@
+increments('id');
+
+ $table->integer('tax_rule_id')->unsigned();
+
+ $table->foreign('tax_rule_id')->references('id')->on('tax_rules')->onDelete('cascade');
+
+ $table->integer('tax_rate_id')->unsigned();
+
+ $table->foreign('tax_rate_id')->references('id')->on('tax_rates')->onDelete('cascade');
+
+ $table->unique(['tax_rule_id', 'tax_rate_id'], 'tax_map_index_unique');
+
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('tax_map');
+ }
+}
diff --git a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php
index b34ac0321..858b69202 100644
--- a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php
@@ -21,7 +21,7 @@ class ChannelController extends Controller
* @var array
*/
protected $_config;
-
+
/**
* ChannelRepository object
*
@@ -37,6 +37,8 @@ class ChannelController extends Controller
*/
public function __construct(Channel $channel)
{
+ $this->middleware('admin');
+
$this->channel = $channel;
$this->_config = request('_config');
diff --git a/packages/Webkul/Core/src/Http/Controllers/CountryController.php b/packages/Webkul/Core/src/Http/Controllers/CountryController.php
index a83b61783..eeeae966e 100644
--- a/packages/Webkul/Core/src/Http/Controllers/CountryController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/CountryController.php
@@ -20,7 +20,7 @@ class CountryController extends Controller
* @var array
*/
protected $_config;
-
+
/**
* CountryRepository object
*
@@ -36,6 +36,8 @@ class CountryController extends Controller
*/
public function __construct(Country $country)
{
+ $this->middleware('admin');
+
$this->country = $country;
$this->_config = request('_config');
diff --git a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php
index f93b74b30..b8b106cf9 100644
--- a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php
@@ -20,7 +20,7 @@ class CurrencyController extends Controller
* @var array
*/
protected $_config;
-
+
/**
* CurrencyRepository object
*
@@ -36,6 +36,8 @@ class CurrencyController extends Controller
*/
public function __construct(Currency $currency)
{
+ $this->middleware('admin');
+
$this->currency = $currency;
$this->_config = request('_config');
@@ -81,7 +83,7 @@ class CurrencyController extends Controller
return redirect()->route($this->_config['redirect']);
}
-
+
/**
* Remove the specified resource from storage.
*
diff --git a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
index e7f6cf1b1..57c47d4e5 100644
--- a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
@@ -21,14 +21,14 @@ class ExchangeRateController extends Controller
* @var array
*/
protected $_config;
-
+
/**
* ExchangeRateRepository object
*
* @var array
*/
protected $exchangeRate;
-
+
/**
* CurrencyRepository object
*
@@ -45,6 +45,8 @@ class ExchangeRateController extends Controller
*/
public function __construct(ExchangeRate $exchangeRate, Currency $currency)
{
+ $this->middleware('admin');
+
$this->exchangeRate = $exchangeRate;
$this->currency = $currency;
@@ -129,7 +131,7 @@ class ExchangeRateController extends Controller
'target_currency' => 'required',
'ratio' => 'required|numeric'
]);
-
+
$this->exchangeRate->update(request()->all(), $id);
session()->flash('success', 'Exchange rate updated successfully.');
diff --git a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php
index 09578ed70..015b3334f 100644
--- a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php
@@ -20,7 +20,7 @@ class LocaleController extends Controller
* @var array
*/
protected $_config;
-
+
/**
* LocaleRepository object
*
@@ -36,6 +36,8 @@ class LocaleController extends Controller
*/
public function __construct(Locale $locale)
{
+ $this->middleware('admin');
+
$this->locale = $locale;
$this->_config = request('_config');
diff --git a/packages/Webkul/Core/src/Http/Controllers/TaxController.php b/packages/Webkul/Core/src/Http/Controllers/TaxController.php
new file mode 100644
index 000000000..6ced25c57
--- /dev/null
+++ b/packages/Webkul/Core/src/Http/Controllers/TaxController.php
@@ -0,0 +1,92 @@
+
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class TaxController extends Controller
+{
+ /**
+ * Contains route related configuration
+ *
+ * @var array
+ */
+ protected $_config;
+
+ /**
+ * ChannelRepository object
+ *
+ * @var array
+ */
+ protected $channel;
+
+ /**
+ * Tax Rule Repository object
+ *
+ * @var array
+ */
+ protected $taxRule;
+
+ /**
+ * Tax Rate Repository object
+ *
+ * @var array
+ */
+ protected $taxRate;
+
+ /**
+ * Tax Map Repository object
+ *
+ * @var array
+ */
+ protected $taxMap;
+
+ /**
+ * Create a new controller instance.
+ *
+ * @param Webkul\Core\Repositories\ChannelRepository $channel
+ * @param Webkul\Core\Repositories\TaxRuleRepository $taxRule
+ * @param Webkul\Core\Repositories\TaxRateRepository $taxRate
+ * @param Webkul\Core\Repositories\TaxMapRepository $taxMap
+ * @return void
+ */
+ public function __construct(Channel $channel, TaxRule $taxRule, TaxRate $taxRate, TaxMap $taxMap)
+ {
+ $this->middleware('admin');
+
+ $this->channel = $channel;
+
+ $this->taxRule = $taxRule;
+
+ $this->taxRate = $taxRate;
+
+ $this->taxMap = $taxMap;
+
+ $this->_config = request('_config');
+ }
+
+ /**
+ * Display a listing of the resource.
+ *
+ * @return \Illuminate\Http\Response
+ */
+ public function index()
+ {
+ return view($this->_config['view']);
+ }
+
+
+
+}
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Http/Controllers/TaxRateController.php b/packages/Webkul/Core/src/Http/Controllers/TaxRateController.php
new file mode 100644
index 000000000..1b13cd178
--- /dev/null
+++ b/packages/Webkul/Core/src/Http/Controllers/TaxRateController.php
@@ -0,0 +1,133 @@
+
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class TaxRateController extends Controller
+{
+ /**
+ * Contains route related configuration
+ *
+ * @var array
+ */
+ protected $_config;
+
+ /**
+ * Tax Rate Repository object
+ *
+ * @var array
+ */
+ protected $taxRate;
+
+ /**
+ * Create a new controller instance.
+ *
+ * @param Webkul\Core\Repositories\TaxRateRepository $taxRate
+ * @return void
+ */
+ public function __construct(TaxRate $taxRate)
+ {
+ $this->middleware('admin');
+
+ $this->taxRate = $taxRate;
+
+ $this->_config = request('_config');
+ }
+
+ /**
+ * Display a listing of the resource.
+ *
+ * @return view
+ */
+ public function show()
+ {
+ return view($this->_config['view']);
+ }
+
+ /**
+ * Create the tax rate
+ *
+ * @return mixed
+ */
+ public function create() {
+
+ $this->validate(request(), [
+ 'identifier' => 'required|string|unique:tax_rates,identifier',
+ 'is_zip' => 'sometimes|confirmed',
+ 'zip_from' => 'nullable|numeric|required_with:is_zip',
+ 'zip_to' => 'nullable|numeric|required_with:is_zip,zip_from',
+ 'state' => 'required|string',
+ 'country' => 'required|string',
+ 'tax_rate' => 'required|numeric'
+ ]);
+
+ if($this->taxRate->create(request()->input())) {
+ session()->flash('success', 'Tax Rate Created Successfully');
+
+ return redirect()->route($this->_config['redirect']);
+ } else {
+ session()->flash('error', 'Cannot Create Tax Rate');
+
+ return redirect()->back();
+ }
+
+ return redirect()->back();
+ }
+
+ /**
+ * Show the edit form
+ * for the previously
+ * created tax rates.
+ *
+ * @return mixed
+ */
+
+ public function edit($id) {
+
+ $data = collect($this->taxRate->findOneByField('id', $id));
+
+ return view($this->_config['view'])->with('data', $data);
+
+ }
+
+ /**
+ * Edit the previous
+ * tax rate
+ *
+ * @return mixed
+ */
+ public function update($id) {
+
+ $this->validate(request(), [
+ 'identifier' => 'required|string|unique:tax_rates,identifier,'.$id,
+ 'is_zip' => 'sometimes|confirmed',
+ 'zip_from' => 'nullable|numeric|required_with:is_zip',
+ 'zip_to' => 'nullable|numeric|required_with:is_zip,zip_from',
+ 'state' => 'required|string',
+ 'country' => 'required|string',
+ 'tax_rate' => 'required|numeric'
+ ]);
+
+ if($this->taxRate->update(request()->input(), $id)) {
+ session()->flash('success', 'Tax Rate Updated Successfully');
+
+ return redirect()->route($this->_config['redirect']);
+ } else {
+ session()->flash('error', 'Cannot Create Tax Rate');
+
+ return redirect()->back();
+ }
+
+ return redirect()->back();
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Http/Controllers/TaxRuleController.php b/packages/Webkul/Core/src/Http/Controllers/TaxRuleController.php
new file mode 100644
index 000000000..899e60e48
--- /dev/null
+++ b/packages/Webkul/Core/src/Http/Controllers/TaxRuleController.php
@@ -0,0 +1,144 @@
+
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class TaxRuleController extends Controller
+{
+ /**
+ * Contains route related configuration
+ *
+ * @var array
+ */
+ protected $_config;
+
+ /**
+ * Contains the current
+ * channel.
+ *
+ * @var string
+ */
+ protected $currentChannelId;
+
+ /**
+ * Tax Rule Repository object
+ *
+ * @var array
+ */
+ protected $taxRule;
+
+ /**
+ * Tax Map Repository object
+ *
+ * @var array
+ */
+ protected $taxMap;
+
+
+ /**
+ * Create a new controller instance.
+ *
+ * @param Webkul\Core\Repositories\TaxRuleRepository $taxRule
+ * @return void
+ */
+ public function __construct(TaxRule $taxRule, TaxRate $taxRate, TaxMap $taxMap)
+ {
+ $this->middleware('admin');
+
+ $this->currentChannelId = core()->getCurrentChannel()->id;
+
+ $this->taxRule = $taxRule;
+
+ $this->taxRate = $taxRate;
+
+ $this->taxMap = $taxMap;
+
+ $this->_config = request('_config');
+ }
+
+ /**
+ * Function to show
+ * the tax rule form
+ *
+ * @return view
+ */
+ public function show()
+ {
+ return view($this->_config['view'])->with('taxRates', $this->taxRate->all());
+ }
+
+ /**
+ * Function to create
+ * the tax rule.
+ *
+ * @return view
+ */
+ public function create()
+ {
+ $data = request()->input();
+
+ $this->validate(request(), [
+ 'code' => 'required|string|unique:tax_rules,id',
+ 'name' => 'required|string|unique:tax_rules,name',
+ 'description' => 'required|string'
+ ]);
+
+ $data['channel_id'] = $this->currentChannelId;
+ unset($data['_token']);
+
+ if($currentTaxRule = $this->taxRule->create($data)) {
+ $allTaxRules = $data['taxrates'];
+
+ foreach ($allTaxRules as $index => $taxRuleId) {
+ $taxMap['tax_rule'] = $currentTaxRule->id;
+
+ $taxMap['tax_rate'] = $taxRuleId;
+
+ if ($this->taxMap->create($taxMap)) {
+ continue;
+ } else {
+ return redirect()->action('TaxRuleController@performRollback',[
+ 'taxRuleId' => $taxRuleId
+ ]);
+ }
+ }
+
+ session()->flash('success', 'New Tax Rule Created');
+
+ return redirect()->route('admin.tax.index');
+ } else {
+ session()->flash('error', 'Cannot create the tax rule');
+ }
+
+ return view($this->_config['view']);
+ }
+ /**
+ * To perform the rollback
+ * if in anycase the taxMap
+ * records creates any problem.
+ *
+ * @return mixed
+ */
+ public function performRollback($taxRuleId) {
+
+ if($this->taxRule->delete($taxRuleId)) {
+ Session()->flash('error', 'Cannot Create Tax Rule');
+
+ return redirect()->route('admin.tax.index');
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Models/TaxMap.php b/packages/Webkul/Core/src/Models/TaxMap.php
new file mode 100644
index 000000000..452a01efc
--- /dev/null
+++ b/packages/Webkul/Core/src/Models/TaxMap.php
@@ -0,0 +1,20 @@
+aliasMiddleware('locale', Locale::class);
+ $router->aliasMiddleware('admin', RedirectIfNotAdmin::class);
+
+ $router->aliasMiddleware('customer', RedirectIfNotCustomer::class);
+
$this->publishes([
__DIR__ . '/../../publishable/lang' => public_path('vendor/webkul/core/lang'),
], 'public');
diff --git a/packages/Webkul/Core/src/Repositories/CountryRepository.php b/packages/Webkul/Core/src/Repositories/CountryRepository.php
index fc6209aea..12c550c65 100644
--- a/packages/Webkul/Core/src/Repositories/CountryRepository.php
+++ b/packages/Webkul/Core/src/Repositories/CountryRepository.php
@@ -1,7 +1,7 @@
-
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class TaxMapRepository extends Repository
+{
+ /**
+ * Specify Model class name
+ *
+ * @return mixed
+ */
+ function model()
+ {
+ return 'Webkul\Core\Models\TaxMap';
+ }
+
+ /**
+ * @param array $data
+ * @return mixed
+ */
+ public function create(array $data)
+ {
+ $taxMap = $this->model->create($data);
+
+ return $taxMap;
+ }
+
+ /**
+ * @param array $data
+ * @param $id
+ * @param string $attribute
+ * @return mixed
+ */
+ public function update(array $data, $id, $attribute = "id")
+ {
+ $taxMap = $this->find($id);
+
+ $taxMap->update($data);
+
+ return $taxMap;
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Repositories/TaxRateRepository.php b/packages/Webkul/Core/src/Repositories/TaxRateRepository.php
new file mode 100644
index 000000000..7e2b63bbd
--- /dev/null
+++ b/packages/Webkul/Core/src/Repositories/TaxRateRepository.php
@@ -0,0 +1,50 @@
+
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class TaxRateRepository extends Repository
+{
+ /**
+ * Specify Model class name
+ *
+ * @return mixed
+ */
+ function model()
+ {
+ return 'Webkul\Core\Models\TaxRate';
+ }
+
+ /**
+ * @param array $data
+ * @return mixed
+ */
+ public function create(array $data)
+ {
+ $taxRate = $this->model->create($data);
+
+ return $taxRate;
+ }
+
+ /**
+ * @param array $data
+ * @param $id
+ * @param string $attribute
+ * @return mixed
+ */
+ public function update(array $data, $id, $attribute = "id")
+ {
+ $taxRate = $this->find($id);
+
+ $taxRate->update($data);
+
+ return $taxRate;
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Repositories/TaxRuleRepository.php b/packages/Webkul/Core/src/Repositories/TaxRuleRepository.php
new file mode 100644
index 000000000..e7b97a133
--- /dev/null
+++ b/packages/Webkul/Core/src/Repositories/TaxRuleRepository.php
@@ -0,0 +1,50 @@
+
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class TaxRuleRepository extends Repository
+{
+ /**
+ * Specify Model class name
+ *
+ * @return mixed
+ */
+ function model()
+ {
+ return 'Webkul\Core\Models\TaxRule';
+ }
+
+ /**
+ * @param array $data
+ * @return mixed
+ */
+ public function create(array $data)
+ {
+ $taxRule = $this->model->create($data);
+
+ return $taxRule;
+ }
+
+ /**
+ * @param array $data
+ * @param $id
+ * @param string $attribute
+ * @return mixed
+ */
+ public function update(array $data, $id, $attribute = "id")
+ {
+ $taxRule = $this->find($id);
+
+ $taxRule->update($data);
+
+ return $taxmap;
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Customer/src/Http/Controllers/AccountController.php b/packages/Webkul/Customer/src/Http/Controllers/AccountController.php
index 2584d09db..17795fdb0 100644
--- a/packages/Webkul/Customer/src/Http/Controllers/AccountController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/AccountController.php
@@ -31,12 +31,13 @@ class AccountController extends Controller
public function __construct(CustomerRepository $customer, CustomerAddressRepository $address)
{
+ $this->middleware('customer');
- $this->middleware('auth:customer');
$this->_config = request('_config');
- $this->customer = $customer;
- $this->address = $address;
+ $this->customer = $customer;
+
+ $this->address = $address;
}
public function index() {
diff --git a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php
index 8b5523b9c..0a658b2fe 100644
--- a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php
@@ -31,15 +31,13 @@ class AddressController extends Controller
public function __construct(CustomerRepository $customer, CustomerAddressRepository $address)
{
-
- $this->middleware('auth:customer');
+ $this->middleware('customer');
$this->_config = request('_config');
$this->customer = $customer;
$this->address = $address;
-
}
/**
diff --git a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
index fb0a31a9b..a8501b133 100644
--- a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
@@ -30,9 +30,11 @@ class CustomerController extends Controller
public function __construct(CustomerRepository $customer)
{
+ $this->middleware('customer');
+
$this->_config = request('_config');
+
$this->customer = $customer;
- $this->middleware('auth:customer');
}
/**
diff --git a/packages/Webkul/Customer/src/Http/Controllers/OrdersController.php b/packages/Webkul/Customer/src/Http/Controllers/OrdersController.php
index 460b1a201..e35943d2e 100644
--- a/packages/Webkul/Customer/src/Http/Controllers/OrdersController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/OrdersController.php
@@ -29,9 +29,11 @@ class OrdersController extends Controller
public function __construct(CustomerRepository $customer)
{
+ $this->middleware('customer');
+
$this->_config = request('_config');
+
$this->customer = $customer;
- $this->middleware('auth:customer');
}
/**
diff --git a/packages/Webkul/Customer/src/Http/Controllers/ReviewsController.php b/packages/Webkul/Customer/src/Http/Controllers/ReviewsController.php
index 15492c13c..f553eb4b7 100644
--- a/packages/Webkul/Customer/src/Http/Controllers/ReviewsController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/ReviewsController.php
@@ -29,9 +29,11 @@ class ReviewsController extends Controller
public function __construct(CustomerRepository $customer)
{
+ $this->middleware('customer');
+
$this->_config = request('_config');
+
$this->customer = $customer;
- $this->middleware('auth:customer');
}
/**
diff --git a/packages/Webkul/Customer/src/Http/Controllers/SessionController.php b/packages/Webkul/Customer/src/Http/Controllers/SessionController.php
index f796cd66b..18a2dae23 100644
--- a/packages/Webkul/Customer/src/Http/Controllers/SessionController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/SessionController.php
@@ -24,13 +24,20 @@ class SessionController extends Controller
public function __construct()
{
+
+ $this->middleware('customer')->except(['show','create']);
+
$this->_config = request('_config');
- $this->middleware('auth:customer')->except(['show','create']);
+
}
public function show()
{
- return view($this->_config['view']);
+ if(auth()->guard('customer')->check()) {
+ return redirect()->route('customer.account.index');
+ } else {
+ return view($this->_config['view']);
+ }
}
public function create(Request $request)
@@ -46,7 +53,7 @@ class SessionController extends Controller
return back();
}
- return redirect()->route($this->_config['redirect']);
+ return redirect()->intended(route($this->_config['redirect']));
}
public function destroy($id)
@@ -54,4 +61,4 @@ class SessionController extends Controller
auth()->guard('customer')->logout();
return redirect()->route($this->_config['redirect']);
}
-}
+}
\ No newline at end of file
diff --git a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php
index b9682baae..fb8567d66 100644
--- a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php
@@ -29,9 +29,11 @@ class WishlistController extends Controller
public function __construct(CustomerRepository $customer)
{
+ $this->middleware('customer');
+
$this->_config = request('_config');
+
$this->customer = $customer;
- $this->middleware('auth:customer');
}
/**
diff --git a/packages/Webkul/Customer/src/Providers/CustomerServiceProvider.php b/packages/Webkul/Customer/src/Providers/CustomerServiceProvider.php
index e6109be99..f5cc64d94 100644
--- a/packages/Webkul/Customer/src/Providers/CustomerServiceProvider.php
+++ b/packages/Webkul/Customer/src/Providers/CustomerServiceProvider.php
@@ -13,8 +13,6 @@ class CustomerServiceProvider extends ServiceProvider
{
public function boot(Router $router)
{
- // include __DIR__ . '/../Http/routes.php';
-
$this->publishes([
__DIR__ . '/../../publishable/assets' => public_path('vendor/webkul/customer/assets'),
], 'public');
diff --git a/packages/Webkul/Inventory/src/Providers/InventoryServiceProvider.php b/packages/Webkul/Inventory/src/Providers/InventoryServiceProvider.php
index 7e9ba3899..208e63fee 100644
--- a/packages/Webkul/Inventory/src/Providers/InventoryServiceProvider.php
+++ b/packages/Webkul/Inventory/src/Providers/InventoryServiceProvider.php
@@ -5,6 +5,7 @@ namespace Webkul\Inventory\Providers;
use Illuminate\Support\ServiceProvider;
use Illuminate\Foundation\AliasLoader;
use Illuminate\Routing\Router;
+use Webkul\User\Http\Middleware\RedirectIfNotAdmin;
class InventoryServiceProvider extends ServiceProvider
{
@@ -15,6 +16,8 @@ class InventoryServiceProvider extends ServiceProvider
*/
public function boot(Router $router)
{
+ $router->aliasMiddleware('admin', RedirectIfNotAdmin::class);
+
$this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations');
}
diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php
index f3e8bf0be..4bf0917f8 100644
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -51,8 +51,8 @@ Route::group(['middleware' => ['web']], function () {
//customer account
Route::prefix('account')->group(function () {
- Route::get('account/index', 'Webkul\Customer\Http\Controllers\AccountController@index')->defaults('_config', [
- 'view' => 'shop::customers.account.index'
+ Route::get('index', 'Webkul\Customer\Http\Controllers\AccountController@index')->defaults('_config', [
+ 'view' => 'shop::customers.account.index'
])->name('customer.account.index');
@@ -69,6 +69,7 @@ Route::group(['middleware' => ['web']], function () {
Route::post('profile/edit', 'Webkul\Customer\Http\Controllers\CustomerController@edit')->defaults('_config', [
'view' => 'shop::customers.account.profile.edit'
])->name('customer.profile.edit');
+
/* Profile Routes Ends Here */
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index 370ec7785..8746abf03 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -447,13 +447,12 @@ section.slider-block {
margin-right: 10%;
.content-container {
- display: inline-block;
width: 100%;
}
.product-grid {
display: grid;
- grid-gap: 30px;
+ grid-gap: 15px;
&.max-2-col {
grid-template-columns: repeat(2, minmax(250px, 1fr));
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php
index 5e37e34c3..caf55b7b4 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php
@@ -21,33 +21,34 @@
Create Address
@else
-
-
| Address 1 | - -Address 2 | - -Country | - -State | - -City | - -Postcode | -
| Address 1 | {{ $address['address1'] }} | +||||
| Address 2 | {{ $address['address2'] }} | +||||
| Country | {{ $address['country'] }} | +||||
| State | {{ $address['state'] }} | +||||
| City | {{ $address['city'] }} | +||||
| Postcode | {{ $address['postcode'] }} |
 }}){kind=logo}