refs #1421
This commit is contained in:
		@@ -127,7 +127,7 @@
 | 
			
		||||
                                                                                    <i class="fa fa-percent"></i>
 | 
			
		||||
                                                                                </span>
 | 
			
		||||
                                                                            </div>
 | 
			
		||||
                                                                            {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
 | 
			
		||||
                                                                            {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control', 'v-model' => 'form.discount']) !!}
 | 
			
		||||
                                                                        </div>
 | 
			
		||||
                                                                    </div>
 | 
			
		||||
                                                                    <div class="col-sm-6">
 | 
			
		||||
 
 | 
			
		||||
@@ -128,7 +128,7 @@
 | 
			
		||||
                                                                                    <i class="fa fa-percent"></i>
 | 
			
		||||
                                                                                </span>
 | 
			
		||||
                                                                            </div>
 | 
			
		||||
                                                                            {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
 | 
			
		||||
                                                                            {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control', 'v-model' => 'form.discount']) !!}
 | 
			
		||||
                                                                        </div>
 | 
			
		||||
                                                                    </div>
 | 
			
		||||
                                                                    <div class="col-sm-6">
 | 
			
		||||
 
 | 
			
		||||
@@ -173,7 +173,7 @@
 | 
			
		||||
 | 
			
		||||
        <div class="col-42">
 | 
			
		||||
            <div class="text company pr-2">
 | 
			
		||||
                @foreach ($bill->totals as $total)
 | 
			
		||||
                @foreach ($bill->totals_sorted as $total)
 | 
			
		||||
                        @if ($total->code != 'total')
 | 
			
		||||
                            @stack($total->code . '_td_start')
 | 
			
		||||
                                <div class="border-top-1 py-2">
 | 
			
		||||
 
 | 
			
		||||
@@ -412,7 +412,7 @@
 | 
			
		||||
                            <div class="table-responsive">
 | 
			
		||||
                                <table class="table">
 | 
			
		||||
                                    <tbody>
 | 
			
		||||
                                        @foreach ($bill->totals as $total)
 | 
			
		||||
                                        @foreach ($bill->totals_sorted as $total)
 | 
			
		||||
                                            @if ($total->code != 'total')
 | 
			
		||||
                                                @stack($total->code . '_td_start')
 | 
			
		||||
                                                    <tr>
 | 
			
		||||
@@ -472,7 +472,7 @@
 | 
			
		||||
 | 
			
		||||
                            @stack('button_group_start')
 | 
			
		||||
                                <div class="dropup header-drop-top">
 | 
			
		||||
                                    <button type="button" class="btn btn-primary header-button-top" data-toggle="dropdown" aria-expanded="false">{{ trans('general.more_actions') }}</button>
 | 
			
		||||
                                    <button type="button" class="btn btn-primary header-button-top" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-chevron-up"></i>  {{ trans('general.more_actions') }}</button>
 | 
			
		||||
 | 
			
		||||
                                    <div class="dropdown-menu" role="menu">
 | 
			
		||||
                                        @if ($bill->status != 'cancelled')
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user