merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved tax package code style

This commit is contained in:
Jitendra Singh 2020-02-20 12:37:53 +05:30
parent 5f6e3be796
commit 0740527b54
2 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php
View File

@ -75,11 +75,11 @@ class TaxCategoryController extends Controller
$data = request()->input(); $data = request()->input();
$this->validate(request(), [ $this->validate(request(), [
'channel_id' => 'required|numeric', 'channel_id' => 'required|numeric',
'code' => 'required|string|unique:tax_categories,code', 'code' => 'required|string|unique:tax_categories,code',
'name' => 'required|string', 'name' => 'required|string',
'description' => 'required|string', 'description' => 'required|string',
'taxrates' => 'array|required' 'taxrates' => 'array|required'
]); ]);
Event::dispatch('tax.tax_category.create.before'); Event::dispatch('tax.tax_category.create.before');
@ -118,11 +118,11 @@ class TaxCategoryController extends Controller
public function update($id) public function update($id)
{ {
$this->validate(request(), [ $this->validate(request(), [
'channel_id' => 'required|numeric', 'channel_id' => 'required|numeric',
'code' => 'required|string|unique:tax_categories,code,' . $id, 'code' => 'required|string|unique:tax_categories,code,' . $id,
'name' => 'required|string', 'name' => 'required|string',
'description' => 'required|string', 'description' => 'required|string',
'taxrates' => 'array|required' 'taxrates' => 'array|required'
]); ]);
$data = request()->input(); $data = request()->input();

39
packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
View File

@ -73,18 +73,19 @@ class TaxRateController extends Controller
{ {
$this->validate(request(), [ $this->validate(request(), [
'identifier' => 'required|string|unique:tax_rates,identifier', 'identifier' => 'required|string|unique:tax_rates,identifier',
'is_zip' => 'sometimes', 'is_zip' => 'sometimes',
'zip_code' => 'sometimes|required_without:is_zip', 'zip_code' => 'sometimes|required_without:is_zip',
'zip_from' => 'nullable|required_with:is_zip', 'zip_from' => 'nullable|required_with:is_zip',
'zip_to' => 'nullable|required_with:is_zip,zip_from', 'zip_to' => 'nullable|required_with:is_zip,zip_from',
'country' => 'required|string', 'country' => 'required|string',
'tax_rate' => 'required|numeric|min:0.0001' 'tax_rate' => 'required|numeric|min:0.0001'
]); ]);
$data = request()->all(); $data = request()->all();
if (isset($data['is_zip'])) { if (isset($data['is_zip'])) {
$data['is_zip'] = 1; $data['is_zip'] = 1;
unset($data['zip_code']); unset($data['zip_code']);
} }
@ -121,11 +122,11 @@ class TaxRateController extends Controller
{ {
$this->validate(request(), [ $this->validate(request(), [
'identifier' => 'required|string|unique:tax_rates,identifier,'.$id, 'identifier' => 'required|string|unique:tax_rates,identifier,'.$id,
'is_zip' => 'sometimes', 'is_zip' => 'sometimes',
'zip_from' => 'nullable|required_with:is_zip', 'zip_from' => 'nullable|required_with:is_zip',
'zip_to' => 'nullable|required_with:is_zip,zip_from', 'zip_to' => 'nullable|required_with:is_zip,zip_from',
'country' => 'required|string', 'country' => 'required|string',
'tax_rate' => 'required|numeric|min:0.0001' 'tax_rate' => 'required|numeric|min:0.0001'
]); ]);
Event::dispatch('tax.tax_rate.update.before', $id); Event::dispatch('tax.tax_rate.update.before', $id);
@ -184,19 +185,19 @@ class TaxRateController extends Controller
foreach ($excelData as $data) { foreach ($excelData as $data) {
foreach ($data as $column => $uploadData) { foreach ($data as $column => $uploadData) {
if (!is_null($uploadData['zip_from']) && !is_null($uploadData['zip_to'])) { if (! is_null($uploadData['zip_from']) && !is_null($uploadData['zip_to'])) {
$uploadData['is_zip'] = 1; $uploadData['is_zip'] = 1;
} }
$validator = Validator::make($uploadData, [ $validator = Validator::make($uploadData, [
'identifier' => 'required|string', 'identifier' => 'required|string',
'state' => 'required|string', 'state' => 'required|string',
'country' => 'required|string', 'country' => 'required|string',
'tax_rate' => 'required|numeric|min:0.0001', 'tax_rate' => 'required|numeric|min:0.0001',
'is_zip' => 'sometimes', 'is_zip' => 'sometimes',
'zip_code' => 'sometimes|required_without:is_zip', 'zip_code' => 'sometimes|required_without:is_zip',
'zip_from' => 'nullable|required_with:is_zip', 'zip_from' => 'nullable|required_with:is_zip',
'zip_to' => 'nullable|required_with:is_zip,zip_from', 'zip_to' => 'nullable|required_with:is_zip,zip_from',
]); ]);
if ($validator->fails()) { if ($validator->fails()) {