Skip to content

Issue #2237 fixed. #2298

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
wants to merge 1 commit into
base: 2.1
Choose a base branch
from
Open

Issue #2237 fixed. #2298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/ar/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,7 @@
'subject' => 'Subject',
'tax' => 'الضريبة',
'title' => 'عرض السعر',
'description' => 'الوصف',
],
],

Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/en/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,7 @@
'subject' => 'Subject',
'tax' => 'Tax',
'title' => 'Quote',
'description' => 'Description',
],
],

Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/es/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,7 @@
'subject' => 'Asunto',
'tax' => 'Impuesto',
'title' => 'Cotización',
'description' => 'Descripción',
],
],

Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/fa/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,7 @@
'subject' => 'موضوع',
'tax' => 'مالیات',
'title' => 'نقل‌قول',
'description' => 'توضیحات',
],
],

Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,7 @@
'subject' => 'Assunto',
'tax' => 'Imposto',
'title' => 'Cotação',
'description' => 'Descrição',
],
],

Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/tr/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,7 @@
'subject' => 'Konu',
'tax' => 'Vergi',
'title' => 'Teklif',
'description' => 'Açıklama',
],
],

Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/vi/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,7 @@
'subject' => 'Chủ đề',
'tax' => 'Thuế',
'title' => 'Báo giá',
'description' => 'Mô tả',
],
],

Expand Down
38 changes: 27 additions & 11 deletions packages/Webkul/Admin/src/Resources/views/quotes/pdf.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
border-collapse: separate;
margin-bottom: 16px;
}

table thead th {
background-color: #E9EFFC;
color: #000DBB;
Expand All @@ -123,6 +123,12 @@
text-align: right;
}

.description {
display: flex;
gap: 10px;
flex-direction: column;
}

.summary {
width: 100%;
display: inline-block;
Expand Down Expand Up @@ -173,7 +179,7 @@
<tr>
<td style="width: 50%; padding: 2px 18px;border:none;">
<b>
@lang('admin::app.quotes.index.pdf.quote-id'):
@lang('admin::app.quotes.index.pdf.quote-id'):
</b>

<span>
Expand All @@ -195,7 +201,7 @@
<tr>
<td style="width: 50%; padding: 2px 18px;border:none;">
<b>
@lang('admin::app.quotes.index.pdf.sales-person'):
@lang('admin::app.quotes.index.pdf.sales-person'):
</b>

<span>
Expand All @@ -213,7 +219,7 @@
</span>
</td>
</tr>

<tr>
<td style="width: 50%; padding: 2px 18px;border:none;">
<b>
Expand Down Expand Up @@ -285,7 +291,7 @@
<div>{{ core()->country_name($quote->billing_address['country'] ?? '') }}</div>
</td>
@endif

@if ($quote->shipping_address)
<td style="width: 50%">
<div>{{ $quote->shipping_address['address'] ?? ''}}</div>
Expand Down Expand Up @@ -358,15 +364,25 @@
<td class="text-center">{!! core()->formatBasePrice($item->discount_amount, true) !!}</td>

<td class="text-center">{!! core()->formatBasePrice($item->tax_amount, true) !!}</td>

<td class="text-center">{!! core()->formatBasePrice($item->total + $item->tax_amount - $item->discount_amount, true) !!}</td>
</tr>
@endforeach
</tbody>
</table>
</div>

<!-- Summary Table -->
@if (! empty($quote?->description))
<div class="description">
<!-- Title -->
<b>@lang('admin::app.quotes.index.pdf.description')</b>

<!-- Description -->
<p>{{ $quote->description }}</p>
</div>
@endif

<!-- Summary Table -->
<div class="summary">
<table class="{{ app()->getLocale () }}">
<tbody>
Expand All @@ -375,25 +391,25 @@
<td>-</td>
<td>{!! core()->formatBasePrice($quote->sub_total, true) !!}</td>
</tr>

<tr>
<td>@lang('admin::app.quotes.index.pdf.tax')</td>
<td>-</td>
<td>{!! core()->formatBasePrice($quote->tax_amount, true) !!}</td>
</tr>

<tr>
<td>@lang('admin::app.quotes.index.pdf.discount')</td>
<td>-</td>
<td>{!! core()->formatBasePrice($quote->discount_amount, true) !!}</td>
</tr>

<tr>
<td>@lang('admin::app.quotes.index.pdf.adjustment')</td>
<td>-</td>
<td>{!! core()->formatBasePrice($quote->adjustment_amount, true) !!}</td>
</tr>

<tr>
<td><strong>@lang('admin::app.quotes.index.pdf.grand-total')</strong></td>
<td><strong>-</strong></td>
Expand Down
Loading