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

Merge pull request #16 from bagisto/master 

Update fork
This commit is contained in:
Glenn Hermans 2021-04-23 00:58:29 +02:00 committed by GitHub
parent b8884d1cde 36ff231afe
commit a6120ae31c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 315 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
packages/Webkul/API/Http/Resources/Catalog/Category.php
View File

@ -2,6 +2,7 @@
namespace Webkul\API\Http\Resources\Catalog;
use Illuminate\Support\Facades\Storage;
use Illuminate\Http\Resources\Json\JsonResource;
class Category extends JsonResource
@ -15,22 +16,25 @@ class Category extends JsonResource
public function toArray($request)
{
return [
'id' => $this->id,
'code' => $this->code,
'name' => $this->name,
'slug' => $this->slug,
'display_mode' => $this->display_mode,
'description' => $this->description,
'meta_title' => $this->meta_title,
'meta_description' => $this->meta_description,
'meta_keywords' => $this->meta_keywords,
'status' => $this->status,
'image_url' => $this->image_url,
'additional' => is_array($this->resource->additional)
? $this->resource->additional
: json_decode($this->resource->additional, true),
'created_at' => $this->created_at,
'updated_at' => $this->updated_at,
'id' => $this->id,
'code' => $this->code,
'name' => $this->name,
'slug' => $this->slug,
'display_mode' => $this->display_mode,
'description' => $this->description,
'meta_title' => $this->meta_title,
'meta_description' => $this->meta_description,
'meta_keywords' => $this->meta_keywords,
'status' => $this->status,
'image_url' => $this->image_url,
'category_icon_path' => $this->category_icon_path
? Storage::url($this->category_icon_path)
: null,
'additional' => is_array($this->resource->additional)
? $this->resource->additional
: json_decode($this->resource->additional, true),
'created_at' => $this->created_at,
'updated_at' => $this->updated_at,
];
}
}
}

2
packages/Webkul/Attribute/src/Models/AttributeFamily.php
View File

@ -31,7 +31,7 @@ class AttributeFamily extends Model implements AttributeFamilyContract
public function getComparableAttributesBelongsToFamily()
{
return (AttributeProxy::modelClass())::join('attribute_group_mappings', 'attribute_group_mappings.attribute_id', '=', 'attributes.id')
->select('attributes.*')->where('attributes.is_comparable', 1)->get();
->select('attributes.*')->where('attributes.is_comparable', 1)->distinct()->get();
}
/**

4
packages/Webkul/Shop/src/Http/Controllers/ProductController.php
View File

@ -79,7 +79,9 @@ class ProductController extends Controller
'attribute_id' => $attributeId,
]);
return Storage::download($productAttribute['text_value']);
return isset($productAttribute['text_value'])
? Storage::download($productAttribute['text_value'])
: null;
}
/**

112
packages/Webkul/Shop/src/Resources/lang/nl/app.php
View File

@ -89,7 +89,7 @@ return [
'star' => 'Ster',
'percentage' => ':percentage %',
'id-star' => 'star',
'name' => 'Name',
'name' => 'Naam',
],
'customer' => [
@ -102,8 +102,8 @@ return [
'removed' => 'Item successfully removed from compare list',
'removed-all' => 'All items successfully removed from compare list',
'empty-text' => "You don't have any items in your compare list",
'product_image' => 'Product Image',
'actions' => 'Actions',
'product_image' => 'Product afbeelding',
'actions' => 'Acties',
],
'signup-text' => [
@ -126,22 +126,22 @@ return [
'using' => 'by using this website',
'agreement' => 'Agreement',
'success' => 'Account succesvol aangemaakt.',
'success-verify' => 'Account created successfully, an e-mail has been sent for verification.',
'success-verify-email-unsent' => 'Account created successfully, but verification e-mail unsent.',
'failed' => 'Error! Can not create your account, pleae try again later.',
'already-verified' => 'Your account is already verified Or please try sending a new verification email again.',
'verification-not-sent' => 'Error! Problem in sending verification email, please try again later.',
'verification-sent' => 'Verification email sent',
'success-verify' => 'Account succesvol aangemaakt, er is een e-mail verzonden ter verificatie.',
'success-verify-email-unsent' => 'Account aangemaakt, maar de verificatie-e-mail is niet verzonden.',
'failed' => 'Fout! Kan uw account niet aanmaken, probeer het later opnieuw.',
'already-verified' => 'Je account is al geverifieerd.',
'verification-not-sent' => 'Fout! Probleem bij het verzenden van een verificatie-e-mail. Probeer het later opnieuw.',
'verification-sent' => 'Verificatie email verzonden',
'verified' => 'Uw account is geverifieerd, probeer nu in te loggen.',
'verify-failed' => 'We cannot verify your mail account.',
'verify-failed' => 'We kunnen uw e-mailaccount niet verifiëren.',
'dont-have-account' => 'U heeft geen account bij ons.',
'success' => 'Account Created Successfully',
'failed' => 'Error! Cannot Create Your Account, Try Again Later',
'already-verified' => 'Your Account is already verified Or Please Try Sending A New Verification Email Again',
'verification-not-sent' => 'Error! Problem In Sending Verification Email, Try Again Later',
'verify-failed' => 'We Cannot Verify Your Mail Account',
'dont-have-account' => 'You Do Not Have Account With Us',
'customer-registration' => 'Customer Registered Successfully'
'success' => 'Account succesvol aangemaakt',
'failed' => 'Fout! Kan uw account niet maken. Probeer het later opnieuw',
'already-verified' => 'Uw account is al geverifieerd of probeer nogmaals een nieuwe verificatie-e-mail te verzenden',
'verification-not-sent' => 'Fout! Probleem bij het verzenden van verificatie-e-mail, probeer het later opnieuw',
'verify-failed' => 'We kunnen uw e-mailaccount niet verifiëren',
'dont-have-account' => 'U heeft geen account bij ons',
'customer-registration' => 'Klant succesvol geregistreerd'
],
'login-text' => [
@ -156,19 +156,19 @@ return [
'password' => 'Wachtwoord',
'forgot_pass' => 'Wachtwoord vergeten?',
'button_title' => 'Aanmelden',
'remember' => 'Remember Me',
'remember' => 'Onthoud me',
'footer' => '© Copyright :year Webkul Software, All rights reserved',
'invalid-creds' => 'Please check your credentials and try again.',
'verify-first' => 'Verify your email account first.',
'not-activated' => 'Your activation seeks admin approval',
'resend-verification' => 'Resend verification mail again'
'invalid-creds' => 'Controleer uw inloggegevens en probeer het opnieuw.',
'verify-first' => 'Verifieer eerst uw e-mailaccount.',
'not-activated' => 'Uw activering vraagt om goedkeuring van de beheerder.',
'resend-verification' => 'Verzend de verificatie-e-mail opnieuw'
],
'forgot-password' => [
'title' => 'Recover Password',
'title' => 'Wachtwoord herstellen',
'email' => 'Email',
'submit' => 'Send Password Reset Email',
'page_title' => 'Forgot your password ?'
'submit' => 'Stuur wachtwoord reset e-mail',
'page_title' => 'Uw wachtwoord vergeten ?'
],
'reset-password' => [
@ -181,7 +181,7 @@ return [
],
'account' => [
'dashboard' => 'Edit Profile',
'dashboard' => 'Profiel wijzigen',
'menu' => 'Menu',
'general' => [
@ -196,9 +196,9 @@ return [
'edit' => 'Wijzig',
],
'edit-success' => 'Profile updated successfully.',
'edit-fail' => 'Error! Profile cannot be updated, please try again later.',
'unmatch' => 'The old password does not match.',
'edit-success' => 'Profiel succesvol bijgewerkt.',
'edit-fail' => 'Fout! Profiel kan niet worden bijgewerkt. Probeer het later opnieuw.',
'unmatch' => 'Het oude wachtwoord komt niet overeen.',
'fname' => 'Voornaam',
'lname' => 'Naam',
@ -227,18 +227,18 @@ return [
'add' => 'Adres toevoegen',
'edit' => 'Wijzigen',
'empty' => 'U heeft hier geen opgeslagen adressen. Voeg minstens één adres toe door op de onderstaande link te klikken',
'create' => 'Address toevoegen',
'create' => 'Nieuw adres toevoegen',
'delete' => 'Verwijderen',
'make-default' => 'Maak standaard',
'default' => 'Standaard',
'contact' => 'Contact',
'confirm-delete' => 'Wilt u dit adres echt verwijderen?',
'default-delete' => 'Standaardadres kan niet worden gewijzigd.',
'default-delete' => 'Het standaard adres kan niet worden gewijzigd.',
'enter-password' => 'Voer uw wachtwoord in.',
],
'create' => [
'page-title' => 'Add Address Form',
'page-title' => 'Nieuw adres toevoegen',
'company_name' => 'Bedrijfsnaam',
'first_name' => 'Voornaam',
'last_name' => 'Naam',
@ -247,7 +247,7 @@ return [
'title' => 'Adres toevoegen',
'street-address' => 'Adres',
'country' => 'Land',
'state' => 'Staat / Provincie',
'state' => 'Provincie',
'select-state' => 'Selecteer een regio, staat of provincie',
'city' => 'Gemeente',
'postcode' => 'Postcode',
@ -313,17 +313,17 @@ return [
'total' => 'Total',
'subtotal' => 'Subtotaal',
'shipping-handling' => 'Verzending en afhandeling',
'tax' => 'Belasting',
'tax' => 'BTW',
'discount' => 'Korting',
'tax-percent' => 'Belastingpercentage',
'tax-amount' => 'Belastingbedrag',
'tax-percent' => 'BTWpercentage',
'tax-amount' => 'BTWbedrag',
'discount-amount' => 'Korting hoeveelheid',
'grand-total' => 'Eindtotaal',
'total-paid' => 'Totaal betaald',
'total-refunded' => 'Totaal terugbetaald ',
'total-due' => 'Totaal verschuldigd',
'shipping-address' => 'Verzendingsadres',
'billing-address' => 'factuur adres',
'billing-address' => 'Facturatie adres ',
'shipping-method' => 'Verzendmethode',
'payment-method' => 'Betalingswijze',
'individual-invoice' => 'Factuur #:invoice_id',
@ -514,7 +514,7 @@ return [
'payment' => 'Betaling',
'complete' => 'Complete',
'review' => 'Beoordeling',
'billing-address' => 'Factuur adres',
'billing-address' => 'Facturatie adres ',
'sign-in' => 'Inloggen',
'company-name' => 'Bedrijfsnaam',
'first-name' => 'Voornaam',
@ -524,9 +524,9 @@ return [
'city' => 'stad',
'state' => 'Staat',
'select-state' => 'Selecteer een regio, staat of provincie',
'postcode' => 'Zip/Postcode',
'postcode' => 'Postcode',
'phone' => 'Telefoon',
'country' => 'buiten',
'country' => 'Land',
'order-summary' => 'overzicht van de bestelling',
'shipping-address' => 'Verzendingsadres',
'use_for_shipping' => 'Verzenden naar dit adres',
@ -537,7 +537,7 @@ return [
'summary' => 'overzicht van de bestelling',
'price' => 'Prijs',
'quantity' => 'Aantal',
'billing-address' => 'factuur adres',
'billing-address' => 'Facturatie adres ',
'shipping-address' => 'Verzendingsadres',
'contact' => 'Contact',
'place-order' => 'Plaats bestelling',
@ -582,7 +582,7 @@ return [
'success' => [
'title' => 'Bestelling succesvol geplaatst',
'thanks' => 'Bedankt voor je bestelling!',
'order-id-info' => 'Uw bestellings-ID is #:order_id',
'order-id-info' => 'Uw ordernummer is #:order_id',
'info' => 'We sturen u een e-mail met uw bestelgegevens en trackinginformatie'
]
],
@ -591,13 +591,13 @@ return [
'order' => [
'subject' => 'Nieuwe orderbevestiging',
'heading' => 'Order bevestiging!',
'dear' => 'Lieve :customer_name',
'dear-admin' => 'Lieve :admin_name',
'dear' => 'Beste :customer_name',
'dear-admin' => 'Beste :admin_name',
'greeting' => 'Bedankt voor je bestelling :order_id geplaatst op :created_at',
'greeting-admin' => 'Order Id :order_id geplaatst op :created_at',
'summary' => 'Samenvatting van de bestelling',
'shipping-address' => 'Verzendingsadres',
'billing-address' => 'factuur adres',
'billing-address' => 'Facturatie adres ',
'contact' => 'Contact',
'shipping' => 'Verzendmethode',
'payment' => 'Betalingswijze',
@ -605,7 +605,7 @@ return [
'quantity' => 'Aantal',
'subtotal' => 'Subtotal',
'shipping-handling' => 'Verzending en afhandeling',
'tax' => 'Belasting',
'tax' => 'BTW',
'discount' => 'Korting',
'grand-total' => 'Eindtotaal',
'final-summary' => 'Bedankt voor het tonen van uw interesse in onze winkel.We sturen u een trackingnummer zodra het is verzonden',
@ -614,7 +614,7 @@ return [
'comment' => [
'subject' => 'Nieuwe opmerking toegevoegd aan uw bestelling #:order_id',
'dear' => 'Lieve :customer_name',
'dear' => 'Beste :customer_name',
'final-summary' => 'Bedankt voor het tonen van uw interesse in onze winkel',
'help' => 'Als u hulp nodig heeft, neem dan contact met ons op via :support_email',
'thanks' => 'Bedankt!',
@ -623,17 +623,17 @@ return [
'cancel' => [
'subject' => 'Order Annuleren Bevestiging',
'heading' => 'Bestelling geannuleerd',
'dear' => 'Lieve :customer_name',
'greeting' => 'U bestelt met order-ID #:order_id geplaatst op :created_at is geannuleerd',
'dear' => 'Beste :customer_name',
'greeting' => 'Uw bestelling met ordernummer #:order_id geplaatst op :created_at is geannuleerd',
'summary' => 'Samenvatting van de bestelling',
'shipping-address' => 'Verzendingsadres',
'billing-address' => 'factuur adres',
'billing-address' => 'Facturatie adres ',
'contact' => 'Contact',
'shipping' => 'Verzendmethode',
'payment' => 'Betalingswijze',
'subtotal' => 'Subtotaal',
'shipping-handling' => 'Verzending en afhandeling',
'tax' => 'Belasting',
'tax' => 'BTW',
'discount' => 'Korting',
'grand-total' => 'Eindtotaal',
'final-summary' => 'Bedankt voor het tonen van uw interesse in onze winkel',
@ -649,7 +649,7 @@ return [
],
'shipment' => [
'heading' => 'Verzending #:shipment_id is gegenereerd voor Order #:order_id',
'heading' => 'Verzending #:shipment_id is gegenereerd voor order #:order_id',
'inventory-heading' => 'Nieuwe zending #:shipment_id was gegenereerd voor Order #:order_id',
'subject' => 'Verzending voor uw bestelling #:order_id',
'inventory-subject' => 'Er is een nieuwe zending gegenereerd voor de bestelling #:order_id',
@ -669,7 +669,7 @@ return [
'forget-password' => [
'subject' => 'Klant reset wachtwoord',
'dear' => 'Lieve :name',
'dear' => 'Beste :name',
'info' => 'U ontvangt deze e-mail omdat we een verzoek voor het opnieuw instellen van uw wachtwoord voor uw account hebben ontvangen',
'reset-password' => 'Wachtwoord opnieuw instellen',
'final-summary' => 'Als u geen wachtwoordherstel hebt aangevraagd, is er geen verdere actie vereist',
@ -678,14 +678,14 @@ return [
'update-password' => [
'subject' => 'Wachtwoord bijgewerkt',
'dear' => 'Lieve :name',
'dear' => 'Beste :name',
'info' => 'Je ontvangt deze e-mail omdat je je wachtwoord hebt bijgewerkt.',
'thanks' => 'Bedankt!'
],
'customer' => [
'new' => [
'dear' => 'Lieve :customer_name',
'dear' => 'Beste :customer_name',
'username-email' => 'UserName/Email',
'subject' => 'Nieuwe klantenregistratie',
'password' => 'Wachtwoord',
@ -697,7 +697,7 @@ return [
'registration' => [
'subject' => 'Nieuwe klantenregistratie',
'customer-registration' => 'Klant succesvol geregistreerd',
'dear' => 'Lieve :customer_name',
'dear' => 'Beste :customer_name',
'greeting' => 'Welkom en bedankt voor uw registratie bij ons!',
'summary' => 'Uw account is nu succesvol aangemaakt en u kunt inloggen met uw e-mailadres en wachtwoordgegevens. Na het inloggen hebt u toegang tot andere services, waaronder het bekijken van eerdere bestellingen, verlanglijstjes en het bewerken van uw accountgegevens.',
'thanks' => 'Thanks!',

24
packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
View File

@ -19,8 +19,17 @@
<b>{{ $billingAddress->first_name }} {{ $billingAddress->last_name }}</b>
</li>
<li class="mb-10">
{{ $billingAddress->address1 }},<br/> {{ $billingAddress->state }}
{{ $billingAddress->address1 }},<br/>
</li>
<li class="mb-10">
{{ $billingAddress->postcode . " " . $billingAddress->city }}
</li>
<li class="mb-10">
{{ $billingAddress->state }}
</li>
<li class="mb-10">
{{ core()->country_name($billingAddress->country) }} {{ $billingAddress->postcode }}
</li>
@ -50,10 +59,19 @@
<b>{{ $shippingAddress->first_name }} {{ $shippingAddress->last_name }}</b>
</li>
<li class="mb-10">
{{ $shippingAddress->address1 }},<br/> {{ $shippingAddress->state }}
{{ $shippingAddress->address1 }},<br/>
</li>
<li class="mb-10">
{{ core()->country_name($shippingAddress->country) }} {{ $shippingAddress->postcode }}
{{ $shippingAddress->postcode . " " . $shippingAddress->city }}
</li>
<li class="mb-10">
{{ $shippingAddress->state }}
</li>
<li class="mb-10">
{{ core()->country_name($shippingAddress->country) }}
</li>
<span class="horizontal-rule mb-15 mt-15"></span>

78
packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php
View File

@ -33,41 +33,51 @@
</div>
<div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
<div style="line-height: 25px;">
<div style="font-weight: bold;font-size: 16px;color: #242424;">
{{ __('shop::app.mail.order.shipping-address') }}
</div>
@if ($order->shipping_address)
<div style="line-height: 25px;">
<div style="font-weight: bold;font-size: 16px;color: #242424;">
{{ __('shop::app.mail.order.shipping-address') }}
</div>
<div>
{{ $order->shipping_address->company_name ?? '' }}
</div>
<div>
{{ $order->shipping_address->company_name ?? '' }}
</div>
<div>
{{ $order->shipping_address->name }}
</div>
<div>
{{ $order->shipping_address->name }}
</div>
<div>
{{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
</div>
<div>
{{ $order->shipping_address->address1 }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
</div>
<div>
{{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
</div>
<div>---</div>
<div>
{{ $order->shipping_address->state }}
</div>
<div style="margin-bottom: 40px;">
{{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }}
</div>
<div style="font-size: 16px;color: #242424; font-weight: bold">
{{ __('shop::app.mail.order.shipping') }}
</div>
<div>---</div>
<div style="font-size: 16px;color: #242424;">
{{ $order->shipping_title }}
<div style="margin-bottom: 40px;">
{{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
</div>
<div style="font-size: 16px;color: #242424;">
{{ __('shop::app.mail.order.shipping') }}
</div>
<div style="font-weight: bold;font-size: 16px;color: #242424;">
{{ $order->shipping_title }}
</div>
</div>
</div>
@endif
<div style="line-height: 25px;">
<div style="font-weight: bold;font-size: 16px;color: #242424;">
@ -83,11 +93,19 @@
</div>
<div>
{{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
{{ $order->billing_address->address1 }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
{{ $order->billing_address->postcode . " " . $order->billing_address->city }}
</div>
<div>
{{ $order->billing_address->state }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }}
</div>
<div>---</div>
@ -96,11 +114,11 @@
{{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
</div>
<div style="font-size: 16px; color: #242424; font-weight: bold">
<div style="font-size: 16px; color: #242424;">
{{ __('shop::app.mail.order.payment') }}
</div>
<div style="font-size: 16px; color: #242424;">
<div style="font-weight: bold; font-size: 16px; color: #242424; margin-bottom: 20px;">
{{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
</div>

28
packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php
View File

@ -48,11 +48,19 @@
</div>
<div>
{{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
{{ $order->shipping_address->address1 }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
{{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
</div>
<div>
{{ $order->shipping_address->state }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }}
</div>
<div>---</div>
@ -94,11 +102,19 @@
</div>
<div>
{{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
{{ $order->billing_address->address1 }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
{{ $order->billing_address->postcode . " " . $order->billing_address->city }}
</div>
<div>
{{ $order->billing_address->state }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }}
</div>
<div>---</div>

28
packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php
View File

@ -47,11 +47,19 @@
</div>
<div>
{{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
{{ $order->shipping_address->address1 }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
{{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
</div>
<div>
{{ $order->shipping_address->state }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }}
</div>
<div>---</div>
@ -84,11 +92,19 @@
</div>
<div>
{{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
{{ $order->billing_address->address1 }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
{{ $order->billing_address->postcode . " " . $order->billing_address->city }}
</div>
<div>
{{ $order->billing_address->state }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }}
</div>
<div>---</div>

24
packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php
View File

@ -44,11 +44,19 @@
</div>
<div>
{{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
{{ $order->shipping_address->address1 }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
{{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
</div>
<div>
{{ $order->shipping_address->state }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }}
</div>
<div>---</div>
@ -81,11 +89,19 @@
</div>
<div>
{{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
{{ $order->billing_address->address1 }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
{{ $order->billing_address->postcode ." " . $order->billing_address->city }}
</div>
<div>
{{ $order->billing_address->state }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }}
</div>
<div>---</div>

24
packages/Webkul/Shop/src/Resources/views/emails/sales/new-refund.blade.php
View File

@ -46,11 +46,19 @@
</div>
<div>
{{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
{{ $order->shipping_address->address1 }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
{{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
</div>
<div>
{{ $order->shipping_address->state }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }}
</div>
<div>---</div>
@ -83,11 +91,19 @@
</div>
<div>
{{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
{{ $order->billing_address->address1 }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
{{ $order->billing_address->postcode . " " . $order->billing_address->city }}
</div>
<div>
{{ $order->billing_address->state }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }}
</div>
<div>---</div>

24
packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
View File

@ -45,11 +45,19 @@
</div>
<div>
{{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
{{ $order->shipping_address->address1 }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
{{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
</div>
<div>
{{ $order->shipping_address->state }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }}
</div>
<div>---</div>
@ -91,11 +99,19 @@
</div>
<div>
{{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
{{ $order->billing_address->address1 }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
{{ $order->billing_address->postcode . " " . $order->billing_address->city }}
</div>
<div>
{{ $order->billing_address->state }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }}
</div>
<div>---</div>

24
packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel-admin.blade.php
View File

@ -47,11 +47,19 @@
</div>
<div>
{{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
{{ $order->shipping_address->address1 }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
{{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
</div>
<div>
{{ $order->shipping_address->state }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }}
</div>
<div>---</div>
@ -83,11 +91,19 @@
</div>
<div>
{{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
{{ $order->billing_address->address1 }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
{{ $order->billing_address->postcode . " " . $order->billing_address->city }}
</div>
<div>
{{ $order->billing_address->state }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }}
</div>
<div>---</div>

22
packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php
View File

@ -43,11 +43,19 @@
</div>
<div>
{{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }}
{{ $order->shipping_address->address1 }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
{{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
</div>
<div>
{{ $order->shipping_address->state }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }}
</div>
<div>---</div>
@ -75,15 +83,19 @@
</div>
<div>
{{ $order->billing_address->name }}
{{ $order->billing_address->address1 }}
</div>
<div>
{{ $order->billing_address->address1 }}, {{ $order->billing_address->state }}
{{ $order->billing_address->postcode . " " . $order->billing_address->city }}
</div>
<div>
{{ $order->billing_address->state }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
{{ core()->country_name($order->billing_address->country) }}
</div>
<div>---</div>

30
packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php
View File

@ -24,10 +24,19 @@
{{ $billingAddress->name }}
</li><br />
<li>
{{ $billingAddress->address1 }}, <br />{{ $billingAddress->state }}
{{ $billingAddress->address1 }}, <br />
</li><br />
<li>
{{ core()->country_name($billingAddress->country) }} {{ $billingAddress->postcode }}
{{ $billingAddress->postcode . " " . $billingAddress->city }}
</li><br />
<li>
{{ $billingAddress->state }}
</li><br />
<li>
{{ core()->country_name($billingAddress->country) }}
</li><br />
<li>
@ -53,11 +62,20 @@
{{ $shippingAddress->name }}
</li><br/>
<li>
{{ $shippingAddress->address1 }},<br/> {{ $shippingAddress->state }}
{{ $shippingAddress->address1 }},<br/>
</li><br/>
<li>
{{ core()->country_name($shippingAddress->country) }} {{ $shippingAddress->postcode }}
</li><br/>
{{ $shippingAddress->postcode . " " . $shippingAddress->city }}
</li><br />
<li>
{{ $shippingAddress->state }}
</li><br />
<li>
{{ core()->country_name($shippingAddress->country) }}
</li><br />
<li>
{{ __('shop::app.checkout.onepage.contact') }} : {{ $shippingAddress->phone }}
@ -173,4 +191,4 @@
</div>
</div>
</accordian>
</div>
</div>