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',[]) }} -
{{ trans('general.actions') }} | +{{ trans('general.actions') }} | @stack('actions_th_end') @stack('name_th_start') -{{ trans('general.name') }} | +{{ trans('general.name') }} | @stack('name_th_end') @stack('quantity_th_start') -{{ trans('bills.quantity') }} | +{{ trans('bills.quantity') }} | @stack('quantity_th_end') @stack('price_th_start') -{{ trans('bills.price') }} | +{{ trans('bills.price') }} | @stack('price_th_end') @stack('taxes_th_start') -{{ trans_choice('general.taxes', 1) }} | +{{ trans_choice('general.taxes', 1) }} | @stack('taxes_th_end') @stack('total_th_start') -{{ trans('bills.total') }} | +{{ trans('bills.total') }} | @stack('total_th_end')||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
+ | - | + | |||||||||||||||||||||||||||||||||||
+ | {{ 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']) !!}
|