diff --git a/public/css/custom.css b/public/css/custom.css index ddeeec072..74313b6e3 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -236,11 +236,6 @@ button:focus } /*--------Form Group Finish--------*/ -.item-action -{ - padding-left: 21px !important; -} - /*--Long Texts--*/ .long-texts { diff --git a/resources/views/purchases/bills/create.blade.php b/resources/views/purchases/bills/create.blade.php index dd520c6db..ef2c051b4 100644 --- a/resources/views/purchases/bills/create.blade.php +++ b/resources/views/purchases/bills/create.blade.php @@ -29,34 +29,34 @@ {{ Form::textGroup('order_number', trans('bills.order_number'), 'shopping-cart',[]) }} -
+
{!! Form::label('items', trans_choice('general.items', 2), ['class' => 'form-control-label']) !!}
- + @stack('actions_th_start') - + @stack('actions_th_end') @stack('name_th_start') - + @stack('name_th_end') @stack('quantity_th_start') - + @stack('quantity_th_end') @stack('price_th_start') - + @stack('price_th_end') @stack('taxes_th_start') - + @stack('taxes_th_end') @stack('total_th_start') - + @stack('total_th_end') @@ -65,20 +65,20 @@ @stack('add_item_td_start') - - + @stack('add_item_td_end') @stack('sub_total_td_start') - - - - - - - -
{{ trans('general.actions') }}{{ trans('general.actions') }}{{ trans('general.name') }}{{ trans('general.name') }}{{ trans('bills.quantity') }}{{ trans('bills.quantity') }}{{ trans('bills.price') }}{{ trans('bills.price') }}{{ trans_choice('general.taxes', 1) }}{{ trans_choice('general.taxes', 1) }}{{ trans('bills.total') }}{{ trans('bills.total') }}
+
+ {{ trans('bills.sub_total') }} + {{ Form::moneyGroup('sub_total', '', '', ['disabled' => 'disabled', 'required' => 'required', 'v-model' => 'totals.sub', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }} @money(0, $currency->code, true) @@ -88,7 +88,7 @@ @stack('add_discount_td_start')
+ + {{ Form::moneyGroup('discount_total', '', '', ['disabled' => 'disabled', 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }} @money(0, $currency->code, true) @@ -140,10 +140,10 @@ @stack('tax_total_td_start')
+ {{ trans_choice('general.taxes', 1) }} + {{ Form::moneyGroup('tax_total', '', '', ['disabled' => 'disabled', 'required' => 'required', 'v-model' => 'totals.tax', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }} @money(0, $currency->code, true) @@ -153,10 +153,10 @@ @stack('grand_total_td_start')
+ {{ trans('bills.total') }} + {{ Form::moneyGroup('grand_total', '', '', ['disabled' => 'disabled', 'required' => 'required', 'v-model' => 'totals.total', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }} @money(0, $currency->code, true) diff --git a/resources/views/purchases/bills/edit.blade.php b/resources/views/purchases/bills/edit.blade.php index 94c11fea8..5cc4d6e74 100644 --- a/resources/views/purchases/bills/edit.blade.php +++ b/resources/views/purchases/bills/edit.blade.php @@ -30,34 +30,34 @@ {{ Form::textGroup('order_number', trans('bills.order_number'), 'shopping-cart',[]) }} -
+
{!! Form::label('items', trans_choice('general.items', 2), ['class' => 'control-label']) !!}
- + @stack('actions_th_start') - + @stack('actions_th_end') @stack('name_th_start') - + @stack('name_th_end') @stack('quantity_th_start') - + @stack('quantity_th_end') @stack('price_th_start') - + @stack('price_th_end') @stack('taxes_th_start') - + @stack('taxes_th_end') @stack('total_th_start') - + @stack('total_th_end') @@ -66,20 +66,20 @@ @stack('add_item_td_start') - - + @stack('add_item_td_end') @stack('sub_total_td_start') - - - - - - - - @stack('actions_td_start') -
{{ trans('general.actions') }}{{ trans('general.actions') }}{{ trans('general.name') }}{{ trans('general.name') }}{{ trans('bills.quantity') }}{{ trans('bills.quantity') }}{{ trans('bills.price') }}{{ trans('bills.price') }}{{ trans_choice('general.taxes', 1) }}{{ trans_choice('general.taxes', 1) }}{{ trans('bills.total') }}{{ trans('bills.total') }}
+
+ {{ trans('bills.sub_total') }} + {{ Form::moneyGroup('sub_total', '', '', ['disabled' => 'disabled', 'required' => 'required', 'v-model' => 'totals.sub', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }} @money(0, $currency->code, true) @@ -89,7 +89,7 @@ @stack('add_discount_td_start')
+ + {{ Form::moneyGroup('discount_total', '', '', ['disabled' => 'disabled', 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }} @money(0, $currency->code, true) @@ -141,10 +141,10 @@ @stack('tax_total_td_start')
+ {{ trans_choice('general.taxes', 1) }} + {{ Form::moneyGroup('tax_total', '', '', ['disabled' => 'disabled', 'required' => 'required', 'v-model' => 'totals.tax', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }} @money(0, $currency->code, true) @@ -154,10 +154,10 @@ @stack('grand_total_td_start')
+ {{ trans('bills.total') }} + {{ Form::moneyGroup('grand_total', '', '', ['disabled' => 'disabled', 'required' => 'required', 'v-model' => 'totals.total', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }} @money(0, $currency->code, true) diff --git a/resources/views/purchases/bills/item.blade.php b/resources/views/purchases/bills/item.blade.php index 1a6df5bb9..271a9f2fa 100644 --- a/resources/views/purchases/bills/item.blade.php +++ b/resources/views/purchases/bills/item.blade.php @@ -1,7 +1,7 @@
+ @stack('actions_button_start') @stack('name_input_start') + @stack('quantity_input_start') + @stack('price_input_start') {{ Form::moneyGroup('name', '', '', ['required' => 'required', 'v-model' => 'row.price', 'data-item' => 'price', 'currency' => $currency, 'dynamic-currency' => 'currency', 'change' => 'row.price = $event; onCalculateTotal'], 0.00, 'text-right input-price') }} + @stack('tax_id_input_start') + +
{!! Form::label('items', trans_choice($text_override['items'], 2), ['class' => 'form-control-label']) !!}
- + @stack('actions_th_start') - + @stack('actions_th_end') @stack('name_th_start') - + @stack('name_th_end') @stack('quantity_th_start') - + @stack('quantity_th_end') @stack('price_th_start') - + @stack('price_th_end') @stack('taxes_th_start') - + @stack('taxes_th_end') @stack('total_th_start') - + @stack('total_th_end') @@ -65,20 +65,20 @@ @stack('add_item_td_start') - - + @stack('add_item_td_end') @stack('sub_total_td_start') - - - - - - - -
{{ trans('general.actions') }}{{ trans('general.actions') }}{{ trans('general.name') }}{{ trans('general.name') }}{{ trans($text_override['quantity']) }}{{ trans($text_override['quantity']) }}{{ trans($text_override['price']) }}{{ trans($text_override['price']) }}{{ trans_choice('general.taxes', 1) }}{{ trans_choice('general.taxes', 1) }}{{ trans('invoices.total') }}{{ trans('invoices.total') }}
+
+ {{ trans('invoices.sub_total') }} + {{ Form::moneyGroup('sub_total', '', '', ['disabled' => 'disabled', 'required' => 'required', 'v-model' => 'totals.sub', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }} @money(0, $currency->code, true) @@ -88,7 +88,7 @@ @stack('add_discount_td_start')
+ + {{ Form::moneyGroup('discount_total', '', '', ['disabled' => 'disabled', 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }} @money(0, $currency->code, true) @@ -140,10 +140,10 @@ @stack('tax_total_td_start')
+ {{ trans_choice('general.taxes', 1) }} + {{ Form::moneyGroup('tax_total', '', '', ['disabled' => 'disabled', 'required' => 'required', 'v-model' => 'totals.tax', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }} @money(0, $currency->code, true) @@ -153,10 +153,10 @@ @stack('grand_total_td_start')
+ {{ trans('invoices.total') }} + {{ Form::moneyGroup('grand_total', '', '', ['disabled' => 'disabled', 'required' => 'required', 'v-model' => 'totals.total', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }} @money(0, $currency->code, true) diff --git a/resources/views/sales/invoices/edit.blade.php b/resources/views/sales/invoices/edit.blade.php index 1020b7baf..0e9804987 100644 --- a/resources/views/sales/invoices/edit.blade.php +++ b/resources/views/sales/invoices/edit.blade.php @@ -30,34 +30,34 @@ {{ Form::textGroup('order_number', trans('invoices.order_number'), 'shopping-cart',[]) }} -
+
{!! Form::label('items', trans_choice($text_override['items'], 2), ['class' => 'control-label']) !!}
- + @stack('actions_th_start') - + @stack('actions_th_end') @stack('name_th_start') - + @stack('name_th_end') @stack('quantity_th_start') - + @stack('quantity_th_end') @stack('price_th_start') - + @stack('price_th_end') @stack('taxes_th_start') - + @stack('taxes_th_end') @stack('total_th_start') - + @stack('total_th_end') @@ -66,20 +66,20 @@ @stack('add_item_td_start') - - + @stack('add_item_td_end') @stack('sub_total_td_start') - - - - - - - - @stack('actions_td_start') -
{{ trans('general.actions') }}{{ trans('general.actions') }}{{ trans('general.name') }}{{ trans('general.name') }}{{ trans($text_override['quantity']) }}{{ trans($text_override['quantity']) }}{{ trans($text_override['price']) }}{{ trans($text_override['price']) }}{{ trans_choice('general.taxes', 1) }}{{ trans_choice('general.taxes', 1) }}{{ trans('invoices.total') }}{{ trans('invoices.total') }}
+
+ {{ trans('invoices.sub_total') }} + {{ Form::moneyGroup('sub_total', '', '', ['disabled' => 'disabled', 'required' => 'required', 'v-model' => 'totals.sub', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }} @money(0, $currency->code, true) @@ -89,7 +89,7 @@ @stack('add_discount_td_start')
+ + {{ Form::moneyGroup('discount_total', '', '', ['disabled' => 'disabled', 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }} @money(0, $currency->code, true) @@ -141,10 +141,10 @@ @stack('tax_total_td_start')
+ {{ trans_choice('general.taxes', 1) }} + {{ Form::moneyGroup('tax_total', '', '', ['disabled' => 'disabled', 'required' => 'required', 'v-model' => 'totals.tax', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }} @money(0, $currency->code, true) @@ -154,10 +154,10 @@ @stack('grand_total_td_start')
+ {{ trans('invoices.total') }} + {{ Form::moneyGroup('grand_total', '', '', ['disabled' => 'disabled', 'required' => 'required', 'v-model' => 'totals.total', 'currency' => $currency, 'dynamic-currency' => 'currency', 'masked' => 'true'], 0.00, 'text-right d-none') }} @money(0, $currency->code, true) diff --git a/resources/views/sales/invoices/item.blade.php b/resources/views/sales/invoices/item.blade.php index 49c4f90ef..3c6d2540b 100644 --- a/resources/views/sales/invoices/item.blade.php +++ b/resources/views/sales/invoices/item.blade.php @@ -1,7 +1,7 @@
+ @stack('actions_button_start') @stack('name_input_start') + @stack('quantity_input_start') + @stack('price_input_start') {{ Form::moneyGroup('name', '', '', ['required' => 'required', 'v-model' => 'row.price', 'data-item' => 'price', 'currency' => $currency, 'dynamic-currency' => 'currency', 'change' => 'row.price = $event; onCalculateTotal'], 0.00, 'text-right input-price') }} + @stack('tax_id_input_start') +