diff --git a/.gitignore b/.gitignore index c0635892a..b26a20012 100644 --- a/.gitignore +++ b/.gitignore @@ -18,10 +18,7 @@ package-lock.json /public/storage /public/themes /public/vendor -/resources/themes/velocity/* -/resources/lang/vendor/admin/* -/resources/lang/vendor/shop/* -/resources/lang/vendor/velocity/* +/resources/lang/vendor /storage/*.key /storage/dcc-data/ /vendor diff --git a/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php b/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php index 5c53c3a66..5fbeb32d3 100644 --- a/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php +++ b/packages/Webkul/Core/src/Helpers/Exchange/ExchangeRates.php @@ -67,7 +67,7 @@ class ExchangeRates extends ExchangeRate $result = json_decode($result->getBody()->getContents(), true); if (isset($result['success']) && ! $result['success']) { - throw new E\xception( + throw new \Exception( isset($result['error']['info']) ? $result['error']['info'] : $result['error']['type'], 1); diff --git a/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php b/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php index e40c1a2e2..f019d40ce 100755 --- a/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php +++ b/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php @@ -70,6 +70,12 @@ class SubscriptionController extends Controller $subscriber = $this->subscribersListRepository->findOrFail($id); + $customer = $subscriber->customer; + + $customer->subscribed_to_news_letter = $data['is_subscribed']; + + $customer->save(); + $result = $subscriber->update($data); if ($result) { @@ -99,7 +105,7 @@ class SubscriptionController extends Controller return response()->json(['message' => true], 200); } catch (\Exception $e) { report($e); - + session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Subscriber'])); } diff --git a/packages/Webkul/Core/src/Models/SubscribersList.php b/packages/Webkul/Core/src/Models/SubscribersList.php index 1259e83a8..d016047f0 100755 --- a/packages/Webkul/Core/src/Models/SubscribersList.php +++ b/packages/Webkul/Core/src/Models/SubscribersList.php @@ -3,6 +3,7 @@ namespace Webkul\Core\Models; use Illuminate\Database\Eloquent\Model; +use Webkul\Customer\Models\CustomerProxy; use Webkul\Core\Contracts\SubscribersList as SubscribersListContract; class SubscribersList extends Model implements SubscribersListContract @@ -24,4 +25,12 @@ class SubscribersList extends Model implements SubscribersListContract ]; protected $hidden = ['token']; + + /** + * Get the customer associated with the subscription. + */ + public function customer() + { + return $this->belongsTo(CustomerProxy::modelClass()); + } } \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php index f38e96513..a3b14395f 100755 --- a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php @@ -49,7 +49,7 @@ class RegistrationController extends Controller * @param \Webkul\Customer\Repositories\CustomerRepository $customer * @param \Webkul\Customer\Repositories\CustomerGroupRepository $customerGroupRepository * @param \Webkul\Core\Repositories\SubscribersListRepository $subscriptionRepository - * + * * @return void */ public function __construct( @@ -97,6 +97,7 @@ class RegistrationController extends Controller 'is_verified' => core()->getConfigData('customer.settings.email.verification') ? 0 : 1, 'customer_group_id' => $this->customerGroupRepository->findOneWhere(['code' => 'general'])->id, 'token' => md5(uniqid(rand(), true)), + 'subscribed_to_news_letter' => isset(request()->input()['is_subscribed']) ? 1 : 0, ]); Event::dispatch('customer.registration.before'); @@ -220,7 +221,7 @@ class RegistrationController extends Controller return redirect()->back(); } - + session()->flash('success', trans('shop::app.customer.signup-form.verification-sent')); return redirect()->back(); diff --git a/packages/Webkul/Customer/src/Models/Customer.php b/packages/Webkul/Customer/src/Models/Customer.php index be81d5e72..12a3a3283 100755 --- a/packages/Webkul/Customer/src/Models/Customer.php +++ b/packages/Webkul/Customer/src/Models/Customer.php @@ -7,6 +7,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable; use Tymon\JWTAuth\Contracts\JWTSubject; use Webkul\Checkout\Models\CartProxy; use Webkul\Sales\Models\OrderProxy; +use Webkul\Core\Models\SubscribersListProxy; use Webkul\Product\Models\ProductReviewProxy; use Webkul\Customer\Notifications\CustomerResetPassword; use Webkul\Customer\Contracts\Customer as CustomerContract; @@ -160,4 +161,12 @@ class Customer extends Authenticatable implements CustomerContract, JWTSubject { return []; } + + /** + * Get the customer's subscription. + */ + public function subscription() + { + return $this->hasOne(SubscribersListProxy::modelClass(), 'customer_id'); + } } diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php index db57418cf..18f2afc45 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php @@ -101,7 +101,7 @@
- subscribed_to_news_letter ? 'checked' : ''}}> + subscription)) value="{{ $customer->subscription->is_subscribed }}" {{ $customer->subscription->is_subscribed ? 'checked' : ''}} @endif> {{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }}
diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php b/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php index 4b227b2ad..73888853e 100644 --- a/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php +++ b/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php @@ -72,7 +72,13 @@ class ShopController extends Controller $response = [ 'status' => true, 'products' => $products->map(function ($product) { - return $this->velocityHelper->formatProduct($product); + if (core()->getConfigData('catalog.products.homepage.out_of_stock_items')) { + return $this->velocityHelper->formatProduct($product); + } else { + if ($product->isSaleable()) { + return $this->velocityHelper->formatProduct($product); + } + } }), ]; diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php index 94d22a384..47a9ee72a 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php @@ -179,7 +179,7 @@
- subscribed_to_news_letter ? 'checked' : ''}} style="width: auto;"> + subscription)) value="{{ $customer->subscription->is_subscribed }}" {{ $customer->subscription->is_subscribed ? 'checked' : ''}} @endif style="width: auto;"> {{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }}
diff --git a/resources/themes/.gitignore b/resources/themes/.gitignore new file mode 100755 index 000000000..d6b7ef32c --- /dev/null +++ b/resources/themes/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/resources/views/.gitignore b/resources/views/.gitignore new file mode 100755 index 000000000..d6b7ef32c --- /dev/null +++ b/resources/views/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/resources/views/errors/401.blade.php b/resources/views/errors/401.blade.php deleted file mode 100644 index 5c586db96..000000000 --- a/resources/views/errors/401.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@extends('errors::minimal') - -@section('title', __('Unauthorized')) -@section('code', '401') -@section('message', __('Unauthorized')) diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php deleted file mode 100644 index a5506f01f..000000000 --- a/resources/views/errors/403.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@extends('errors::minimal') - -@section('title', __('Forbidden')) -@section('code', '403') -@section('message', __($exception->getMessage() ?: 'Forbidden')) diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php deleted file mode 100644 index 7549540d8..000000000 --- a/resources/views/errors/404.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@extends('errors::minimal') - -@section('title', __('Not Found')) -@section('code', '404') -@section('message', __('Not Found')) diff --git a/resources/views/errors/419.blade.php b/resources/views/errors/419.blade.php deleted file mode 100644 index c09216e21..000000000 --- a/resources/views/errors/419.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@extends('errors::minimal') - -@section('title', __('Page Expired')) -@section('code', '419') -@section('message', __('Page Expired')) diff --git a/resources/views/errors/429.blade.php b/resources/views/errors/429.blade.php deleted file mode 100644 index f01b07b8e..000000000 --- a/resources/views/errors/429.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@extends('errors::minimal') - -@section('title', __('Too Many Requests')) -@section('code', '429') -@section('message', __('Too Many Requests')) diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php deleted file mode 100644 index d9e95d9b9..000000000 --- a/resources/views/errors/500.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@extends('errors::minimal') - -@section('title', __('Server Error')) -@section('code', '500') -@section('message', __('Server Error')) diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php deleted file mode 100644 index acd38100a..000000000 --- a/resources/views/errors/503.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@extends('errors::minimal') - -@section('title', __('Service Unavailable')) -@section('code', '503') -@section('message', __($exception->getMessage() ?: 'Service Unavailable')) diff --git a/resources/views/errors/illustrated-layout.blade.php b/resources/views/errors/illustrated-layout.blade.php deleted file mode 100644 index 64eb7cbb8..000000000 --- a/resources/views/errors/illustrated-layout.blade.php +++ /dev/null @@ -1,486 +0,0 @@ - - - - - - - @yield('title') - - - - - - - - - -
-
-
-
- @yield('code', __('Oh no')) -
- -
- -

- @yield('message') -

- - - - -
-
- -
- @yield('image') -
-
- - diff --git a/resources/views/errors/layout.blade.php b/resources/views/errors/layout.blade.php deleted file mode 100644 index 2c51d4f35..000000000 --- a/resources/views/errors/layout.blade.php +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - @yield('title') - - - - - - - - - -
-
-
- @yield('message') -
-
-
- - diff --git a/resources/views/errors/minimal.blade.php b/resources/views/errors/minimal.blade.php deleted file mode 100644 index b63ac2b37..000000000 --- a/resources/views/errors/minimal.blade.php +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - @yield('title') - - - - - - - - - -
-
- @yield('code') -
- -
- @yield('message') -
-
- - diff --git a/resources/views/vendor/mail/html/button.blade.php b/resources/views/vendor/mail/html/button.blade.php deleted file mode 100755 index e74fe55a7..000000000 --- a/resources/views/vendor/mail/html/button.blade.php +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/resources/views/vendor/mail/html/footer.blade.php b/resources/views/vendor/mail/html/footer.blade.php deleted file mode 100755 index 3ff41f89c..000000000 --- a/resources/views/vendor/mail/html/footer.blade.php +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/resources/views/vendor/mail/html/header.blade.php b/resources/views/vendor/mail/html/header.blade.php deleted file mode 100755 index fa1875caa..000000000 --- a/resources/views/vendor/mail/html/header.blade.php +++ /dev/null @@ -1,11 +0,0 @@ - - - -@if (trim($slot) === 'Laravel') - -@else -{{ $slot }} -@endif - - - diff --git a/resources/views/vendor/mail/html/layout.blade.php b/resources/views/vendor/mail/html/layout.blade.php deleted file mode 100755 index 02a54e2da..000000000 --- a/resources/views/vendor/mail/html/layout.blade.php +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php deleted file mode 100755 index deec4a1f4..000000000 --- a/resources/views/vendor/mail/html/message.blade.php +++ /dev/null @@ -1,27 +0,0 @@ -@component('mail::layout') -{{-- Header --}} -@slot('header') -@component('mail::header', ['url' => config('app.url')]) -{{ config('app.name') }} -@endcomponent -@endslot - -{{-- Body --}} -{{ $slot }} - -{{-- Subcopy --}} -@isset($subcopy) -@slot('subcopy') -@component('mail::subcopy') -{{ $subcopy }} -@endcomponent -@endslot -@endisset - -{{-- Footer --}} -@slot('footer') -@component('mail::footer') -© {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.') -@endcomponent -@endslot -@endcomponent diff --git a/resources/views/vendor/mail/html/panel.blade.php b/resources/views/vendor/mail/html/panel.blade.php deleted file mode 100755 index 2975a60a0..000000000 --- a/resources/views/vendor/mail/html/panel.blade.php +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/resources/views/vendor/mail/html/promotion.blade.php b/resources/views/vendor/mail/html/promotion.blade.php deleted file mode 100755 index 8fef44c97..000000000 --- a/resources/views/vendor/mail/html/promotion.blade.php +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/resources/views/vendor/mail/html/promotion/button.blade.php b/resources/views/vendor/mail/html/promotion/button.blade.php deleted file mode 100755 index 1dcb2ee46..000000000 --- a/resources/views/vendor/mail/html/promotion/button.blade.php +++ /dev/null @@ -1,13 +0,0 @@ - - - - -
- - - - -
- {{ $slot }} -
-
diff --git a/resources/views/vendor/mail/html/subcopy.blade.php b/resources/views/vendor/mail/html/subcopy.blade.php deleted file mode 100755 index 790ce6c24..000000000 --- a/resources/views/vendor/mail/html/subcopy.blade.php +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/resources/views/vendor/mail/html/table.blade.php b/resources/views/vendor/mail/html/table.blade.php deleted file mode 100755 index a5f3348b2..000000000 --- a/resources/views/vendor/mail/html/table.blade.php +++ /dev/null @@ -1,3 +0,0 @@ -
-{{ Illuminate\Mail\Markdown::parse($slot) }} -
diff --git a/resources/views/vendor/mail/html/themes/default.css b/resources/views/vendor/mail/html/themes/default.css deleted file mode 100755 index 350fb838f..000000000 --- a/resources/views/vendor/mail/html/themes/default.css +++ /dev/null @@ -1,289 +0,0 @@ -/* Base */ - -body, -body *:not(html):not(style):not(br):not(tr):not(code) { - box-sizing: border-box; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, - 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; - position: relative; -} - -body { - -webkit-text-size-adjust: none; - background-color: #ffffff; - color: #718096; - height: 100%; - line-height: 1.4; - margin: 0; - padding: 0; - width: 100% !important; -} - -p, -ul, -ol, -blockquote { - line-height: 1.4; - text-align: left; -} - -a { - color: #3869d4; -} - -a img { - border: none; -} - -/* Typography */ - -h1 { - color: #3d4852; - font-size: 18px; - font-weight: bold; - margin-top: 0; - text-align: left; -} - -h2 { - font-size: 16px; - font-weight: bold; - margin-top: 0; - text-align: left; -} - -h3 { - font-size: 14px; - font-weight: bold; - margin-top: 0; - text-align: left; -} - -p { - font-size: 16px; - line-height: 1.5em; - margin-top: 0; - text-align: left; -} - -p.sub { - font-size: 12px; -} - -img { - max-width: 100%; -} - -/* Layout */ - -.wrapper { - -premailer-cellpadding: 0; - -premailer-cellspacing: 0; - -premailer-width: 100%; - background-color: #edf2f7; - margin: 0; - padding: 0; - width: 100%; -} - -.content { - -premailer-cellpadding: 0; - -premailer-cellspacing: 0; - -premailer-width: 100%; - margin: 0; - padding: 0; - width: 100%; -} - -/* Header */ - -.header { - padding: 25px 0; - text-align: center; -} - -.header a { - color: #3d4852; - font-size: 19px; - font-weight: bold; - text-decoration: none; -} - -/* Logo */ - -.logo { - height: 75px; - width: 75px; -} - -/* Body */ - -.body { - -premailer-cellpadding: 0; - -premailer-cellspacing: 0; - -premailer-width: 100%; - background-color: #edf2f7; - border-bottom: 1px solid #edf2f7; - border-top: 1px solid #edf2f7; - margin: 0; - padding: 0; - width: 100%; -} - -.inner-body { - -premailer-cellpadding: 0; - -premailer-cellspacing: 0; - -premailer-width: 570px; - background-color: #ffffff; - border-color: #e8e5ef; - border-radius: 2px; - border-width: 1px; - box-shadow: 0 2px 0 rgba(0, 0, 150, 0.025), 2px 4px 0 rgba(0, 0, 150, 0.015); - margin: 0 auto; - padding: 0; - width: 570px; -} - -/* Subcopy */ - -.subcopy { - border-top: 1px solid #e8e5ef; - margin-top: 25px; - padding-top: 25px; -} - -.subcopy p { - font-size: 14px; -} - -/* Footer */ - -.footer { - -premailer-cellpadding: 0; - -premailer-cellspacing: 0; - -premailer-width: 570px; - margin: 0 auto; - padding: 0; - text-align: center; - width: 570px; -} - -.footer p { - color: #b0adc5; - font-size: 12px; - text-align: center; -} - -.footer a { - color: #b0adc5; - text-decoration: underline; -} - -/* Tables */ - -.table table { - -premailer-cellpadding: 0; - -premailer-cellspacing: 0; - -premailer-width: 100%; - margin: 30px auto; - width: 100%; -} - -.table th { - border-bottom: 1px solid #edeff2; - margin: 0; - padding-bottom: 8px; -} - -.table td { - color: #74787e; - font-size: 15px; - line-height: 18px; - margin: 0; - padding: 10px 0; -} - -.content-cell { - max-width: 100vw; - padding: 32px; -} - -/* Buttons */ - -.action { - -premailer-cellpadding: 0; - -premailer-cellspacing: 0; - -premailer-width: 100%; - margin: 30px auto; - padding: 0; - text-align: center; - width: 100%; -} - -.button { - -webkit-text-size-adjust: none; - border-radius: 4px; - color: #fff; - display: inline-block; - overflow: hidden; - text-decoration: none; -} - -.button-blue, -.button-primary { - background-color: #2d3748; - border-bottom: 8px solid #2d3748; - border-left: 18px solid #2d3748; - border-right: 18px solid #2d3748; - border-top: 8px solid #2d3748; -} - -.button-green, -.button-success { - background-color: #48bb78; - border-bottom: 8px solid #48bb78; - border-left: 18px solid #48bb78; - border-right: 18px solid #48bb78; - border-top: 8px solid #48bb78; -} - -.button-red, -.button-error { - background-color: #e53e3e; - border-bottom: 8px solid #e53e3e; - border-left: 18px solid #e53e3e; - border-right: 18px solid #e53e3e; - border-top: 8px solid #e53e3e; -} - -/* Panels */ - -.panel { - border-left: #2d3748 solid 4px; - margin: 21px 0; -} - -.panel-content { - background-color: #edf2f7; - color: #718096; - padding: 16px; -} - -.panel-content p { - color: #718096; -} - -.panel-item { - padding: 0; -} - -.panel-item p:last-of-type { - margin-bottom: 0; - padding-bottom: 0; -} - -/* Utilities */ - -.break-all { - word-break: break-all; -} diff --git a/resources/views/vendor/mail/markdown/button.blade.php b/resources/views/vendor/mail/markdown/button.blade.php deleted file mode 100755 index 97444ebdc..000000000 --- a/resources/views/vendor/mail/markdown/button.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }}: {{ $url }} diff --git a/resources/views/vendor/mail/markdown/footer.blade.php b/resources/views/vendor/mail/markdown/footer.blade.php deleted file mode 100755 index 3338f620e..000000000 --- a/resources/views/vendor/mail/markdown/footer.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/mail/markdown/header.blade.php b/resources/views/vendor/mail/markdown/header.blade.php deleted file mode 100755 index aaa3e5754..000000000 --- a/resources/views/vendor/mail/markdown/header.blade.php +++ /dev/null @@ -1 +0,0 @@ -[{{ $slot }}]({{ $url }}) diff --git a/resources/views/vendor/mail/markdown/layout.blade.php b/resources/views/vendor/mail/markdown/layout.blade.php deleted file mode 100755 index 9378baa07..000000000 --- a/resources/views/vendor/mail/markdown/layout.blade.php +++ /dev/null @@ -1,9 +0,0 @@ -{!! strip_tags($header) !!} - -{!! strip_tags($slot) !!} -@isset($subcopy) - -{!! strip_tags($subcopy) !!} -@endisset - -{!! strip_tags($footer) !!} diff --git a/resources/views/vendor/mail/markdown/message.blade.php b/resources/views/vendor/mail/markdown/message.blade.php deleted file mode 100755 index b409c71cb..000000000 --- a/resources/views/vendor/mail/markdown/message.blade.php +++ /dev/null @@ -1,27 +0,0 @@ -@component('mail::layout') - {{-- Header --}} - @slot('header') - @component('mail::header', ['url' => config('app.url')]) - {{ config('app.name') }} - @endcomponent - @endslot - - {{-- Body --}} - {{ $slot }} - - {{-- Subcopy --}} - @isset($subcopy) - @slot('subcopy') - @component('mail::subcopy') - {{ $subcopy }} - @endcomponent - @endslot - @endisset - - {{-- Footer --}} - @slot('footer') - @component('mail::footer') - © {{ date('Y') }} {{ config('app.name') }}. All rights reserved. - @endcomponent - @endslot -@endcomponent diff --git a/resources/views/vendor/mail/markdown/panel.blade.php b/resources/views/vendor/mail/markdown/panel.blade.php deleted file mode 100755 index 3338f620e..000000000 --- a/resources/views/vendor/mail/markdown/panel.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/mail/markdown/promotion.blade.php b/resources/views/vendor/mail/markdown/promotion.blade.php deleted file mode 100755 index 3338f620e..000000000 --- a/resources/views/vendor/mail/markdown/promotion.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/mail/markdown/promotion/button.blade.php b/resources/views/vendor/mail/markdown/promotion/button.blade.php deleted file mode 100755 index aaa3e5754..000000000 --- a/resources/views/vendor/mail/markdown/promotion/button.blade.php +++ /dev/null @@ -1 +0,0 @@ -[{{ $slot }}]({{ $url }}) diff --git a/resources/views/vendor/mail/markdown/subcopy.blade.php b/resources/views/vendor/mail/markdown/subcopy.blade.php deleted file mode 100755 index 3338f620e..000000000 --- a/resources/views/vendor/mail/markdown/subcopy.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/mail/markdown/table.blade.php b/resources/views/vendor/mail/markdown/table.blade.php deleted file mode 100755 index 3338f620e..000000000 --- a/resources/views/vendor/mail/markdown/table.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/mail/text/button.blade.php b/resources/views/vendor/mail/text/button.blade.php deleted file mode 100644 index 97444ebdc..000000000 --- a/resources/views/vendor/mail/text/button.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }}: {{ $url }} diff --git a/resources/views/vendor/mail/text/footer.blade.php b/resources/views/vendor/mail/text/footer.blade.php deleted file mode 100644 index 3338f620e..000000000 --- a/resources/views/vendor/mail/text/footer.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/mail/text/header.blade.php b/resources/views/vendor/mail/text/header.blade.php deleted file mode 100644 index aaa3e5754..000000000 --- a/resources/views/vendor/mail/text/header.blade.php +++ /dev/null @@ -1 +0,0 @@ -[{{ $slot }}]({{ $url }}) diff --git a/resources/views/vendor/mail/text/layout.blade.php b/resources/views/vendor/mail/text/layout.blade.php deleted file mode 100644 index 9378baa07..000000000 --- a/resources/views/vendor/mail/text/layout.blade.php +++ /dev/null @@ -1,9 +0,0 @@ -{!! strip_tags($header) !!} - -{!! strip_tags($slot) !!} -@isset($subcopy) - -{!! strip_tags($subcopy) !!} -@endisset - -{!! strip_tags($footer) !!} diff --git a/resources/views/vendor/mail/text/message.blade.php b/resources/views/vendor/mail/text/message.blade.php deleted file mode 100644 index 1ae9ed8f1..000000000 --- a/resources/views/vendor/mail/text/message.blade.php +++ /dev/null @@ -1,27 +0,0 @@ -@component('mail::layout') - {{-- Header --}} - @slot('header') - @component('mail::header', ['url' => config('app.url')]) - {{ config('app.name') }} - @endcomponent - @endslot - - {{-- Body --}} - {{ $slot }} - - {{-- Subcopy --}} - @isset($subcopy) - @slot('subcopy') - @component('mail::subcopy') - {{ $subcopy }} - @endcomponent - @endslot - @endisset - - {{-- Footer --}} - @slot('footer') - @component('mail::footer') - © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.') - @endcomponent - @endslot -@endcomponent diff --git a/resources/views/vendor/mail/text/panel.blade.php b/resources/views/vendor/mail/text/panel.blade.php deleted file mode 100644 index 3338f620e..000000000 --- a/resources/views/vendor/mail/text/panel.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/mail/text/promotion.blade.php b/resources/views/vendor/mail/text/promotion.blade.php deleted file mode 100644 index 3338f620e..000000000 --- a/resources/views/vendor/mail/text/promotion.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/mail/text/promotion/button.blade.php b/resources/views/vendor/mail/text/promotion/button.blade.php deleted file mode 100644 index aaa3e5754..000000000 --- a/resources/views/vendor/mail/text/promotion/button.blade.php +++ /dev/null @@ -1 +0,0 @@ -[{{ $slot }}]({{ $url }}) diff --git a/resources/views/vendor/mail/text/subcopy.blade.php b/resources/views/vendor/mail/text/subcopy.blade.php deleted file mode 100644 index 3338f620e..000000000 --- a/resources/views/vendor/mail/text/subcopy.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/mail/text/table.blade.php b/resources/views/vendor/mail/text/table.blade.php deleted file mode 100644 index 3338f620e..000000000 --- a/resources/views/vendor/mail/text/table.blade.php +++ /dev/null @@ -1 +0,0 @@ -{{ $slot }} diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php deleted file mode 100755 index e7a56b461..000000000 --- a/resources/views/vendor/notifications/email.blade.php +++ /dev/null @@ -1,62 +0,0 @@ -@component('mail::message') -{{-- Greeting --}} -@if (! empty($greeting)) -# {{ $greeting }} -@else -@if ($level === 'error') -# @lang('Whoops!') -@else -# @lang('Hello!') -@endif -@endif - -{{-- Intro Lines --}} -@foreach ($introLines as $line) -{{ $line }} - -@endforeach - -{{-- Action Button --}} -@isset($actionText) - -@component('mail::button', ['url' => $actionUrl, 'color' => $color]) -{{ $actionText }} -@endcomponent -@endisset - -{{-- Outro Lines --}} -@foreach ($outroLines as $line) -{{ $line }} - -@endforeach - -{{-- Salutation --}} -@if (! empty($salutation)) -{{ $salutation }} -@else -@lang('Regards'),
-{{ config('app.name') }} -@endif - -{{-- Subcopy --}} -@isset($actionText) -@slot('subcopy') -@lang( - "If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\n". - 'into your web browser:', - [ - 'actionText' => $actionText, - ] -) [{{ $displayableActionUrl }}]({{ $actionUrl }}) -@endslot -@endisset -@endcomponent diff --git a/resources/views/vendor/pagination/bootstrap-4.blade.php b/resources/views/vendor/pagination/bootstrap-4.blade.php deleted file mode 100755 index 63c6f56b5..000000000 --- a/resources/views/vendor/pagination/bootstrap-4.blade.php +++ /dev/null @@ -1,46 +0,0 @@ -@if ($paginator->hasPages()) - -@endif diff --git a/resources/views/vendor/pagination/default.blade.php b/resources/views/vendor/pagination/default.blade.php deleted file mode 100755 index 0db70b562..000000000 --- a/resources/views/vendor/pagination/default.blade.php +++ /dev/null @@ -1,46 +0,0 @@ -@if ($paginator->hasPages()) - -@endif diff --git a/resources/views/vendor/pagination/semantic-ui.blade.php b/resources/views/vendor/pagination/semantic-ui.blade.php deleted file mode 100755 index ef0dbb184..000000000 --- a/resources/views/vendor/pagination/semantic-ui.blade.php +++ /dev/null @@ -1,36 +0,0 @@ -@if ($paginator->hasPages()) - -@endif diff --git a/resources/views/vendor/pagination/simple-bootstrap-4.blade.php b/resources/views/vendor/pagination/simple-bootstrap-4.blade.php deleted file mode 100755 index 4bb491742..000000000 --- a/resources/views/vendor/pagination/simple-bootstrap-4.blade.php +++ /dev/null @@ -1,27 +0,0 @@ -@if ($paginator->hasPages()) - -@endif diff --git a/resources/views/vendor/pagination/simple-default.blade.php b/resources/views/vendor/pagination/simple-default.blade.php deleted file mode 100755 index 36bdbc18c..000000000 --- a/resources/views/vendor/pagination/simple-default.blade.php +++ /dev/null @@ -1,19 +0,0 @@ -@if ($paginator->hasPages()) - -@endif diff --git a/resources/views/vendor/pagination/simple-tailwind.blade.php b/resources/views/vendor/pagination/simple-tailwind.blade.php deleted file mode 100644 index 1c5e52f3e..000000000 --- a/resources/views/vendor/pagination/simple-tailwind.blade.php +++ /dev/null @@ -1,25 +0,0 @@ -@if ($paginator->hasPages()) - -@endif diff --git a/resources/views/vendor/pagination/tailwind.blade.php b/resources/views/vendor/pagination/tailwind.blade.php deleted file mode 100644 index 4b92aaba1..000000000 --- a/resources/views/vendor/pagination/tailwind.blade.php +++ /dev/null @@ -1,102 +0,0 @@ -@if ($paginator->hasPages()) - -@endif