From 45edff468d941f1c419b3027c5ee2a40cb2649f5 Mon Sep 17 00:00:00 2001 From: Jade Geels Date: Wed, 11 Dec 2024 15:40:30 +0100 Subject: [PATCH 1/2] Add config option for newsletter visibility --- config/rapidez/checkout-theme.php | 20 ++++++++++++++++--- resources/views/account/edit.blade.php | 8 +++++--- .../partials/register-account.blade.php | 8 +++++--- .../checkout/steps/credentials.blade.php | 8 +++++--- .../views/checkout/steps/success.blade.php | 8 +++++--- 5 files changed, 37 insertions(+), 15 deletions(-) diff --git a/config/rapidez/checkout-theme.php b/config/rapidez/checkout-theme.php index 42321379..5ee58135 100644 --- a/config/rapidez/checkout-theme.php +++ b/config/rapidez/checkout-theme.php @@ -21,15 +21,29 @@ 'subheading' => 'Logout from your account', ], ], + + // Show the newsletter signup prompt in the account center + 'newsletter' => true, ], 'checkout' => [ + 'credentials' => [ + // Show the newsletter signup prompt on the credentials page + 'newsletter' => true, + ], + 'success' => [ - // Show the account registration on the success page? - 'register' => false + // Show the account registration on the success page + 'register' => false, + + // Show the newsletter signup prompt on the success page + 'newsletter' => true, ], ], 'register' => [ - // Make the user create an address during registration. + // Make the user create an address during registration 'create-address' => false, + + // Show the newsletter signup prompt during registration + 'newsletter' => true, ], ]; diff --git a/resources/views/account/edit.blade.php b/resources/views/account/edit.blade.php index bb0f358d..9ff109e6 100644 --- a/resources/views/account/edit.blade.php +++ b/resources/views/account/edit.blade.php @@ -11,9 +11,11 @@ @include('rapidez-ct::account.partials.sections.edit.addresses') - - @include('rapidez-ct::account.partials.sections.edit.newsletter') - + @if (config('rapidez.checkout-theme.account.newsletter')) + + @include('rapidez-ct::account.partials.sections.edit.newsletter') + + @endif @include('rapidez-ct::account.partials.sections.edit.email') diff --git a/resources/views/account/partials/register-account.blade.php b/resources/views/account/partials/register-account.blade.php index 01022286..a38d3dc0 100644 --- a/resources/views/account/partials/register-account.blade.php +++ b/resources/views/account/partials/register-account.blade.php @@ -97,9 +97,11 @@ class="grid gap-5 md:grid-cols-2" @endif - - - + @if (config('rapidez.checkout-theme.register.newsletter')) + + + + @endif diff --git a/resources/views/checkout/steps/credentials.blade.php b/resources/views/checkout/steps/credentials.blade.php index b0bc25b5..1dd506df 100644 --- a/resources/views/checkout/steps/credentials.blade.php +++ b/resources/views/checkout/steps/credentials.blade.php @@ -7,9 +7,11 @@ @include('rapidez-ct::checkout.partials.sections.address') - - @include('rapidez-ct::checkout.partials.sections.newsletter') - + @if (config('rapidez.checkout-theme.checkout.credentials.newsletter')) + + @include('rapidez-ct::checkout.partials.sections.newsletter') + + @endif @include('rapidez-ct::checkout.partials.sections.shipping') diff --git a/resources/views/checkout/steps/success.blade.php b/resources/views/checkout/steps/success.blade.php index 6e095349..a3375dbd 100644 --- a/resources/views/checkout/steps/success.blade.php +++ b/resources/views/checkout/steps/success.blade.php @@ -19,9 +19,11 @@ @include('rapidez-ct::checkout.partials.sections.success.products') - - @include('rapidez-ct::checkout.partials.sections.success.newsletter') - + @if (config('rapidez.checkout-theme.checkout.success.newsletter')) + + @include('rapidez-ct::checkout.partials.sections.success.newsletter') + + @endif @if (config('rapidez.checkout-theme.checkout.success.register')) @include('rapidez-ct::checkout.partials.sections.success.create-account') From b2d7462efce5e9be1dac21a5322be0a22955c754 Mon Sep 17 00:00:00 2001 From: Jade Geels Date: Fri, 13 Dec 2024 10:31:57 +0100 Subject: [PATCH 2/2] Just use the one magento setting instead --- config/rapidez/checkout-theme.php | 14 -------------- resources/views/account/edit.blade.php | 2 +- .../account/partials/register-account.blade.php | 2 +- .../views/checkout/steps/credentials.blade.php | 2 +- resources/views/checkout/steps/success.blade.php | 2 +- 5 files changed, 4 insertions(+), 18 deletions(-) diff --git a/config/rapidez/checkout-theme.php b/config/rapidez/checkout-theme.php index 5ee58135..4adf3098 100644 --- a/config/rapidez/checkout-theme.php +++ b/config/rapidez/checkout-theme.php @@ -21,29 +21,15 @@ 'subheading' => 'Logout from your account', ], ], - - // Show the newsletter signup prompt in the account center - 'newsletter' => true, ], 'checkout' => [ - 'credentials' => [ - // Show the newsletter signup prompt on the credentials page - 'newsletter' => true, - ], - 'success' => [ // Show the account registration on the success page 'register' => false, - - // Show the newsletter signup prompt on the success page - 'newsletter' => true, ], ], 'register' => [ // Make the user create an address during registration 'create-address' => false, - - // Show the newsletter signup prompt during registration - 'newsletter' => true, ], ]; diff --git a/resources/views/account/edit.blade.php b/resources/views/account/edit.blade.php index 9ff109e6..97453fab 100644 --- a/resources/views/account/edit.blade.php +++ b/resources/views/account/edit.blade.php @@ -11,7 +11,7 @@ @include('rapidez-ct::account.partials.sections.edit.addresses') - @if (config('rapidez.checkout-theme.account.newsletter')) + @if (Rapidez::config('newsletter/general/active', 1)) @include('rapidez-ct::account.partials.sections.edit.newsletter') diff --git a/resources/views/account/partials/register-account.blade.php b/resources/views/account/partials/register-account.blade.php index a38d3dc0..4e057d2c 100644 --- a/resources/views/account/partials/register-account.blade.php +++ b/resources/views/account/partials/register-account.blade.php @@ -97,7 +97,7 @@ class="grid gap-5 md:grid-cols-2" @endif - @if (config('rapidez.checkout-theme.register.newsletter')) + @if (Rapidez::config('newsletter/general/active', 1)) diff --git a/resources/views/checkout/steps/credentials.blade.php b/resources/views/checkout/steps/credentials.blade.php index 1dd506df..695a528e 100644 --- a/resources/views/checkout/steps/credentials.blade.php +++ b/resources/views/checkout/steps/credentials.blade.php @@ -7,7 +7,7 @@ @include('rapidez-ct::checkout.partials.sections.address') - @if (config('rapidez.checkout-theme.checkout.credentials.newsletter')) + @if (Rapidez::config('newsletter/general/active', 1)) @include('rapidez-ct::checkout.partials.sections.newsletter') diff --git a/resources/views/checkout/steps/success.blade.php b/resources/views/checkout/steps/success.blade.php index a3375dbd..f1823678 100644 --- a/resources/views/checkout/steps/success.blade.php +++ b/resources/views/checkout/steps/success.blade.php @@ -19,7 +19,7 @@ @include('rapidez-ct::checkout.partials.sections.success.products') - @if (config('rapidez.checkout-theme.checkout.success.newsletter')) + @if (Rapidez::config('newsletter/general/active', 1)) @include('rapidez-ct::checkout.partials.sections.success.newsletter')