A free open source IT asset/license management system
A few small tweaks to acceptance screen design
snipe764b363bbcaf
diff --git a/app/Models/CheckoutAcceptance.php b/app/Models/CheckoutAcceptance.phpindex 85fa472ffe..f23c6d7f4b 100644--- a/app/Models/CheckoutAcceptance.php+++ b/app/Models/CheckoutAcceptance.php@@ -132,8 +132,7 @@ class CheckoutAcceptance extends Model/*** Filter checkout acceptences by the user*- * @param Illuminate\Database\Eloquent\Builder $query- * @param User $user+ * @param User $user* @return \Illuminate\Database\Eloquent\Builder*/public function scopeForUser(Builder $query, User $user)@@ -144,7 +143,6 @@ class CheckoutAcceptance extends Model/*** Filter to only get pending acceptances*- * @param Illuminate\Database\Eloquent\Builder $query* @return \Illuminate\Database\Eloquent\Builder*/public function scopePending(Builder $query)@@ -209,6 +207,7 @@ class CheckoutAcceptance extends Modelif ($data['item_serial'] != null) {$pdf->writeHTML(trans('admin/hardware/form.serial').': '.e($data['item_serial']), true, 0, true, 0, '');}+ $pdf->writeHTML(trans('general.assignee').': '.e($data['assigned_to']), true, 0, true, 0, '');$pdf->Ln();$pdf->writeHTML('<hr>', true, 0, true, 0, '');@@ -228,8 +227,10 @@ class CheckoutAcceptance extends Model$pdf->Ln();if ($data['signature'] != null) {- $pdf->writeHTML('<img src="'.$data['signature'].'" style="max-width: 600px;">', true, 0, true, 0, '');+ $pdf->writeHTML('<img src="'.$data['signature'].'">', true, 0, true, 0, '');$pdf->writeHTML('<hr>', true, 0, true, 0, '');+ $pdf->writeHTML(e($data['assigned_to']), true, 0, true, 0, 'C');+ $pdf->Ln();}if ($data['note'] != null) {@@ -238,7 +239,7 @@ class CheckoutAcceptance extends Model$pdf->Ln();}- $pdf->writeHTML(trans('general.assignee').': '.e($data['assigned_to']), true, 0, true, 0, '');+$pdf->writeHTML(trans('general.assigned_date').': '.e($data['check_out_date']), true, 0, true, 0, '');$pdf->writeHTML(trans('general.accepted_date').': '.e($data['accepted_date']), true, 0, true, 0, '');diff --git a/resources/views/account/accept/create.blade.php b/resources/views/account/accept/create.blade.phpindex cb6a47a4ed..2b91d18f97 100644--- a/resources/views/account/accept/create.blade.php+++ b/resources/views/account/accept/create.blade.php@@ -20,11 +20,21 @@}.m-signature-pad--body {- border-style: solid;+ border-style: dashed;border-color: grey;- border-width: thin;+ border-width: thick;+ padding-top: 0px;}++ .m-signature-pad {+ box-shadow: none;+ background-color: inherit;+ border: none;++ }++</style>@@ -90,30 +100,37 @@<canvas style="width:100%;"></canvas><input type="hidden" name="signature_output" id="signature_output"></div>- <div class="col-md-12 col-sm-12 col-lg-12 col-xs-12 text-center">+ <div class="col-md-12 col-sm-12 col-lg-12 col-xs-12 text-left"><button type="button" class="btn btn-sm btn-default clear" data-action="clear" id="clear_button">{{trans('general.clear_signature')}}</button></div></div></div>@endif- @if (auth()->user()->email!='')- <div class="col-md-12" style="padding-top: 20px; display: none;" id="showEmailBox">- <label class="form-control">- <input type="checkbox" value="1" name="send_copy" id="send_copy" checked="checked" aria-label="send_copy">- {{ trans('mail.send_pdf_copy') }} ({{ auth()->user()->email }})- </label>- </div>- @endif</div> <!-- / box-body -->- <div class="box-footer text-right" style="display: none;" id="showSubmit">- <button type="submit" class="btn btn-success" id="submit-button">- <i class="fa fa-check icon-white" aria-hidden="true" id="submitIcon"></i>- <span id="buttonText">+ <div class="box-footer" style="display: none;" id="showSubmit">+ <div class="row">+ <div class="col-md-7">+ @if (auth()->user()->email!='')+ <div class="col-md-12" style="display: none;" id="showEmailBox">+ <label class="form-control">+ <input type="checkbox" value="1" name="send_copy" id="send_copy" checked="checked" aria-label="send_copy">+ {{ trans('mail.send_pdf_copy') }} ({{ auth()->user()->email }})+ </label>+ </div>+ @endif+ </div>+ <div class="col-md-5 text-right">+ <button type="submit" class="btn btn-success" id="submit-button">+ <i class="fa fa-check icon-white" aria-hidden="true" id="submitIcon"></i>+ <span id="buttonText">{{ trans_choice('general.i_accept_item', $acceptance->qty ?? null) }}</span>- </button>+ </button>+ </div>+ </div>+</div><!-- /.box-footer --></div> <!-- / box-default --></div> <!-- / col -->