From b80842759e0931a046985bcc54724b9ee2c57d9b Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 4 Jun 2015 23:53:58 +0300 Subject: [PATCH] Bug fixes --- app/Http/Controllers/InvoiceController.php | 38 ++++++++++- app/Http/Controllers/PaymentController.php | 2 +- app/Http/Middleware/StartupCheck.php | 2 +- app/Models/Account.php | 13 +++- app/Ninja/Repositories/InvoiceRepository.php | 3 +- app/Ninja/Repositories/PaymentRepository.php | 4 +- database/seeds/PaymentLibrariesSeeder.php | 1 + public/css/built.css | 13 +++- public/css/style.css | 13 +++- public/favicon.png | Bin 1689 -> 23455 bytes resources/lang/da/texts.php | 3 +- resources/lang/de/texts.php | 2 +- resources/lang/en/texts.php | 3 +- resources/lang/es/texts.php | 2 +- resources/lang/es_ES/texts.php | 2 +- resources/lang/fr/texts.php | 2 +- resources/lang/fr_CA/texts.php | 2 +- resources/lang/it/texts.php | 2 +- resources/lang/lt/texts.php | 2 +- resources/lang/nb_NO/texts.php | 2 +- resources/lang/nl/texts.php | 2 +- resources/lang/pt_BR/texts.php | 2 +- resources/lang/sv/texts.php | 2 +- .../views/accounts/account_gateway.blade.php | 4 +- resources/views/accounts/import_map.blade.php | 4 +- resources/views/accounts/product.blade.php | 4 +- resources/views/accounts/token.blade.php | 4 +- resources/views/clients/edit.blade.php | 2 +- resources/views/credits/edit.blade.php | 2 +- resources/views/invoices/edit.blade.php | 61 ++++-------------- resources/views/master.blade.php | 2 +- resources/views/payments/edit.blade.php | 2 +- resources/views/tasks/edit.blade.php | 6 +- resources/views/users/edit.blade.php | 4 +- 34 files changed, 119 insertions(+), 93 deletions(-) mode change 100755 => 100644 public/favicon.png diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 45f2bc91745c..4889144bea7c 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -13,6 +13,7 @@ use URL; use Datatable; use finfo; use Request; +use DropdownButton; use App\Models\Invoice; use App\Models\Invitation; use App\Models\Client; @@ -280,6 +281,40 @@ class InvoiceController extends BaseController $invoice->end_date = Utils::fromSqlDate($invoice->end_date); $invoice->is_pro = Auth::user()->isPro(); + $actions = [ + ['url' => 'javascript:onCloneClick()', 'label' => trans("texts.clone_{$entityType}")], + ['url' => URL::to("{$entityType}s/{$entityType}_history/{$invoice->public_id}"), 'label' => trans("texts.view_history")], + DropdownButton::DIVIDER + ]; + + if ($invoice->invoice_status_id < INVOICE_STATUS_SENT && !$invoice->is_recurring) { + $actions[] = ['url' => 'javascript:onMarkClick()', 'label' => trans("texts.mark_sent")]; + } + + if ($entityType == ENTITY_QUOTE) { + if ($invoice->quote_invoice_id) { + $actions[] = ['url' => URL::to("invoices/{$invoice->quote_invoice_id}/edit"), 'label' => trans("texts.view_invoice")]; + } else { + $actions[] = ['url' => 'javascript:onConvertClick()', 'label' => trans("texts.convert_to_invoice")]; + } + } elseif ($entityType == ENTITY_INVOICE) { + if ($invoice->quote_id) { + $actions[] = ['url' => URL::to("quotes/{$invoice->quote_id}/edit"), 'label' => trans("texts.view_quote")]; + } + + if (!$invoice->is_recurring && $invoice->balance > 0) { + $actions[] = ['url' => 'javascript:onPaymentClick()', 'label' => trans('texts.enter_payment')]; + } + } + + if (count($actions) > 3) { + $actions[] = DropdownButton::DIVIDER; + } + + $actions[] = ['url' => 'javascript:onArchiveClick()', 'label' => trans("texts.archive_{$entityType}")]; + $actions[] = ['url' => 'javascript:onDeleteClick()', 'label' => trans("texts.delete_{$entityType}")]; + + $data = array( 'entityType' => $entityType, 'showBreadcrumbs' => $clone, @@ -290,7 +325,8 @@ class InvoiceController extends BaseController 'invitationContactIds' => $contactIds, 'url' => $url, 'title' => trans("texts.edit_{$entityType}"), - 'client' => $invoice->client, ); + 'client' => $invoice->client, + 'actions' => $actions); $data = array_merge($data, self::getViewModel()); // Set the invitation link on the client's contacts diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 54767b089ec3..88dcf24aa6a7 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -90,7 +90,7 @@ class PaymentController extends BaseController } $table->addColumn('transaction_reference', function ($model) { return $model->transaction_reference ? $model->transaction_reference : 'Manual entry'; }) - ->addColumn('payment_type', function ($model) { return $model->payment_type ? $model->payment_type : ($model->account_gateway_id ? 'Online payment' : ''); }); + ->addColumn('payment_type', function ($model) { return $model->payment_type ? $model->payment_type : ($model->account_gateway_id ? $model->gateway_name : ''); }); return $table->addColumn('amount', function ($model) { return Utils::formatMoney($model->amount, $model->currency_id); }) ->addColumn('payment_date', function ($model) { return Utils::dateToString($model->payment_date); }) diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php index 6a4a38ce248d..557525355716 100644 --- a/app/Http/Middleware/StartupCheck.php +++ b/app/Http/Middleware/StartupCheck.php @@ -51,7 +51,7 @@ class StartupCheck 'countries' => 'App\Models\Country', ]; foreach ($cachedTables as $name => $class) { - if (!Cache::has($name)) { + if (Input::has('clear_cache') || !Cache::has($name)) { if ($name == 'paymentTerms') { $orderBy = 'num_days'; } elseif (in_array($name, ['currencies', 'sizes', 'industries', 'languages', 'countries'])) { diff --git a/app/Models/Account.php b/app/Models/Account.php index 3f159fffa286..31877bd31754 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -160,12 +160,19 @@ class Account extends Eloquent return $height; } - public function getNextInvoiceNumber($isQuote = false) + public function getNextInvoiceNumber($isQuote = false, $prefix = '') { $counter = $isQuote && !$this->share_counter ? $this->quote_number_counter : $this->invoice_number_counter; - $prefix = $isQuote ? $this->quote_number_prefix : $this->invoice_number_prefix; + $prefix .= $isQuote ? $this->quote_number_prefix : $this->invoice_number_prefix; + + // confirm the invoice number isn't already taken + do { + $number = $prefix.str_pad($counter, 4, "0", STR_PAD_LEFT); + $check = Invoice::scope()->whereInvoiceNumber($number)->withTrashed()->first(); + $counter++; + } while ($check); - return $prefix.str_pad($counter, 4, "0", STR_PAD_LEFT); + return $number; } public function incrementCounter($invoiceNumber, $isQuote = false, $isRecurring) diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php index 84707010d788..d8e680367449 100644 --- a/app/Ninja/Repositories/InvoiceRepository.php +++ b/app/Ninja/Repositories/InvoiceRepository.php @@ -465,7 +465,8 @@ class InvoiceRepository 'custom_value1', 'custom_value2', 'custom_taxes1', - 'custom_taxes2', ] as $field) { + 'custom_taxes2', + 'partial'] as $field) { $clone->$field = $invoice->$field; } diff --git a/app/Ninja/Repositories/PaymentRepository.php b/app/Ninja/Repositories/PaymentRepository.php index ae8dec5eb803..8c0a87839d68 100644 --- a/app/Ninja/Repositories/PaymentRepository.php +++ b/app/Ninja/Repositories/PaymentRepository.php @@ -15,11 +15,13 @@ class PaymentRepository ->join('invoices', 'invoices.id', '=', 'payments.invoice_id') ->join('contacts', 'contacts.client_id', '=', 'clients.id') ->leftJoin('payment_types', 'payment_types.id', '=', 'payments.payment_type_id') + ->leftJoin('account_gateways', 'account_gateways.id', '=', 'payments.account_gateway_id') + ->leftJoin('gateways', 'gateways.id', '=', 'account_gateways.gateway_id') ->where('payments.account_id', '=', \Auth::user()->account_id) ->where('clients.deleted_at', '=', null) ->where('contacts.is_primary', '=', true) ->where('contacts.deleted_at', '=', null) - ->select('payments.public_id', 'payments.transaction_reference', 'clients.name as client_name', 'clients.public_id as client_public_id', 'payments.amount', 'payments.payment_date', 'invoices.public_id as invoice_public_id', 'invoices.invoice_number', 'clients.currency_id', 'contacts.first_name', 'contacts.last_name', 'contacts.email', 'payment_types.name as payment_type', 'payments.account_gateway_id', 'payments.deleted_at', 'payments.is_deleted', 'invoices.is_deleted as invoice_is_deleted'); + ->select('payments.public_id', 'payments.transaction_reference', 'clients.name as client_name', 'clients.public_id as client_public_id', 'payments.amount', 'payments.payment_date', 'invoices.public_id as invoice_public_id', 'invoices.invoice_number', 'clients.currency_id', 'contacts.first_name', 'contacts.last_name', 'contacts.email', 'payment_types.name as payment_type', 'payments.account_gateway_id', 'payments.deleted_at', 'payments.is_deleted', 'invoices.is_deleted as invoice_is_deleted', 'gateways.name as gateway_name'); if (!\Session::get('show_trash:payment')) { $query->where('payments.deleted_at', '=', null) diff --git a/database/seeds/PaymentLibrariesSeeder.php b/database/seeds/PaymentLibrariesSeeder.php index c46a66bada24..b99e3ea000b7 100644 --- a/database/seeds/PaymentLibrariesSeeder.php +++ b/database/seeds/PaymentLibrariesSeeder.php @@ -65,6 +65,7 @@ class PaymentLibrariesSeeder extends Seeder ['name' => 'Guatemalan Quetzal', 'code' => 'GTQ', 'symbol' => 'Q', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'], ['name' => 'Malaysian Ringgit', 'code' => 'MYR', 'symbol' => 'RM', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'], ['name' => 'Brazilian Real', 'code' => 'BRL', 'symbol' => 'R$', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'], + ['name' => 'Thai baht', 'code' => 'THB', 'symbol' => 'THB ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'], ]; foreach ($currencies as $currency) { diff --git a/public/css/built.css b/public/css/built.css index f782f5b6df7a..7bd5397d5e99 100644 --- a/public/css/built.css +++ b/public/css/built.css @@ -2449,6 +2449,9 @@ table.dataTable thead > tr > th, table.invoice-table thead > tr > th { background-color: #e37329 !important; color:#fff; } +table.dataTable tr:hover { + background-color: #f0f9ff !important; +} th:first-child { border-radius: 3px 0 0 0; border-left: none; @@ -2467,7 +2470,7 @@ border-bottom: 1px solid #dfe0e1; table.dataTable.no-footer { border-bottom: none; } -.table-striped>tbody>tr:nth-child(odd)>td, +.table-striped>tbody>tr:nth-child(odd)>tr, .table-striped>tbody>tr:nth-child(odd)>th { background-color: #FDFDFD; } @@ -2617,7 +2620,11 @@ margin-left: 0px; .btn-primary i{ border-color: #0b4d78; } -.form-actions .btn { margin-left: 10px; } + +.form-actions .btn, +.form-actions div.btn-group { + margin-left: 10px; +} .form-actions .btn.btn-success:first-child { margin-left: 10px !important; @@ -2863,7 +2870,7 @@ background-clip: padding-box; .dashboard .panel-body {padding: 0;} .dashboard .table-striped>tbody>tr>td, .table-striped>tbody>tr>th { background-color: #fbfbfb;} -.dashboard .table-striped>tbody>tr:nth-child(odd)>td, .table-striped>tbody>tr:nth-child(odd)>th { +.dashboard .table-striped>tbody>tr:nth-child(odd)>tr, .table-striped>tbody>tr:nth-child(odd)>th { background-color: #fff; } .dashboard th { diff --git a/public/css/style.css b/public/css/style.css index 0c8e5e6bd3c2..a7c7ecc103f1 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -65,6 +65,9 @@ table.dataTable thead > tr > th, table.invoice-table thead > tr > th { background-color: #e37329 !important; color:#fff; } +table.dataTable tr:hover { + background-color: #f0f9ff !important; +} th:first-child { border-radius: 3px 0 0 0; border-left: none; @@ -83,7 +86,7 @@ border-bottom: 1px solid #dfe0e1; table.dataTable.no-footer { border-bottom: none; } -.table-striped>tbody>tr:nth-child(odd)>td, +.table-striped>tbody>tr:nth-child(odd)>tr, .table-striped>tbody>tr:nth-child(odd)>th { background-color: #FDFDFD; } @@ -233,7 +236,11 @@ margin-left: 0px; .btn-primary i{ border-color: #0b4d78; } -.form-actions .btn { margin-left: 10px; } + +.form-actions .btn, +.form-actions div.btn-group { + margin-left: 10px; +} .form-actions .btn.btn-success:first-child { margin-left: 10px !important; @@ -479,7 +486,7 @@ background-clip: padding-box; .dashboard .panel-body {padding: 0;} .dashboard .table-striped>tbody>tr>td, .table-striped>tbody>tr>th { background-color: #fbfbfb;} -.dashboard .table-striped>tbody>tr:nth-child(odd)>td, .table-striped>tbody>tr:nth-child(odd)>th { +.dashboard .table-striped>tbody>tr:nth-child(odd)>tr, .table-striped>tbody>tr:nth-child(odd)>th { background-color: #fff; } .dashboard th { diff --git a/public/favicon.png b/public/favicon.png old mode 100755 new mode 100644 index be1df9c3beefb1efab6ee9852eaf05f6bfffdbf2..41739df6c3c709617e330e3e3b276a5181e8904f GIT binary patch literal 23455 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 acK!wb-+&QbE>?&D0000 'Dwolla', 'gateway_help_43' => ':link to sign up for Dwolla.', 'partial_value' => 'Must be greater than zero and less than the total', - + 'more_actions' => 'More Actions', + ); diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php index 8d6c2afbad1c..5dba358e2255 100644 --- a/resources/lang/de/texts.php +++ b/resources/lang/de/texts.php @@ -667,6 +667,6 @@ return array( 'payment_type_dwolla' => 'Dwolla', 'gateway_help_43' => ':link to sign up for Dwolla.', 'partial_value' => 'Must be greater than zero and less than the total', - + 'more_actions' => 'More Actions', ); \ No newline at end of file diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 6ca02ab69c18..92dca9e3b971 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -443,7 +443,7 @@ return array( 'share_invoice_counter' => 'Share invoice counter', 'invoice_issued_to' => 'Invoice issued to', 'invalid_counter' => 'To prevent a possible conflict please set either an invoice or quote number prefix', - 'mark_sent' => 'Mark sent', + 'mark_sent' => 'Mark Sent', 'gateway_help_1' => ':link to sign up for Authorize.net.', 'gateway_help_2' => ':link to sign up for Authorize.net.', @@ -674,5 +674,6 @@ return array( 'payment_type_dwolla' => 'Dwolla', 'gateway_help_43' => ':link to sign up for Dwolla.', 'partial_value' => 'Must be greater than zero and less than the total', + 'more_actions' => 'More Actions', ); diff --git a/resources/lang/es/texts.php b/resources/lang/es/texts.php index a09863880c46..0d018879a04f 100644 --- a/resources/lang/es/texts.php +++ b/resources/lang/es/texts.php @@ -646,6 +646,6 @@ return array( 'payment_type_dwolla' => 'Dwolla', 'gateway_help_43' => ':link to sign up for Dwolla.', 'partial_value' => 'Must be greater than zero and less than the total', - + 'more_actions' => 'More Actions', ); \ No newline at end of file diff --git a/resources/lang/es_ES/texts.php b/resources/lang/es_ES/texts.php index 906882c00511..2e67ec47b61b 100644 --- a/resources/lang/es_ES/texts.php +++ b/resources/lang/es_ES/texts.php @@ -675,6 +675,6 @@ return array( 'payment_type_dwolla' => 'Dwolla', 'gateway_help_43' => ':link to sign up for Dwolla.', 'partial_value' => 'Must be greater than zero and less than the total', - + 'more_actions' => 'More Actions', ); \ No newline at end of file diff --git a/resources/lang/fr/texts.php b/resources/lang/fr/texts.php index 4b359e9fc5ad..879b5f8739d6 100644 --- a/resources/lang/fr/texts.php +++ b/resources/lang/fr/texts.php @@ -667,6 +667,6 @@ return array( 'payment_type_dwolla' => 'Dwolla', 'gateway_help_43' => ':link to sign up for Dwolla.', 'partial_value' => 'Must be greater than zero and less than the total', - + 'more_actions' => 'More Actions', ); \ No newline at end of file diff --git a/resources/lang/fr_CA/texts.php b/resources/lang/fr_CA/texts.php index d40f341e16f0..915db3d8670e 100644 --- a/resources/lang/fr_CA/texts.php +++ b/resources/lang/fr_CA/texts.php @@ -667,6 +667,6 @@ return array( 'payment_type_dwolla' => 'Dwolla', 'gateway_help_43' => ':link to sign up for Dwolla.', 'partial_value' => 'Must be greater than zero and less than the total', - + 'more_actions' => 'More Actions', ); diff --git a/resources/lang/it/texts.php b/resources/lang/it/texts.php index c7ef580fc29e..fa4f842e1838 100644 --- a/resources/lang/it/texts.php +++ b/resources/lang/it/texts.php @@ -669,6 +669,6 @@ return array( 'payment_type_dwolla' => 'Dwolla', 'gateway_help_43' => ':link to sign up for Dwolla.', 'partial_value' => 'Must be greater than zero and less than the total', - + 'more_actions' => 'More Actions', ); diff --git a/resources/lang/lt/texts.php b/resources/lang/lt/texts.php index 3a0796f3aa65..8d5a878e2eff 100644 --- a/resources/lang/lt/texts.php +++ b/resources/lang/lt/texts.php @@ -677,7 +677,7 @@ return array( 'payment_type_dwolla' => 'Dwolla', 'gateway_help_43' => ':link to sign up for Dwolla.', 'partial_value' => 'Must be greater than zero and less than the total', - + 'more_actions' => 'More Actions', ); diff --git a/resources/lang/nb_NO/texts.php b/resources/lang/nb_NO/texts.php index 400db9ece8ef..c39965dad0d0 100644 --- a/resources/lang/nb_NO/texts.php +++ b/resources/lang/nb_NO/texts.php @@ -675,6 +675,6 @@ return array( 'payment_type_dwolla' => 'Dwolla', 'gateway_help_43' => ':link to sign up for Dwolla.', 'partial_value' => 'Must be greater than zero and less than the total', - + 'more_actions' => 'More Actions', ); \ No newline at end of file diff --git a/resources/lang/nl/texts.php b/resources/lang/nl/texts.php index a8133525c13d..547529e40331 100644 --- a/resources/lang/nl/texts.php +++ b/resources/lang/nl/texts.php @@ -670,6 +670,6 @@ return array( 'payment_type_dwolla' => 'Dwolla', 'gateway_help_43' => ':link to sign up for Dwolla.', 'partial_value' => 'Must be greater than zero and less than the total', - + 'more_actions' => 'More Actions', ); diff --git a/resources/lang/pt_BR/texts.php b/resources/lang/pt_BR/texts.php index aa3ab32d4c77..1a59edcd374e 100644 --- a/resources/lang/pt_BR/texts.php +++ b/resources/lang/pt_BR/texts.php @@ -670,6 +670,6 @@ return array( 'payment_type_dwolla' => 'Dwolla', 'gateway_help_43' => ':link to sign up for Dwolla.', 'partial_value' => 'Must be greater than zero and less than the total', - + 'more_actions' => 'More Actions', ); diff --git a/resources/lang/sv/texts.php b/resources/lang/sv/texts.php index 7943caadaa11..477355e8511b 100644 --- a/resources/lang/sv/texts.php +++ b/resources/lang/sv/texts.php @@ -673,6 +673,6 @@ return array( 'payment_type_dwolla' => 'Dwolla', 'gateway_help_43' => ':link to sign up for Dwolla.', 'partial_value' => 'Must be greater than zero and less than the total', - + 'more_actions' => 'More Actions', ); diff --git a/resources/views/accounts/account_gateway.blade.php b/resources/views/accounts/account_gateway.blade.php index a82e5a915214..13d6cd337e27 100644 --- a/resources/views/accounts/account_gateway.blade.php +++ b/resources/views/accounts/account_gateway.blade.php @@ -90,8 +90,8 @@

 

{!! Former::actions( - Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk')), - $countGateways > 0 ? Button::normal(trans('texts.cancel'))->large()->asLinkTo(URL::to('/company/payments'))->appendIcon(Icon::create('remove-circle')) : false) !!} + $countGateways > 0 ? Button::normal(trans('texts.cancel'))->large()->asLinkTo(URL::to('/company/payments'))->appendIcon(Icon::create('remove-circle')) : false, + Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk'))) !!} {!! Former::close() !!} diff --git a/resources/views/accounts/import_map.blade.php b/resources/views/accounts/import_map.blade.php index 5a1a1df2e4d2..c2c15591449f 100644 --- a/resources/views/accounts/import_map.blade.php +++ b/resources/views/accounts/import_map.blade.php @@ -46,8 +46,8 @@ {!! Former::actions( - Button::success(trans('texts.import'))->submit()->large()->appendIcon(Icon::create('floppy-disk')), - Button::normal(trans('texts.cancel'))->large()->asLinkTo(URL::to('/company/import_export'))->appendIcon(Icon::create('remove-circle'))) !!} + Button::normal(trans('texts.cancel'))->large()->asLinkTo(URL::to('/company/import_export'))->appendIcon(Icon::create('remove-circle')), + Button::success(trans('texts.import'))->submit()->large()->appendIcon(Icon::create('floppy-disk'))) !!} {!! Former::close() !!}

- {!! Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk')) !!} {!! Button::normal(trans('texts.cancel'))->large()->asLinkTo(URL::to('/clients/' . ($client ? $client->public_id : '')))->appendIcon(Icon::create('remove-circle')) !!} + {!! Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk')) !!}
{!! Former::close() !!} diff --git a/resources/views/credits/edit.blade.php b/resources/views/credits/edit.blade.php index d1e7d2b734de..3cb86b89fed9 100644 --- a/resources/views/credits/edit.blade.php +++ b/resources/views/credits/edit.blade.php @@ -27,8 +27,8 @@
- {!! Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk')) !!} {!! Button::normal(trans('texts.cancel'))->large()->asLinkTo(URL::to('/credits'))->appendIcon(Icon::create('remove-circle')) !!} + {!! Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk')) !!}
{!! Former::close() !!} diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php index 3f1faa16d5ba..2660b9e9c460 100644 --- a/resources/views/invoices/edit.blade.php +++ b/resources/views/invoices/edit.blade.php @@ -333,52 +333,19 @@ {!! Button::primary(trans('texts.download_pdf'))->withAttributes(array('onclick' => 'onDownloadClick()'))->appendIcon(Icon::create('download-alt')) !!} @if (!$invoice || (!$invoice->trashed() && !$invoice->client->trashed())) - @if ($invoice && $invoice->id) -
- - - -
- - @else - {!! Button::success(trans("texts.save_{$entityType}"))->withAttributes(array('id' => 'saveButton', 'onclick' => 'onSaveClick()'))->appendIcon(Icon::create('floppy-disk')) !!} - @endif + {!! Button::success(trans("texts.save_{$entityType}"))->withAttributes(array('id' => 'saveButton', 'onclick' => 'onSaveClick()'))->appendIcon(Icon::create('floppy-disk')) !!} @if (!$invoice || ($invoice && !$invoice->is_recurring)) - {!! Button::normal(trans("texts.email_{$entityType}"))->withAttributes(array('id' => 'email_button', 'onclick' => 'onEmailClick()'))->appendIcon(Icon::create('send')) !!} + {!! Button::info(trans("texts.email_{$entityType}"))->withAttributes(array('id' => 'email_button', 'onclick' => 'onEmailClick()'))->appendIcon(Icon::create('send')) !!} @endif - @if ($invoice && $invoice->id && $entityType == ENTITY_INVOICE && !$invoice->is_recurring && $invoice->balance > 0) - {!! Button::primary(trans('texts.enter_payment'))->withAttributes(array('onclick' => 'onPaymentClick()'))->appendIcon(Icon::create('usd')) !!} - @endif + @if ($invoice && $invoice->id) + {!! DropdownButton::normal(trans('texts.more_actions')) + ->withContents($actions) + ->dropup() !!} + @endif + @elseif ($invoice && $invoice->trashed() && !$invoice->is_deleted == '1') {!! Button::success(trans('texts.restore'))->withAttributes(['onclick' => 'submitAction("restore")'])->appendIcon(Icon::create('cloud-download')) !!} @endif @@ -664,10 +631,6 @@ onPaymentClick(); }); - $('#primaryActions > button:first').click(function() { - onSaveClick(); - }); - $('label.radio').addClass('radio-inline'); applyComboboxListeners(); @@ -723,10 +686,10 @@ @if (!$invoice) if (!invoice.terms) { - invoice.terms = wordWrapText('{{ str_replace(["\r\n","\r","\n"], '\n', addslashes($account->invoice_terms)) }}', 300); + invoice.terms = wordWrapText('{!! str_replace(["\r\n","\r","\n"], '\n', addslashes($account->invoice_terms)) !!}', 300); } if (!invoice.invoice_footer) { - invoice.invoice_footer = wordWrapText('{{ str_replace(["\r\n","\r","\n"], '\n', addslashes($account->invoice_footer)) }}', 600); + invoice.invoice_footer = wordWrapText('{!! str_replace(["\r\n","\r","\n"], '\n', addslashes($account->invoice_footer)) !!}', 600); } @endif @@ -1129,10 +1092,10 @@ self.frequency_id = ko.observable(''); //self.currency_id = ko.observable({{ $client && $client->currency_id ? $client->currency_id : Session::get(SESSION_CURRENCY) }}); self.terms = ko.observable(''); - self.default_terms = ko.observable({{ !$invoice && $account->invoice_terms ? 'true' : 'false' }} ? wordWrapText('{{ str_replace(["\r\n","\r","\n"], '\n', addslashes($account->invoice_terms)) }}', 300) : ''); + self.default_terms = ko.observable({{ !$invoice && $account->invoice_terms ? 'true' : 'false' }} ? wordWrapText('{!! str_replace(["\r\n","\r","\n"], '\n', addslashes($account->invoice_terms)) !!}', 300) : ''); self.set_default_terms = ko.observable(false); self.invoice_footer = ko.observable(''); - self.default_footer = ko.observable({{ !$invoice && $account->invoice_footer ? 'true' : 'false' }} ? wordWrapText('{{ str_replace(["\r\n","\r","\n"], '\n', addslashes($account->invoice_footer)) }}', 600) : ''); + self.default_footer = ko.observable({{ !$invoice && $account->invoice_footer ? 'true' : 'false' }} ? wordWrapText('{!! str_replace(["\r\n","\r","\n"], '\n', addslashes($account->invoice_footer)) !!}', 600) : ''); self.set_default_footer = ko.observable(false); self.public_notes = ko.observable(''); self.po_number = ko.observable(''); diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php index d494e2acddee..9d6d07c489f1 100644 --- a/resources/views/master.blade.php +++ b/resources/views/master.blade.php @@ -20,7 +20,7 @@ - + diff --git a/resources/views/payments/edit.blade.php b/resources/views/payments/edit.blade.php index 0d402c95145f..26b3862831a4 100644 --- a/resources/views/payments/edit.blade.php +++ b/resources/views/payments/edit.blade.php @@ -38,8 +38,8 @@
+ {!! Button::normal(trans('texts.cancel'))->appendIcon(Icon::create('remove-circle'))->asLinkTo(URL::to('/payments'))->large() !!} {!! Button::success(trans('texts.save'))->appendIcon(Icon::create('floppy-disk'))->submit()->large() !!} - {!! Button::withValue(trans('texts.cancel'))->appendIcon(Icon::create('remove-circle'))->asLinkTo(URL::to('/payments'))->large() !!}
{!! Former::close() !!} diff --git a/resources/views/tasks/edit.blade.php b/resources/views/tasks/edit.blade.php index 660336e5394a..703b36ec4e1a 100644 --- a/resources/views/tasks/edit.blade.php +++ b/resources/views/tasks/edit.blade.php @@ -112,13 +112,13 @@ {!! Button::success(trans('texts.save'))->large()->appendIcon(Icon::create('floppy-disk'))->withAttributes(['id' => 'save-button']) !!} {!! Button::primary(trans('texts.stop'))->large()->appendIcon(Icon::create('stop'))->withAttributes(['id' => 'stop-button']) !!} @else + {!! Button::normal(trans('texts.cancel'))->large()->asLinkTo(URL::to('/tasks'))->appendIcon(Icon::create('remove-circle')) !!} @if ($task) {!! Button::success(trans('texts.save'))->large()->appendIcon(Icon::create('floppy-disk'))->withAttributes(['id' => 'save-button']) !!} @else {!! Button::success(trans('texts.start'))->large()->appendIcon(Icon::create('play'))->withAttributes(['id' => 'start-button']) !!} {!! Button::success(trans('texts.save'))->large()->appendIcon(Icon::create('floppy-disk'))->withAttributes(['id' => 'save-button', 'style' => 'display:none']) !!} @endif - {!! Button::normal(trans('texts.cancel'))->large()->asLinkTo(URL::to('/tasks'))->appendIcon(Icon::create('remove-circle')) !!} @endif @@ -201,7 +201,7 @@ $('#start_hours').val((date.getHours() % 12) || 12); $('#start_minutes').val(date.getMinutes()); $('#start_seconds').val(date.getSeconds()); - $('#start_ampm').val(date.getHours() > 12 ? 'PM' : 'AM'); + $('#start_ampm').val(date.getHours() >= 12 ? 'PM' : 'AM'); @endif @if (!$task && !$clientPublicId) @@ -212,7 +212,7 @@ $('input[type=radio').change(function(event) { var val = $(event.target).val(); - if (val == 'now') { + if (val == 'timer') { $('#datetime-details').hide(); } else { $('#datetime-details').fadeIn(); diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 4d2327270267..ac7c621e2260 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -28,8 +28,8 @@ {!! Former::actions( - Button::success(trans($user && $user->confirmed ? 'texts.save' : 'texts.send_invite'))->submit()->large()->appendIcon(Icon::create($user && $user->confirmed ? 'floppy-disk' : 'send')), - Button::normal(trans('texts.cancel'))->asLinkTo(URL::to('/company/advanced_settings/user_management'))->appendIcon(Icon::create('remove-circle'))->large() + Button::normal(trans('texts.cancel'))->asLinkTo(URL::to('/company/advanced_settings/user_management'))->appendIcon(Icon::create('remove-circle'))->large(), + Button::success(trans($user && $user->confirmed ? 'texts.save' : 'texts.send_invite'))->submit()->large()->appendIcon(Icon::create($user && $user->confirmed ? 'floppy-disk' : 'send')) )!!} {!! Former::close() !!}