Skip to content

Commit

Permalink
Modals add selectors
Browse files Browse the repository at this point in the history
  • Loading branch information
@cuneytsenturk
cuneytsenturk committed Feb 9, 2019
1 parent 2455175 commit d61d16c
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 13 deletions.
10 changes: 9 additions & 1 deletion app/Http/Controllers/Modals/Categories.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,13 @@ public function create(CRequest $request)
{
$type = $request['type'];

$html = view('modals.categories.create', compact('currencies', 'type'))->render();
$category_selector = false;

if (request()->has('category_selector')) {
$category_selector = request()->get('category_selector');
}

$html = view('modals.categories.create', compact('currencies', 'type', 'category_selector'))->render();

return response()->json([
'success' => true,
Expand All @@ -49,6 +55,8 @@ public function create(CRequest $request)
*/
public function store(Request $request)
{
$request['enabled'] = 1;

$category = Category::create($request->all());

$message = trans('messages.success.added', ['type' => trans_choice('general.categories', 1)]);
Expand Down
10 changes: 9 additions & 1 deletion app/Http/Controllers/Modals/Customers.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,13 @@ public function create()
{
$currencies = Currency::enabled()->pluck('name', 'code');

$html = view('modals.customers.create', compact('currencies'))->render();
$customer_selector = false;

if (request()->has('customer_selector')) {
$customer_selector = request()->get('customer_selector');
}

$html = view('modals.customers.create', compact('currencies', 'customer_selector'))->render();

return response()->json([
'success' => true,
Expand All @@ -59,6 +65,8 @@ public function create()
*/
public function store(Request $request)
{
$request['enabled'] = 1;

$customer = Customer::create($request->all());

$message = trans('messages.success.added', ['type' => trans_choice('general.customers', 1)]);
Expand Down
10 changes: 9 additions & 1 deletion app/Http/Controllers/Modals/Vendors.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,13 @@ public function create()
{
$currencies = Currency::enabled()->pluck('name', 'code');

$html = view('modals.vendors.create', compact('currencies'))->render();
$vendor_selector = false;

if (request()->has('vendor_selector')) {
$vendor_selector = request()->get('vendor_selector');
}

$html = view('modals.vendors.create', compact('currencies', 'vendor_selector'))->render();

return response()->json([
'success' => true,
Expand All @@ -60,6 +66,8 @@ public function create()
*/
public function store(Request $request)
{
$request['enabled'] = 1;

$vendor = Vendor::create($request->all());

// Upload logo
Expand Down
11 changes: 9 additions & 2 deletions resources/views/modals/categories/create.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,15 @@
$('#modal-create-category').modal('hide');
$("#category_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$("#category_id").select2('refresh');
$('#category_id').append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$('#category_id').trigger('change');
$('#category_id').select2('refresh');
@if ($category_selector)
$('{{ $category_selector }}').append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$('{{ $category_selector }}').trigger('change');
$('{{ $category_selector }}').select2('refresh');
@endif
},
error: function(error, textStatus, errorThrown) {
$('#span-loading').remove();
Expand Down
10 changes: 8 additions & 2 deletions resources/views/modals/customers/create.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,15 @@
$('#modal-create-customer').modal('hide');
$("#customer_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$('#customer_id').append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$('#customer_id').trigger('change');
$("#customer_id").select2('refresh');
$('#customer_id').select2('refresh');
@if ($customer_selector)
$('{{ $customer_selector }}').append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$('{{ $customer_selector }}').trigger('change');
$('{{ $customer_selector }}').select2('refresh');
@endif
},
error: function(error, textStatus, errorThrown) {
$('#span-loading').remove();
Expand Down
8 changes: 4 additions & 4 deletions resources/views/modals/taxes/create.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@
$('#modal-create-tax').modal('hide');
$("#tax_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$('#tax_id').append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$('#tax_id').trigger('change');
$("#tax_id").select2('refresh');
$('#tax_id').select2('refresh');
@if ($tax_selector)
$("{{ $tax_selector }}").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$('{{ $tax_selector }}').append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$('{{ $tax_selector }}').trigger('change');
$("{{ $tax_selector }}").select2('refresh');
$('{{ $tax_selector }}').select2('refresh');
@endif
},
error: function(error, textStatus, errorThrown) {
Expand Down
10 changes: 8 additions & 2 deletions resources/views/modals/vendors/create.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,15 @@
$('#modal-create-vendor').modal('hide');
$("#vendor_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$('#vendor_id').append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$('#vendor_id').trigger('change');
$("#vendor_id").select2('refresh');
$('#vendor_id').select2('refresh');
@if ($vendor_selector)
$('{{ $vendor_selector }}').append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$('{{ $vendor_selector }}').trigger('change');
$('{{ $vendor_selector }}').select2('refresh');
@endif
},
error: function(error, textStatus, errorThrown) {
$('#span-loading').remove();
Expand Down

0 comments on commit d61d16c

Please sign in to comment.