Skip to content

Feature purchase return #415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
goen94 wants to merge 3 commits into
base: feature-purchase-return
Choose a base branch
from
Open

Feature purchase return #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cda20be
sales return: update email template
goen94 Oct 23, 2022
a64fc30
sales return: update email template
goen94 Oct 23, 2022
fce630a
purchase return: add tdd
goen94 Nov 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions resources/views/emails/sales/return/return-approval-request-single.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,13 @@
Check
</a>
<a
href="{{ $url ?: '-' }}approval?crud-type={{ $salesReturns[0]->action }}&resource-type=salesReturns&action=approve&ids={{ $salesReturns[0]->id }}&approver_id={{ $approver->id }}&token={{ $approver->token }}"
href="{{ $url ?: '-' }}approval?crud-type={{ $salesReturns[0]->action }}&resource-type=SalesReturn&action=approve&ids={{ $salesReturns[0]->id }}&approver_id={{ $approver->id }}&token={{ $approver->token }}"
target="_blank"
style="background-color: #4CAF50; border: none; color: white; margin:8px 0; padding: 8px 16px; text-align: center; text-decoration: none; display: inline-block; font-size: 16px; ">
Approve
</a>
<a
href="{{ $url ?: '-' }}approval?crud-type={{ $salesReturns[0]->action }}&resource-type=salesReturns&action=reject&ids={{ $salesReturns[0]->id }}&approver_id={{ $approver->id }}&token={{ $approver->token }}"
href="{{ $url ?: '-' }}approval?crud-type={{ $salesReturns[0]->action }}&resource-type=SalesReturn&action=reject&ids={{ $salesReturns[0]->id }}&approver_id={{ $approver->id }}&token={{ $approver->token }}"
target="_blank"
style="background-color: rgb(255, 0, 0); border: none; color: white; margin:8px 0; padding: 8px 16px; text-align: center; text-decoration: none; display: inline-block; font-size: 16px; ">
Reject
Expand Down
77 changes: 40 additions & 37 deletions resources/views/emails/sales/return/return-approval-request.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,8 @@
<th style="padding: .5rem">Form Number</th>
<th style="padding: .5rem">Form Reference</th>
<th style="padding: .5rem">Customer</th>
<th>
<table style="width: 100%; table-layout: fixed;">
<tbody style="height: 100%;"><tr>
<td style="border-right: 1px solid black; font-weight: bold;padding: .5rem;width: 70px;">Item</td>
<td style="border-right: 1px solid black; font-weight: bold;padding: .5rem;width: 63.047px;">Quantity Return</td>
</tr>
</tbody>
</table>
</th>
<th style="padding: .5rem">Item</th>
<th style="padding: .5rem">Quantity Return</th>
<th style="padding: .5rem">Note</th>
<th style="padding: .5rem">Created By</th>
<th style="padding: .5rem">Created At</th>
Expand All @@ -72,13 +65,13 @@
$urlApprovalQueries['crud-type'] = $salesReturn->action;
@endphp
<tr>
<td style="padding: .5rem">
<td style="padding: .5rem" rowspan="{{ count($salesReturn->items) }}">
{{ $loop->iteration }}
</td>
<td style="padding: .5rem">
<td style="padding: .5rem" rowspan="{{ count($salesReturn->items) }}">
{{ date('d M Y', strtotime($salesReturnForm->date)) }}
</td>
<td style="padding: .5rem">
<td style="padding: .5rem" rowspan="{{ count($salesReturn->items) }}">
{{ $salesReturnForm->number }}
{{ ' ' }}
{{
Expand All @@ -88,41 +81,32 @@
: ''
}}
</td>
<td style="padding: .5rem">
<td style="padding: .5rem" rowspan="{{ count($salesReturn->items) }}">
{{ $salesReturn->salesInvoice->form->number }}
</td>
<td style="padding: .5rem">
<td style="padding: .5rem" rowspan="{{ count($salesReturn->items) }}">
{{ $salesReturn->customer->name }}
</td>
<td style="vertical-align: top; padding: 0px">
<table style="width: 100%; table-layout: fixed;">
<tbody style="height: 100%;">
@foreach($salesReturn->items as $item)
@php $borderBottom = !$loop->last ? 'border-bottom: 1px solid black' : ''; @endphp
<tr>
<td style="border-right: 1px solid black; padding: .5rem;width: 70px; {{ $borderBottom }}">
{{ $item->item->name }}
</td>
<td style="border-right: 1px solid black; padding: .5rem;width: 66.781px; {{ $borderBottom }}">
{{ $item->quantity }}
</td>
</td>
</tr>
@endforeach
</tbody>
</table>
@foreach($salesReturn->items as $item)
<td style="padding: .5rem;">
{{ $item->item->name }}
</td>
<td style="padding: .5rem">
{{ $item->note }}
<td style="padding: .5rem;">
{{ $item->quantity }}
</td>
<td style="padding: .5rem">
@break
@endforeach
<td style="padding: .5rem" rowspan="{{ count($salesReturn->items) }}">
{{ $salesReturnForm->notes }}
</td>
<td style="padding: .5rem" rowspan="{{ count($salesReturn->items) }}">
{{ $salesReturnForm->createdBy->getFullNameAttribute() }}
</td>
<td style="padding: .5rem">
<td style="padding: .5rem" rowspan="{{ count($salesReturn->items) }}">
{{ date('d M Y, H:i', strtotime($salesReturnForm->created_at)) }}
</td>
<td style="padding: .5rem">
<div style="display: flex; justify-content: space-between; text-align: center">
<td style="padding: .5rem" rowspan="{{ count($salesReturn->items) }}">
<div style="display: flex;">
<a
href="{{ env('TENANT_DOMAIN') . 'sales/return/'. $salesReturn->id }}"
target="_blank"
Expand All @@ -144,6 +128,25 @@
</div>
</td>
</tr>
@php
($first = true);
@endphp
@foreach($salesReturn->items as $item)
@if($first)
@php
($first = false);
@endphp
@continue
@endif
<tr>
<td style="padding: .5rem;">
{{ $item->item->name }}
</td>
<td style="padding: .5rem;">
{{ $item->quantity }}
</td>
</tr>
@endforeach
@endforeach
</tbody>
</table>
Expand Down
Loading