From 8ee451b42f80bdab938e85ea5132e1fe4d826972 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 3 Jan 2017 15:53:49 +0200 Subject: [PATCH] Working on client numbers --- .../2017_01_01_214241_add_inclusive_taxes.php | 6 ++ resources/lang/en/texts.php | 3 +- .../views/accounts/invoice_settings.blade.php | 61 +++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/database/migrations/2017_01_01_214241_add_inclusive_taxes.php b/database/migrations/2017_01_01_214241_add_inclusive_taxes.php index 10102c283a82..7362191045ae 100644 --- a/database/migrations/2017_01_01_214241_add_inclusive_taxes.php +++ b/database/migrations/2017_01_01_214241_add_inclusive_taxes.php @@ -30,6 +30,9 @@ class AddInclusiveTaxes extends Migration { $table->dropColumn('bluevine_status'); $table->text('bcc_email')->nullable(); + $table->text('client_number_prefix')->nullable(); + $table->integer('client_number_counter')->default(0)->nullable(); + $table->text('client_number_pattern')->nullable(); }); } @@ -55,6 +58,9 @@ class AddInclusiveTaxes extends Migration { $table->enum('bluevine_status', ['ignored', 'signed_up'])->nullable(); $table->dropColumn('bcc_email'); + $table->dropColumn('client_number_prefix'); + $table->dropColumn('client_number_counter'); + $table->dropColumn('client_number_pattern'); }); } } diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index b1c4ab74ddd3..45bb29e24ee1 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2297,7 +2297,8 @@ $LANG = array( 'postal_city_state' => 'Postal/City/State', 'phantomjs_help' => 'In certain cases the app uses :link_phantom to generate the PDF, install :link_docs to generate it locally.', 'phantomjs_local' => 'Using local PhantomJS', - + 'client_number' => 'Client Number', + ); return $LANG; diff --git a/resources/views/accounts/invoice_settings.blade.php b/resources/views/accounts/invoice_settings.blade.php index e0aa228c8792..0cc8de90593f 100644 --- a/resources/views/accounts/invoice_settings.blade.php +++ b/resources/views/accounts/invoice_settings.blade.php @@ -41,6 +41,9 @@
  • {{ trans('texts.quote_number') }}
  • +
  • + {{ trans('texts.client_number') }} +
  • {{ trans('texts.recurring_invoice_number') }}
  • @@ -102,6 +105,41 @@ +
    +
    + @if ( ! $account->client_number_counter) + {!! Former::checkbox('client_number_enabled') + ->label('client_number') + ->onchange('onClientNumberChange()') + ->text('enable')!!} + + @endif +
    +
    @@ -339,6 +377,28 @@ } } + function onClientNumberTypeChange() { + var val = $('input[name=client_number_type]:checked').val() + if (val == 'prefix') { + $('.client-prefix').show(); + $('.client-pattern').hide(); + } else { + $('.client-prefix').hide(); + $('.client-pattern').show(); + } + } + + function onClientNumberChange() { + var enabled = $('#client_number_enabled').is(':checked'); + if (enabled) { + $('#clientNumberDiv').show(); + $('#client_number_counter').val(1); + } else { + $('#clientNumberDiv').hide(); + $('#client_number_counter').val(0); + } + } + $('.number-pattern .input-group-addon').click(function() { $('#patternHelpModal').modal('show'); }); @@ -347,6 +407,7 @@ setQuoteNumberEnabled(); onInvoiceNumberTypeChange(); onQuoteNumberTypeChange(); + onClientNumberTypeChange(); });