From 3d569f315d8a6852ee9137386d4c2dcc98339006 Mon Sep 17 00:00:00 2001 From: Alfa Adhitya Date: Tue, 28 Nov 2017 14:24:37 +0700 Subject: [PATCH 1/6] fix overlapping content --- resources/views/expenses/bills/show.blade.php | 144 +++++++++--------- .../views/incomes/invoices/show.blade.php | 144 +++++++++--------- 2 files changed, 146 insertions(+), 142 deletions(-) diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php index 80047a964..5bbb139a5 100644 --- a/resources/views/expenses/bills/show.blade.php +++ b/resources/views/expenses/bills/show.blade.php @@ -170,89 +170,91 @@ -
-
-
-

{{ trans('bills.histories') }}

+
+
+
+
+

{{ trans('bills.histories') }}

-
- +
+ +
+
- -
-
-
- - - - - - - - - - @foreach($bill->histories as $history) +
+
+
{{ trans('general.date') }}{{ trans_choice('general.statuses', 1) }}{{ trans('general.description') }}
+ - - - + + + - @endforeach - -
{{ Date::parse($bill->created_at)->format($date_format) }}{{ $bill->status->name }}{{ $bill->description }}{{ trans('general.date') }}{{ trans_choice('general.statuses', 1) }}{{ trans('general.description') }}
+ + + @foreach($bill->histories as $history) + + {{ Date::parse($bill->created_at)->format($date_format) }} + {{ $bill->status->name }} + {{ $bill->description }} + + @endforeach + + +
-
-
-
-
-

{{ trans('bills.payments') }}

+
+
+
+

{{ trans('bills.payments') }}

-
- +
+ +
+
- -
-
-
- - - - - - - - - - - @foreach($bill->payments as $payment) +
+
+
{{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.accounts', 1) }}{{ trans('general.actions') }}
+ - - - - + + + + - @endforeach - -
{{ Date::parse($payment->paid_at)->format($date_format) }}@money($payment->amount, $payment->currency_code, true){{ $payment->account->name }} - - - {!! Form::open([ - 'id' => 'bill-payment-' . $payment->id, - 'method' => 'DELETE', - 'url' => ['expenses/bills/payment', $payment->id], - 'style' => 'display:inline' - ]) !!} - {!! Form::button(' ' . trans('general.delete'), array( - 'type' => 'button', - 'class' => 'btn btn-danger btn-xs', - 'title' => trans('general.delete'), - 'onclick' => 'confirmDelete("' . '#bill-payment-' . $payment->id . '", "' . trans_choice('general.payments', 2) . '", "' . trans('general.delete_confirm', ['name' => '' . Date::parse($payment->paid_at)->format($date_format) . ' - ' . money($payment->amount, $payment->currency_code, true) . ' - ' . $payment->account->name . '', 'type' => strtolower(trans_choice('general.revenues', 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")' - )) !!} - {!! Form::close() !!} - {{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.accounts', 1) }}{{ trans('general.actions') }}
+ + + @foreach($bill->payments as $payment) + + {{ Date::parse($payment->paid_at)->format($date_format) }} + @money($payment->amount, $payment->currency_code, true) + {{ $payment->account->name }} + + + + {!! Form::open([ + 'id' => 'bill-payment-' . $payment->id, + 'method' => 'DELETE', + 'url' => ['expenses/bills/payment', $payment->id], + 'style' => 'display:inline' + ]) !!} + {!! Form::button(' ' . trans('general.delete'), array( + 'type' => 'button', + 'class' => 'btn btn-danger btn-xs', + 'title' => trans('general.delete'), + 'onclick' => 'confirmDelete("' . '#bill-payment-' . $payment->id . '", "' . trans_choice('general.payments', 2) . '", "' . trans('general.delete_confirm', ['name' => '' . Date::parse($payment->paid_at)->format($date_format) . ' - ' . money($payment->amount, $payment->currency_code, true) . ' - ' . $payment->account->name . '', 'type' => strtolower(trans_choice('general.revenues', 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")' + )) !!} + {!! Form::close() !!} + + + @endforeach + + +
diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php index 7d88541a0..181487204 100644 --- a/resources/views/incomes/invoices/show.blade.php +++ b/resources/views/incomes/invoices/show.blade.php @@ -175,89 +175,91 @@
-
-
-
-

{{ trans('invoices.histories') }}

+
+
+
+
+

{{ trans('invoices.histories') }}

-
- +
+ +
+
- -
-
-
- - - - - - - - - - @foreach($invoice->histories as $history) +
+
+
{{ trans('general.date') }}{{ trans_choice('general.statuses', 1) }}{{ trans('general.description') }}
+ - - - + + + - @endforeach - -
{{ Date::parse($history->created_at)->format($date_format) }}{{ $history->status->name }}{{ $history->description }}{{ trans('general.date') }}{{ trans_choice('general.statuses', 1) }}{{ trans('general.description') }}
+ + + @foreach($invoice->histories as $history) + + {{ Date::parse($history->created_at)->format($date_format) }} + {{ $history->status->name }} + {{ $history->description }} + + @endforeach + + +
-
-
-
-
-

{{ trans('invoices.payments') }}

+
+
+
+

{{ trans('invoices.payments') }}

-
- +
+ +
+
- -
-
-
- - - - - - - - - - - @foreach($invoice->payments as $payment) +
+
+
{{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.accounts', 1) }}{{ trans('general.actions') }}
+ - - - - + + + + - @endforeach - -
{{ Date::parse($payment->paid_at)->format($date_format) }}@money($payment->amount, $payment->currency_code, true){{ $payment->account->name }} - - - {!! Form::open([ - 'id' => 'invoice-payment-' . $payment->id, - 'method' => 'DELETE', - 'url' => ['incomes/invoices/payment', $payment->id], - 'style' => 'display:inline' - ]) !!} - {!! Form::button(' ' . trans('general.delete'), array( - 'type' => 'button', - 'class' => 'btn btn-danger btn-xs', - 'title' => trans('general.delete'), - 'onclick' => 'confirmDelete("' . '#invoice-payment-' . $payment->id . '", "' . trans_choice('general.payments', 2) . '", "' . trans('general.delete_confirm', ['name' => '' . Date::parse($payment->paid_at)->format($date_format) . ' - ' . money($payment->amount, $payment->currency_code, true) . ' - ' . $payment->account->name . '', 'type' => strtolower(trans_choice('general.revenues', 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")' - )) !!} - {!! Form::close() !!} - {{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.accounts', 1) }}{{ trans('general.actions') }}
+ + + @foreach($invoice->payments as $payment) + + {{ Date::parse($payment->paid_at)->format($date_format) }} + @money($payment->amount, $payment->currency_code, true) + {{ $payment->account->name }} + + + + {!! Form::open([ + 'id' => 'invoice-payment-' . $payment->id, + 'method' => 'DELETE', + 'url' => ['incomes/invoices/payment', $payment->id], + 'style' => 'display:inline' + ]) !!} + {!! Form::button(' ' . trans('general.delete'), array( + 'type' => 'button', + 'class' => 'btn btn-danger btn-xs', + 'title' => trans('general.delete'), + 'onclick' => 'confirmDelete("' . '#invoice-payment-' . $payment->id . '", "' . trans_choice('general.payments', 2) . '", "' . trans('general.delete_confirm', ['name' => '' . Date::parse($payment->paid_at)->format($date_format) . ' - ' . money($payment->amount, $payment->currency_code, true) . ' - ' . $payment->account->name . '', 'type' => strtolower(trans_choice('general.revenues', 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")' + )) !!} + {!! Form::close() !!} + + + @endforeach + + +
From 42584aa357aca70143b9c38e13cd82f4254d58ad Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Wed, 29 Nov 2017 16:53:19 +0300 Subject: [PATCH 2/6] refs #101 forget category page fix :) --- resources/views/modules/tiles/index.blade.php | 44 ++++++++++--------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/resources/views/modules/tiles/index.blade.php b/resources/views/modules/tiles/index.blade.php index 48699aa62..498410f27 100644 --- a/resources/views/modules/tiles/index.blade.php +++ b/resources/views/modules/tiles/index.blade.php @@ -5,27 +5,29 @@ @section('content') @include('partials.modules.bar') -
-
-

{{ $title }}

-
- - @if ($modules) - @foreach ($modules as $module) - @include('partials.modules.item') - @endforeach - @else -
-
-

- {{ trans('modules.no_apps') }} -

-

- {!! trans('modules.developer') !!} -

-
- +
+
+
+

{{ $title }}

- @endif + + @if ($modules) + @foreach ($modules as $module) + @include('partials.modules.item') + @endforeach + @else +
+
+

+ {{ trans('modules.no_apps') }} +

+

+ {!! trans('modules.developer') !!} +

+
+ +
+ @endif +
@endsection \ No newline at end of file From 1e96c7ef6eb45e364f9c971c8aa603cb353d5fd2 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Wed, 29 Nov 2017 17:17:21 +0300 Subject: [PATCH 3/6] customer invoice page stylesheet --- .../Resources/lang/en-GB/offlinepayment.php | 3 +++ resources/views/customers/invoices/show.blade.php | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/OfflinePayment/Resources/lang/en-GB/offlinepayment.php b/modules/OfflinePayment/Resources/lang/en-GB/offlinepayment.php index 9b702ed82..541a5c57c 100644 --- a/modules/OfflinePayment/Resources/lang/en-GB/offlinepayment.php +++ b/modules/OfflinePayment/Resources/lang/en-GB/offlinepayment.php @@ -10,4 +10,7 @@ return [ 'order' => 'Order', 'payment_gateways' => 'Offline Payment Methods', + 'confirm' => 'Confirm', + 'loading' => 'Loading', + ]; diff --git a/resources/views/customers/invoices/show.blade.php b/resources/views/customers/invoices/show.blade.php index c4a9cf3be..f693346b7 100644 --- a/resources/views/customers/invoices/show.blade.php +++ b/resources/views/customers/invoices/show.blade.php @@ -142,17 +142,20 @@
-
+
  {{ trans('general.print') }}   {{ trans('general.download') }} +
+
@if($invoice->invoice_status_code != 'paid') @if ($payment_methods) - {!! Form::select('payment_method', $payment_methods, null, array_merge(['id' => 'payment-method', 'class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.payment_methods', 1)])])) !!} + {!! Form::select('payment_method', $payment_methods, null, array_merge(['id' => 'payment-method', 'class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.payment_methods', 1)])])) !!} + {!! Form::hidden('invoice_id', $invoice->id, []) !!} @else @endif @@ -179,13 +182,15 @@ data: $('.box-footer input, .box-footer select'), headers: { 'X-CSRF-TOKEN': '{{ csrf_token() }}' }, beforeSend: function() { + $('#confirm').html(''); + $('#confirm').append('
'); }, complete: function() { $('#loading').remove(); }, success: function(data) { - if (data['erorr']) { + if (data['error']) { } From f894e15451a075556e281f0fef6f082ef0cdc089 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Wed, 29 Nov 2017 19:37:16 +0300 Subject: [PATCH 4/6] Customer invoice payment method some fix --- app/Http/Controllers/Customers/Payments.php | 2 +- app/Utilities/Modules.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Customers/Payments.php b/app/Http/Controllers/Customers/Payments.php index f908a29e4..8ddadde3e 100644 --- a/app/Http/Controllers/Customers/Payments.php +++ b/app/Http/Controllers/Customers/Payments.php @@ -23,7 +23,7 @@ class Payments extends Controller { $payments = Payment::with(['account', 'category'])->where('customer_id', '=', Auth::user()->customer->id)->paginate(); - $payment_methods = Modules::getPaymentMethods(); + $payment_methods = Modules::getPaymentMethods('all'); $categories = collect(Category::enabled()->type('income')->pluck('name', 'id')) ->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), ''); diff --git a/app/Utilities/Modules.php b/app/Utilities/Modules.php index 9d773da17..f36adb8ce 100644 --- a/app/Utilities/Modules.php +++ b/app/Utilities/Modules.php @@ -11,14 +11,14 @@ use App\Events\PaymentGatewayListing; class Modules { - public static function getPaymentMethods() + public static function getPaymentMethods($type = null) { $payment_methods = Cache::get('payment_methods.admin'); $customer = auth()->user()->customer; - if ($customer) { + if ($customer && $type != 'all') { $payment_methods = Cache::get('payment_methods.customer'); } @@ -38,7 +38,7 @@ class Modules continue; } - if ($customer && empty($gateway['customer'])) { + if (($customer && empty($gateway['customer'])) && $type != 'all') { continue; } From 966deefc29c459e070876bcaca91ceb62a9e3f1d Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Wed, 29 Nov 2017 19:47:18 +0300 Subject: [PATCH 5/6] Customer partial some fixes. --- .../views/partials/customer/head.blade.php | 13 ++++++------- .../views/partials/customer/header.blade.php | 2 +- .../views/partials/customer/menu.blade.php | 11 ----------- .../partials/customer/pagination.blade.php | 18 ++++++++++++------ 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/resources/views/partials/customer/head.blade.php b/resources/views/partials/customer/head.blade.php index 6c155c1e2..b2bdc073b 100644 --- a/resources/views/partials/customer/head.blade.php +++ b/resources/views/partials/customer/head.blade.php @@ -19,19 +19,18 @@ @else - + @endif - - - - + + + - + @stack('css') @stack('stylesheet') @@ -60,7 +59,7 @@ - + @endpush diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php index 1d835d918..27c8ea6c2 100644 --- a/resources/views/incomes/invoices/create.blade.php +++ b/resources/views/incomes/invoices/create.blade.php @@ -8,7 +8,17 @@ {!! Form::open(['url' => 'incomes/invoices', 'files' => true, 'role' => 'form']) !!}
- {{ Form::selectGroup('customer_id', trans_choice('general.customers', 1), 'user', $customers) }} +
+ {!! Form::label('customer_id', trans_choice('general.customers', 1), ['class' => 'control-label']) !!} +
+
+ {!! Form::select('customer_id', $customers, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.customers', 1)])])) !!} + + + +
+ {!! $errors->first('customer_id', '

:message

') !!} +
{{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange', $currencies, setting('general.default_currency')) }} @@ -261,5 +271,112 @@ } }); } + + function createCustomer() { + $('#modal-create-customer').remove(); + + modal = ''; + + $('body').append(modal); + + $("#modal-create-customer #currency_code").select2({ + placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.currencies', 1)]) }}" + }); + + $('#modal-create-customer').modal('show'); + } + + $(document).on('click', '#button-create-customer', function (e) { + $.ajax({ + url: '{{ url("incomes/customers/customer") }}', + type: 'POST', + dataType: 'JSON', + data: $("#form-create-customer").serialize(), + beforeSend: function () { + $(".form-group").removeClass("has-error"); + $(".help-block").remove(); + }, + success: function(data) { + $('#modal-create-customer').modal('hide'); + + $("#customer_id").append(''); + $("#customer_id").select2('refresh'); + }, + error: function(error, textStatus, errorThrown) { + if (error.responseJSON.name) { + $("input[name='name']").parent().parent().addClass('has-error'); + $("input[name='name']").parent().after('

' + error.responseJSON.name + '

'); + } + + if (error.responseJSON.email) { + $("input[name='email']").parent().parent().addClass('has-error'); + $("input[name='email']").parent().after('

' + error.responseJSON.email + '

'); + } + + if (error.responseJSON.currency_code) { + $("select[name='currency_code']").parent().parent().addClass('has-error'); + $("select[name='currency_code']").parent().after('

' + error.responseJSON.currency_code + '

'); + } + } + }); + }); @endpush diff --git a/routes/web.php b/routes/web.php index 9cfa5a740..bd6435044 100644 --- a/routes/web.php +++ b/routes/web.php @@ -58,6 +58,7 @@ Route::group(['middleware' => 'language'], function () { Route::resource('revenues', 'Incomes\Revenues'); Route::get('customers/currency', 'Incomes\Customers@currency'); Route::get('customers/{customer}/duplicate', 'Incomes\Customers@duplicate'); + Route::post('customers/customer', 'Incomes\Customers@customer'); Route::resource('customers', 'Incomes\Customers'); }); @@ -73,6 +74,7 @@ Route::group(['middleware' => 'language'], function () { Route::resource('payments', 'Expenses\Payments'); Route::get('vendors/currency', 'Expenses\Vendors@currency'); Route::get('vendors/{vendor}/duplicate', 'Expenses\Vendors@duplicate'); + Route::post('vendors/vendor', 'Expenses\Vendors@vendor'); Route::resource('vendors', 'Expenses\Vendors'); });