merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2089 and updated codeception dependencies

This commit is contained in:
rahul shukla 2020-01-22 18:44:53 +05:30
parent c22213c97f
commit 01f0fc9a57
4 changed files with 235 additions and 871 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -37,8 +37,8 @@
},
"require-dev": {
"codeception/codeception": "3.1.*",
"barryvdh/laravel-debugbar": "^3.1",
"codeception/codeception": "^4.0",
"filp/whoops": "^2.0",
"fzaninotto/faker": "^1.4",
"laravel/dusk": "^5.7.0",

1088
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

6
packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php
View File

@ -45,7 +45,7 @@
padding: 5px 10px;
border-bottom: solid 1px #d3d3d3;
border-left: solid 1px #d3d3d3;
color: $font-color;
color: #3A3A3A;
vertical-align: middle;
}
@ -127,7 +127,7 @@
<p>{{ $invoice->order->shipping_address->city }}</p>
<p>{{ $invoice->order->shipping_address->state }}</p>
<p>{{ core()->country_name($invoice->order->shipping_address->country) }} {{ $invoice->order->shipping_address->postcode }}</p>
{{ __('shop::app.checkout.onepage.contact') }} : {{ $invoice->order->shipping_address->phone }}
{{ __('shop::app.checkout.onepage.contact') }} : {{ $invoice->order->shipping_address->phone }}
</td>
@endif
</tr>
@ -187,7 +187,7 @@
@if (isset($item->additional['attributes']))
<div class="item-options">
@foreach ($item->additional['attributes'] as $attribute)
<b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
@endforeach

10
packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php
View File

@ -45,7 +45,7 @@
padding: 5px 10px;
border-bottom: solid 1px #d3d3d3;
border-left: solid 1px #d3d3d3;
color: $font-color;
color: #3A3A3A;
vertical-align: middle;
font-family: DejaVu Sans; sans-serif;
}
@ -87,12 +87,12 @@
<div class="row">
<span class="label">{{ __('shop::app.customer.account.order.view.invoice-id') }} -</span>
<span class="value">#{{ $invoice->id }}</span>
<span class="value">{{ $invoice->id }}</span>
</div>
<div class="row">
<span class="label">{{ __('shop::app.customer.account.order.view.order-id') }} -</span>
<span class="value">#{{ $invoice->order->increment_id }}</span>
<span class="value">{{ $invoice->order->increment_id }}</span>
</div>
<div class="row">
@ -124,7 +124,7 @@
</p>
{{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->billing_address->phone }}
</td>
@if ($invoice->order->shipping_address)
<td>
<p>{{ $invoice->order->shipping_address->name }}</p>
@ -193,7 +193,7 @@
@if (isset($item->additional['attributes']))
<div class="item-options">
@foreach ($item->additional['attributes'] as $attribute)
<b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
@endforeach