From b7dac3838b586f856436e2a61ef15347a3e76c69 Mon Sep 17 00:00:00 2001 From: Florian Eisenmenger Date: Fri, 25 Feb 2022 16:13:54 +0100 Subject: [PATCH] check check --- AtlDiscountExtension-main/.DS_Store | Bin 0 -> 6148 bytes AtlDiscountExtension-main/README.md | 5 + AtlDiscountExtension-main/composer.json | 34 +++ AtlDiscountExtension-main/src/.DS_Store | Bin 0 -> 6148 bytes .../src/AtlDiscountExtension.php | 22 ++ .../src/Command/CheckDiscountEligibility.php | 136 ++++++++++++ .../RepeatDiscountCollection.php | 19 ++ .../RepeatDiscountDefinition.php | 44 ++++ .../RepeatDiscount/RepeatDiscountEntity.php | 75 +++++++ .../Checkout/Customer/CustomerExtension.php | 24 +++ .../Migration1645524148SpwnRepeatDiscount.php | 36 ++++ .../src/Resources/config/config.xml | 37 ++++ .../src/Resources/config/plugin.png | Bin 0 -> 4219 bytes .../src/Resources/config/services.xml | 31 +++ .../StateMachineTransitionSubscriber.php | 198 ++++++++++++++++++ .../app/storefront/src/scss/base.scss | 3 + .../scss/component/_filter-multi-select.scss | 24 +++ .../src/scss/component/_product-box.scss | 12 ++ .../storefront/src/scss/layout/_footer.scss | 99 +++++++++ .../storefront/src/scss/layout/_header.scss | 19 ++ .../src/scss/page/content/_breadcrumb.scss | 13 ++ .../preview.html | 9 - .../swag-gallery-buybox-abnehmplan/styles.css | 35 ---- .../filter/filter-multi-select.html.twig | 56 +++++ .../product/card/box-standard.html.twig | 8 + .../storefront/layout/footer/footer.html.twig | 4 + .../storefront/layout/header/header.html.twig | 141 +++++++++++++ .../js/zenit-platform-atmos-set2.js | 118 +++++++++++ .../block/cms-block-gallery-buybox.html.twig | 40 ++++ ...lery-buybox-abnehmplan-component.html.twig | 0 .../component/buy-widget/buy-widget.html.twig | 21 ++ .../checkout/offcanvas-cart.html.twig | 74 +++++++ .../checkout/offcanvas-item.html.twig | 69 ++++++ .../filter/filter-multi-select.html.twig | 56 +++++ .../product/card/box-standard.html.twig | 170 +++++++++++++++ .../product/card/price-unit.html.twig | 55 +++++ .../component/product/listing.html.twig | 41 ++++ .../storefront/layout/footer/footer.html.twig | 11 + .../storefront/layout/header/header.html.twig | 141 +++++++++++++ .../page/checkout/cart/index.html.twig | 63 ++++++ .../page/checkout/checkout-item.html.twig | 50 +++++ .../confirm/confirm-address.html.twig | 17 ++ .../page/checkout/confirm/index.html.twig | 112 ++++++++++ .../summary/summary-shipping.html.twig | 25 +++ .../page/product-detail/description.html.twig | 16 ++ .../page/product-detail/index.html.twig | 18 ++ 46 files changed, 2137 insertions(+), 44 deletions(-) create mode 100644 AtlDiscountExtension-main/.DS_Store create mode 100644 AtlDiscountExtension-main/README.md create mode 100644 AtlDiscountExtension-main/composer.json create mode 100644 AtlDiscountExtension-main/src/.DS_Store create mode 100644 AtlDiscountExtension-main/src/AtlDiscountExtension.php create mode 100644 AtlDiscountExtension-main/src/Command/CheckDiscountEligibility.php create mode 100644 AtlDiscountExtension-main/src/Core/System/RepeatDiscount/RepeatDiscountCollection.php create mode 100644 AtlDiscountExtension-main/src/Core/System/RepeatDiscount/RepeatDiscountDefinition.php create mode 100644 AtlDiscountExtension-main/src/Core/System/RepeatDiscount/RepeatDiscountEntity.php create mode 100644 AtlDiscountExtension-main/src/Extension/Checkout/Customer/CustomerExtension.php create mode 100644 AtlDiscountExtension-main/src/Migration/Migration1645524148SpwnRepeatDiscount.php create mode 100644 AtlDiscountExtension-main/src/Resources/config/config.xml create mode 100644 AtlDiscountExtension-main/src/Resources/config/plugin.png create mode 100644 AtlDiscountExtension-main/src/Resources/config/services.xml create mode 100644 AtlDiscountExtension-main/src/Subscriber/StateMachineTransitionSubscriber.php create mode 100644 zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/component/_filter-multi-select.scss create mode 100644 zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_footer.scss create mode 100644 zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/content/_breadcrumb.scss delete mode 100644 zenitPlatformAtmosSet1/src/Resources/cms/blocks/swag-gallery-buybox-abnehmplan/preview.html delete mode 100644 zenitPlatformAtmosSet1/src/Resources/cms/blocks/swag-gallery-buybox-abnehmplan/styles.css create mode 100644 zenitPlatformAtmosSet1/src/Resources/views/storefront/component/listing/filter/filter-multi-select.html.twig create mode 100644 zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/header/header.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-swag-gallery-buybox-abnehmplan-component.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/component/buy-widget/buy-widget.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-cart.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/component/listing/filter/filter-multi-select.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/box-standard.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/price-unit.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/listing.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/footer/footer.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/header/header.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/cart/index.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/checkout-item.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/confirm/confirm-address.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/confirm/index.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/summary/summary-shipping.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/description.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/index.html.twig diff --git a/AtlDiscountExtension-main/.DS_Store b/AtlDiscountExtension-main/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9a874b5768f336915163bb88cd434575b859f936 GIT binary patch literal 6148 zcmeH~Jr2S!425ml0g0s}V-^m;4I%_5-~tF3k&vj^b9A16778<}(6eNJu~Vz<8=6`~ zboab&MFtUB!i}=AFfm2m$tVxGT*u4pe81nUlA49C} z?O@64YO)2RT{MRe%{!}2F))pG(Sih~)xkgosK7*lF7m<7{{#Hn{6A@7N(HFEpDCdI z{V+K427TDNJVtRvdg(bZ!iLS0xr-(SX82o6vRF|uHEM!Bv8nkeepUserData()) { + return; + } + + $connection = $this->container->get(Connection::class); + $connection->executeStatement("DROP TABLE IF EXISTS `spwn_repeat_discount`"); + } +} \ No newline at end of file diff --git a/AtlDiscountExtension-main/src/Command/CheckDiscountEligibility.php b/AtlDiscountExtension-main/src/Command/CheckDiscountEligibility.php new file mode 100644 index 0000000..ca5c6d9 --- /dev/null +++ b/AtlDiscountExtension-main/src/Command/CheckDiscountEligibility.php @@ -0,0 +1,136 @@ +systemConfigService = $systemConfigService; + $this->repeatDiscountRepository = $repeatDiscountRepository; + $this->customerTagRepository = $customerTagRepository; + } + + protected function configure(): void + { + $this->setDescription('Checks the discount eligibility and removes the discount customer tag if it expired.'); + } + + /** + * @param InputInterface $input + * @param OutputInterface $output + * @return int + */ + protected function execute(InputInterface $input, OutputInterface $output): int + { + $io = new ShopwareStyle($input, $output); + + $tagId = $this->systemConfigService->get('AtlDiscountExtension.config.tag'); + + if (empty($tagId)) { + $io->warning('Customer tag assignment in plugin configuration is missing.'); + return self::FAILURE; + } + + $expiredDiscounts = $this->getExpiredDiscounts(); + + if (empty($expiredDiscounts)) { + $io->success('No customer tags were removed.'); + return self::SUCCESS; + } + + $tags = []; + $discounts = []; + foreach ($expiredDiscounts as $expiredDiscount) { + $tags[] = [ + 'customerId' => $expiredDiscount->getCustomerId(), + 'tagId' => $tagId + ]; + + $discounts[] = [ + 'id' => $expiredDiscount->getId() + ]; + } + + $this->removeCustomerTags($tags); + $this->removeDiscounts($discounts); + + $io->success(sprintf('Successfully deleted %d expired discounts.', count($expiredDiscounts))); + + return self::SUCCESS; + } + + /** + * @return array + */ + private function getExpiredDiscounts(): array + { + $expirationDays = $this->systemConfigService->get('AtlDiscountExtension.config.expirationDays'); + + // Go $expirationDays back in time + $expirationDate = (new \DateTime())->add(\DateInterval::createFromDateString('-' . $expirationDays . ' days')); + + $criteria = new Criteria(); + $criteria->addFilter( + new RangeFilter('lastOrderDate', + [ + // last order date is earlier than expiration date + RangeFilter::LTE => $expirationDate->format(\DATE_ATOM), + ] + )); + $criteria->setLimit(999); + + return $this->repeatDiscountRepository->search($criteria, Context::createDefaultContext())->getElements(); + } + + /** + * @param array $tags + * @return void + */ + private function removeCustomerTags(array $tags): void + { + $this->customerTagRepository->delete($tags, Context::createDefaultContext()); + } + + /** + * @param array $discounts + * @return void + */ + private function removeDiscounts(array $discounts): void + { + $this->repeatDiscountRepository->delete($discounts, Context::createDefaultContext()); + } +} \ No newline at end of file diff --git a/AtlDiscountExtension-main/src/Core/System/RepeatDiscount/RepeatDiscountCollection.php b/AtlDiscountExtension-main/src/Core/System/RepeatDiscount/RepeatDiscountCollection.php new file mode 100644 index 0000000..844ae2d --- /dev/null +++ b/AtlDiscountExtension-main/src/Core/System/RepeatDiscount/RepeatDiscountCollection.php @@ -0,0 +1,19 @@ +addFlags(new ApiAware(), new PrimaryKey(), new Required()), + (new FkField('customer_id', 'customerId', CustomerDefinition::class))->addFlags(new ApiAware(), new Required()), + (new DateTimeField('last_order_date', 'lastOrderDate'))->addFlags(new ApiAware(), new Required()), + new OneToOneAssociationField('customer', 'customer_id', 'id', CustomerDefinition::class, false) + ]); + } +} diff --git a/AtlDiscountExtension-main/src/Core/System/RepeatDiscount/RepeatDiscountEntity.php b/AtlDiscountExtension-main/src/Core/System/RepeatDiscount/RepeatDiscountEntity.php new file mode 100644 index 0000000..cf749e4 --- /dev/null +++ b/AtlDiscountExtension-main/src/Core/System/RepeatDiscount/RepeatDiscountEntity.php @@ -0,0 +1,75 @@ +customerId; + } + + /** + * @param string $customerId + */ + public function setCustomerId(string $customerId): void + { + $this->customerId = $customerId; + } + + /** + * @return \DateTimeInterface + */ + public function getLastOrderDate(): \DateTimeInterface + { + return $this->lastOrderDate; + } + + /** + * @param \DateTimeInterface $lastOrderDate + */ + public function setLastOrderDate(\DateTimeInterface $lastOrderDate): void + { + $this->lastOrderDate = $lastOrderDate; + } + + /** + * @return CustomerEntity + */ + public function getCustomer(): CustomerEntity + { + return $this->customer; + } + + /** + * @param CustomerEntity $customer + */ + public function setCustomer(CustomerEntity $customer): void + { + $this->customer = $customer; + } +} \ No newline at end of file diff --git a/AtlDiscountExtension-main/src/Extension/Checkout/Customer/CustomerExtension.php b/AtlDiscountExtension-main/src/Extension/Checkout/Customer/CustomerExtension.php new file mode 100644 index 0000000..5e0676c --- /dev/null +++ b/AtlDiscountExtension-main/src/Extension/Checkout/Customer/CustomerExtension.php @@ -0,0 +1,24 @@ +add( + (new OneToOneAssociationField('repeatDiscount', 'id', 'customer_id', RepeatDiscountDefinition::class)) + ); + } + + public function getDefinitionClass(): string + { + return CustomerDefinition::class; + } +} \ No newline at end of file diff --git a/AtlDiscountExtension-main/src/Migration/Migration1645524148SpwnRepeatDiscount.php b/AtlDiscountExtension-main/src/Migration/Migration1645524148SpwnRepeatDiscount.php new file mode 100644 index 0000000..a49e408 --- /dev/null +++ b/AtlDiscountExtension-main/src/Migration/Migration1645524148SpwnRepeatDiscount.php @@ -0,0 +1,36 @@ +executeStatement(' + CREATE TABLE IF NOT EXISTS `spwn_repeat_discount` ( + `id` BINARY(16) NOT NULL, + `customer_id` BINARY(16) NOT NULL, + `last_order_date` DATETIME(3) NOT NULL, + `created_at` DATETIME(3) NOT NULL, + `updated_at` DATETIME(3) NULL, + PRIMARY KEY (`id`), + CONSTRAINT `uniq.spwn_repeat_discount.customer_id` UNIQUE (`customer_id`), + CONSTRAINT `fk.spwn_repeat_discount.customer_id` FOREIGN KEY (`customer_id`) + REFERENCES `customer` (`id`) ON DELETE CASCADE ON UPDATE CASCADE + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + '); + } + + public function updateDestructive(Connection $connection): void + { + // implement update destructive + } +} diff --git a/AtlDiscountExtension-main/src/Resources/config/config.xml b/AtlDiscountExtension-main/src/Resources/config/config.xml new file mode 100644 index 0000000..add4433 --- /dev/null +++ b/AtlDiscountExtension-main/src/Resources/config/config.xml @@ -0,0 +1,37 @@ + + + + + Settings + Einstellungen + + + customField + custom_field + + + + + + minAmountDiscountableLineItems + + + 3 + + + + tag + tag + + + + + + expirationDays + + + 56 + + + \ No newline at end of file diff --git a/AtlDiscountExtension-main/src/Resources/config/plugin.png b/AtlDiscountExtension-main/src/Resources/config/plugin.png new file mode 100644 index 0000000000000000000000000000000000000000..6f325b161b27689c4f132f5c48a5b93fdc6dd96c GIT binary patch literal 4219 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AtlDiscountExtension-main/src/Subscriber/StateMachineTransitionSubscriber.php b/AtlDiscountExtension-main/src/Subscriber/StateMachineTransitionSubscriber.php new file mode 100644 index 0000000..677ada9 --- /dev/null +++ b/AtlDiscountExtension-main/src/Subscriber/StateMachineTransitionSubscriber.php @@ -0,0 +1,198 @@ +systemConfigService = $systemConfigService; + $this->orderDeliveryRepository = $orderDeliveryRepository; + $this->customFieldRepository = $customFieldRepository; + $this->customerRepository = $customerRepository; + } + + /** + * @return string[] + */ + public static function getSubscribedEvents(): array + { + return [ + StateMachineTransitionEvent::class => 'onStateTransition' + ]; + } + + /** + * @param StateMachineTransitionEvent $event + * @return void + */ + public function onStateTransition(StateMachineTransitionEvent $event): void + { + // Early return if transition state is not 'shipped' + if ($event->getToPlace()->getTechnicalName() !== OrderDeliveryStates::STATE_SHIPPED) { + return; + } + + $orderDeliveryId = $event->getEntityId(); + $orderDelivery = $this->getOrderDelivery($orderDeliveryId, $event); + + // In case no order delivery could be found - return + if (empty($orderDelivery)) { + return; + } + + $amountDiscountableLineItems = $this->getAmountDiscountableLineItems($orderDelivery->getPositions(), $event); + $minAmountDiscountableLineItems = $this->systemConfigService->get('AtlDiscountExtension.config.minAmountDiscountableLineItems'); + + if ($amountDiscountableLineItems < $minAmountDiscountableLineItems) { + return; + } + + $customer = $orderDelivery->getOrder()->getOrderCustomer()->getCustomer(); + + // Tag the customer and trace timestamp in 'spwn_repeat_discount' table + $this->tagCustomer($customer, $event); + } + + /** + * @param string $orderDeliveryId + * @param StateMachineTransitionEvent $event + * @return OrderDeliveryEntity + */ + private function getOrderDelivery(string $orderDeliveryId, StateMachineTransitionEvent $event): OrderDeliveryEntity + { + $criteria = new Criteria(); + $criteria->addFilter(new EqualsFilter('id', $orderDeliveryId)); + $criteria->addAssociation('positions.orderLineItem'); + $criteria->addAssociation('order.orderCustomer.customer'); + + return $this->orderDeliveryRepository->search($criteria, $event->getContext())->first(); + } + + /** + * @param OrderDeliveryPositionCollection $positions + * @return int + */ + private function getAmountDiscountableLineItems(OrderDeliveryPositionCollection $positions, StateMachineTransitionEvent $event): int + { + $customFieldName = $this->getCustomFieldName($event); + + // In case no custom field was assigned in the plugin config - return + if ($customFieldName === '') { + return 0; + } + + $amountDiscountableLineItems = 0; + foreach($positions as $position) { + $customFields = $position->getOrderLineItem()->getPayload()['customFields']; + + // Checks if the custom field is set to true + if ($customFields[$customFieldName] === true) { + $amountDiscountableLineItems++; + } + } + + return $amountDiscountableLineItems; + } + + /** + * @param StateMachineTransitionEvent $event + * @return string + */ + private function getCustomFieldName(StateMachineTransitionEvent $event): string + { + $customFieldId = $this->systemConfigService->get('AtlDiscountExtension.config.customField'); + + $criteria = new Criteria(); + $criteria->addFilter(new EqualsFilter('id', $customFieldId)); + + /** @var CustomFieldEntity $customField */ + $customField = $this->customFieldRepository->search($criteria, $event->getContext())->first(); + + // In case no custom field was assigned in the plugin config - return + if (empty($customField)) { + return ''; + } + + return $customField->getName(); + } + + /** + * @param CustomerEntity $customer + * @param StateMachineTransitionEvent $event + * @return void + */ + private function tagCustomer(CustomerEntity $customer, StateMachineTransitionEvent $event): void + { + $tagId = $this->systemConfigService->get('AtlDiscountExtension.config.tag'); + + if (empty($tagId)) { + return; + } + + $update = [ + 'id' => $customer->getId(), + 'tags' => [ + [ + 'id' => $tagId + ] + ], + 'repeatDiscount' => [ + 'customerId' => $customer->getId(), + 'lastOrderDate' => new \DateTime() + ] + ]; + + /** @var RepeatDiscountEntity $repeatDiscount */ + $repeatDiscount = $customer->getExtensions()['repeatDiscount']; + + // If a discount is already applied, update its duration, else create one + if (!empty($repeatDiscount)) { + $repeatDiscountId = $repeatDiscount->getId(); + $update['repeatDiscount']['id'] = $repeatDiscountId; + } + + $this->customerRepository->update([$update], $event->getContext()); + } +} diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/base.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/base.scss index 0bcd6f1..e82ca31 100644 --- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/base.scss +++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/base.scss @@ -1,7 +1,10 @@ @import 'layout/header'; +@import 'layout/footer'; @import 'component/card'; @import 'component/cms-block'; @import 'component/cms-element'; +@import 'component/filter-multi-select'; @import 'component/product-box'; +@import 'page/content/breadcrumb'; @import 'page/checkout/cart'; @import 'page/product-detail/product-detail'; \ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/component/_filter-multi-select.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/component/_filter-multi-select.scss new file mode 100644 index 0000000..97def6c --- /dev/null +++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/component/_filter-multi-select.scss @@ -0,0 +1,24 @@ +.filter-panel-items-container { + display: block; +} + +.filter-panel-item { + margin-right: 0; +} + +.filter-multi-select-list { + display: flex; + justify-content: center; +} + +.filter-multi-select-list-item { + background-color: transparent; + border-bottom: none; + &:hover { + background-color: transparent; + } +} + +.filter-multi-select-item-label { + color: #222; +} \ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/component/_product-box.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/component/_product-box.scss index bb3ae8b..e0463ed 100644 --- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/component/_product-box.scss +++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/component/_product-box.scss @@ -2,6 +2,10 @@ &.highlight { background-color: #E9F4FC; } + .brandLogo { + max-width: 60px; + margin: 8px 0 0 0; + } .product-name { font-size: 18px; line-height: 20px; @@ -31,4 +35,12 @@ .product-cheapest-price { display: none; } +} + +.cms-block.easyfit { + .product-box { + .product-info { + min-height: 135px; + } + } } \ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_footer.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_footer.scss new file mode 100644 index 0000000..d7a9bc1 --- /dev/null +++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_footer.scss @@ -0,0 +1,99 @@ + +#collapseFooterCustom { + p { + margin-bottom: 5px; + img { + margin-bottom: 8px; + } + } +} + +.footer-newsletter { + .newsletter-inner-text { + font-size: 18px; + line-height: 24px; + } + .footer-newsletter-column-input-email { + border-bottom: 2px solid $sw-color-brand-primary; + margin: 0 15px; + padding: 0; + } + .form-control, + .input-group-append .btn { + border: none; + } + .form-control { + padding-top: 0; + padding-left: 0; + padding-bottom: 0; + font-size: 18px; + line-height: 24px; + } +} + +.footer-hotline-column { + .footer-contact-hotline { + margin-bottom: 8px; + a:not(.btn) { + margin-top: 16px; + margin-bottom: 0; + line-height: 15px; + } + } + .footer-contact-form { + margin-top: 0; + a { + color: #222; + text-decoration: underline; + &:hover { + color: #222; + text-decoration: none; + } + } + } +} + + +.footer-column-headline { + margin-bottom: 0; + &:before { + display: none; + } +} + +.footer-link-item { + a { + &:after { + top: 75%; + } + } +} + + +@media (min-width: 768px) { + .footer-link-item { + padding: 0; + } +} + +.social-icons { + display: flex; + justify-content: center; + margin-bottom: 10px; + .icon { + border: 2px solid $sw-color-brand-primary; + border-radius: 50%; + width: 40px; + height: 40px; + margin: 0 8px; + &.icon-facebook { + padding: 8px; + } + &.icon-instagram { + padding: 5px; + } + } + svg { + color: $sw-color-brand-primary; + } +} \ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_header.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_header.scss index 0251020..0470c50 100644 --- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_header.scss +++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_header.scss @@ -1,3 +1,8 @@ +.header-row { + padding-top: 10px; + border-bottom: 1px solid #B1C3D9; +} + .header-main { .header-cart-btn { .header-cart-total { @@ -51,4 +56,18 @@ line-height: 18px; text-transform: uppercase; padding: 0; + .main-navigation-link-text { + &:after { + height: 3px; + left: 0; + right: 0; + bottom: -18px; + } + } + &.active { + .main-navigation-link-text { + color: $sw-color-brand-primary; + } + } } + diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/content/_breadcrumb.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/content/_breadcrumb.scss new file mode 100644 index 0000000..1c6a178 --- /dev/null +++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/content/_breadcrumb.scss @@ -0,0 +1,13 @@ +.breadcrumb-wrap { + a { + &.is-active { + font-weight: 700; + border-bottom: 0; + } + } + .breadcrumb-placeholder { + svg { + color: #222; + } + } +} \ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/cms/blocks/swag-gallery-buybox-abnehmplan/preview.html b/zenitPlatformAtmosSet1/src/Resources/cms/blocks/swag-gallery-buybox-abnehmplan/preview.html deleted file mode 100644 index 9e572e3..0000000 --- a/zenitPlatformAtmosSet1/src/Resources/cms/blocks/swag-gallery-buybox-abnehmplan/preview.html +++ /dev/null @@ -1,9 +0,0 @@ -
-
-

Lorem ipsum dolor

-

Lorem ipsum dolor sit amet, consetetur sadipscing elitr.

-
- - - Preview image -
\ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/cms/blocks/swag-gallery-buybox-abnehmplan/styles.css b/zenitPlatformAtmosSet1/src/Resources/cms/blocks/swag-gallery-buybox-abnehmplan/styles.css deleted file mode 100644 index 7705d7d..0000000 --- a/zenitPlatformAtmosSet1/src/Resources/cms/blocks/swag-gallery-buybox-abnehmplan/styles.css +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Styling of your block preview in the CMS sidebar - */ - .sw-cms-preview-swag-image-text-reversed { - display: grid; - grid-template-columns: 1fr 1fr; - grid-column-gap: 20px; - padding: 15px; -} - -/* - * Styling of your block in the CMS editor - * Pattern: sw-cms-block-${block.name}-component - */ -.sw-cms-block-swag-image-text-reversed-component { - display: grid; - grid-template-columns: repeat(auto-fit, minmax(195px, 1fr)); - grid-gap: 40px; -} - -/* - * Each slot will have an additional class - * Pattern: sw-cms-slot-${slot.name} - */ -.sw-cms-block-swag-image-text-reversed-component .sw-cms-slot-left { - -} - -/* - * Each slot will have an additional class - * Pattern: sw-cms-slot-${slot.name} - */ -.sw-cms-block-swag-image-text-reversed-component .sw-cms-slot-right { - -} \ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/listing/filter/filter-multi-select.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/listing/filter/filter-multi-select.html.twig new file mode 100644 index 0000000..c898e7e --- /dev/null +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/listing/filter/filter-multi-select.html.twig @@ -0,0 +1,56 @@ +{% sw_extends '@Storefront/storefront/component/listing/filter/filter-multi-select.html.twig' %} + +{% block component_filter_multi_select %} +
+ + {% block component_filter_multi_select_toggle %} + + {% endblock %} + + {% block component_filter_multi_select_dropdown %} +
+ {% block component_filter_multi_select_list %} +
    + {% for element in elements %} + {% block component_filter_multi_select_list_item %} +
  • + {% block component_filter_multi_select_list_item_inner %} + {% sw_include '@Storefront/storefront/component/listing/filter/filter-multi-select-list-item.html.twig' %} + {% endblock %} +
    • + {% endblock %} + {% endfor %} +
+ {% endblock %} +
+ {% endblock %} +
+{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/product/card/box-standard.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/product/card/box-standard.html.twig index 821be3f..bc5e051 100644 --- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/product/card/box-standard.html.twig +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/product/card/box-standard.html.twig @@ -107,6 +107,14 @@ {% block component_product_box_info %}
+ {% if product.customFields.custom_productteaser_logo is defined %} + {% set logoImageId = product.customFields.custom_productteaser_logo %} + {% set mediaCollection = searchMedia([logoImageId], context.context) %} + {% set logoImage = mediaCollection.get(logoImageId) %} + + {% endif %} {% block component_product_box_rating %} {% if theme_config('zen-product-listing-card-rating-position') is same as ('default') %} {{ parent() }} diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/footer/footer.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/footer/footer.html.twig index a1116d7..abdd7c6 100644 --- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/footer/footer.html.twig +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/footer/footer.html.twig @@ -1,5 +1,9 @@ {% sw_extends '@Storefront/storefront/layout/footer/footer.html.twig' %} +{% block layout_footer_payment_shipping_logos %} +{% endblock %} + + {% block layout_footer_copyright %}
{{ "footer.copyrightInfo"|trans|sw_sanitize }} diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/header/header.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/header/header.html.twig new file mode 100644 index 0000000..af7e24e --- /dev/null +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/header/header.html.twig @@ -0,0 +1,141 @@ +{% sw_extends '@Storefront/storefront/layout/header/header.html.twig' %} + +{% block layout_header_actions %} +
+
+ {% block layout_header_search_toggle %} +
+
+ +
+
+ {% endblock %} + + {% block layout_header_hotline %} +
+
+ + + + + + + + + + + + + + + + + + + +
+
+ {% endblock %} + + {% if config('core.cart.wishlistEnabled') %} + {% block layout_header_actions_wishlist %} +
+
+ + {% sw_include '@Storefront/storefront/layout/header/actions/wishlist-widget.html.twig' %} + +
+
+ {% endblock %} + {% endif %} + + {% block layout_header_actions_account %} +
+ +
+ {% endblock %} + + {% block layout_header_actions_cart %} +
+
+ + {% sw_include '@Storefront/storefront/layout/header/actions/cart-widget.html.twig' %} + +
+
+ {% endblock %} + + {% block zen_layout_header_top_bar_toggle %} + {# marketingBannerId is needed for storagekey invalidation #} + {% set marketingBanner = [] %} + {% set marketingBanner = [config('zenitPlatformAtmos.config.marketingActive')]|merge(marketingBanner) %} + {% set marketingBanner = [config('zenitPlatformAtmos.config.marketingText')]|merge(marketingBanner) %} + {% set marketingBanner = [config('zenitPlatformAtmos.config.marketingButtonText')]|merge(marketingBanner) %} + {% set marketingBanner = [config('zenitPlatformAtmos.config.marketingButtonLink')]|merge(marketingBanner) %} + {% set marketingBanner = [config('zenitPlatformAtmos.config.marketingButtonTarget')]|merge(marketingBanner) %} + {% set marketingBannerId = marketingBanner|json_encode()|length %} + + {% set zenCollapseTopBarOptions = { + id: topBarStyle ~ '-' ~ marketingBannerId, + type: topBarStyle + } %} + + {% if topBarStyle is not same as ('default') and topBarStyle is not same as ('hidden') %} + {% if theme_config('zen-header-style') is not same as ('two-line') or (theme_config('zen-header-style') is same as ('two-line') and config('zenitPlatformAtmos.config.marketingActive')) %} +
+
+ +
+
+ {% endif %} + {% endif %} + {% endblock %} +
+
+{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set2.js b/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set2.js index e69de29..e7b231f 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set2.js +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set2.js @@ -0,0 +1,118 @@ +// spawntree +// overwriting date picker function + +let spwnIncludedDays = [0,2,3,4,5,6]; +let spawnDateInputValue = ""; +let fp; + +const inputSameDayDelivery = $("#shippingMethod67f8c7d3ecdb4ad7802bf8eb55c9b13b"); +const inputShopPickup = $("#shippingMethod0f44c72f7560450caf061922daeb1602"); +const inputDPD = $("#shippingMethod8c6d913e29c14c3cb3c6429724efaab8"); + +$(document).ready(function() { + let dpInput = $(".confirm-delivery-date #dtgs-datepicker-inputfield"); + if (dpInput.length) { + fp = document.querySelector("#dtgs-datepicker-inputfield")._flatpickr; + dpInput.prop('disabled', true); + $("

").insertAfter(".confirm-delivery-date"); + fp.config.onChange.push(function() { + manipulateDateInputValue(); + }); + + // If Austria and same day delivery is checked change to DPD + if ($(".confirm-address-shipping").data("iso") === "AT") { + inputDPD.attr('checked', true).trigger("click"); + // No same day delivery + inputSameDayDelivery.parents(".shipping-method").hide(); + // No shop + inputShopPickup.parents(".shipping-method").hide(); + } + + // Call changeDelivery + $("[name='shippingMethodId']").on('change', () => { + changeDelivery(fp); + }); + changeDelivery(fp); + } +}); + +function manipulateDateInputValue() { + spawnDateInputValue = $(".confirm-delivery-date #dtgs-datepicker-inputfield").val(); + if (inputSameDayDelivery.is(':checked')) { + // If same day delivery is checked, select time + $("#spwn-delivery .spwn-delivery--time span.active").trigger("click"); + } +} + +function changeDelivery(fp) { + $("body").on("click", "#spwn-delivery .spwn-delivery--time span", function() { + $("#spwn-delivery .spwn-delivery--time span").removeClass("active"); + $(this).addClass("active"); + $(".confirm-delivery-date #dtgs-datepicker-inputfield").val(spawnDateInputValue + " " + $(this).text()); + }); + + if ($(".confirm-address-shipping").data("iso") !== "AT") { + if (inputShopPickup.is(':checked')) { + // Abholung im Ladengeschäft + console.log("Abholung"); + $(".confirm-delivery-date #dtgs-datepicker-inputfield").val('Abholung im Ladengeschäft'); + $(".confirm-delivery-date").hide(); + $("#spwn-delivery p").text("Die bestellten Produkte stehen zur Abholung in unserem Ladengeschäft in Hamburg für Sie bereit."); + } else if (inputSameDayDelivery.is(':checked')) { + // Abendzustellung + console.log("Abendzustellung"); + $(".confirm-delivery-date #dtgs-datepicker-inputfield").val(''); + spwnIncludedDays = [1,2,3,4,5]; + setIncludedDays("evening", fp, 0); + $("#spwn-delivery p").text("Abendzustellung gewählt. Bitte wählen Sie nun eine Wunsch-Zeit:"); + $("#spwn-delivery .spwn-delivery--time").append("18 - 21 Uhr20 - 23 Uhr"); + if (spawnDateInputValue === "" || spawnDateInputValue.indexOf("Uhr") === -1) { + manipulateDateInputValue(); + } + } else { + // DPD + console.log("DPD"); + spwnIncludedDays = [2,3,4,5,6]; + setIncludedDays("dpd", fp, 1); + $("#spwn-delivery p").text("DPD gewählt. Die Zustellung erfolgt zwischen 7 und 13 Uhr."); + } + } else { + console.log("DPD AT"); + spwnIncludedDays = [3,4]; + setIncludedDays("dpd", fp, 2); + $("#spwn-delivery p").text("DPD gewählt. Die Zustellung erfolgt zwischen 7 und 18 Uhr."); + } +} + +function setIncludedDays(delivery, fp, addDays) { + let spwnDateTemp = new Date(); + spwnDateTemp.setDate(spwnDateTemp.getDate() + addDays); + + let spwnTime = parseInt(spwnDateTemp.getHours() + "" + spwnDateTemp.getMinutes()); + if (delivery === "evening" && spwnTime > 1300) { + spwnDateTemp.setDate(spwnDateTemp.getDate() + 1); + } else if (delivery === "dpd" && spwnTime > 1400) { + spwnDateTemp.setDate(spwnDateTemp.getDate() + 1); + } + let spwnDate = fp.formatDate(spwnDateTemp, "d.m.Y"); + fp.set("minDate", spwnDate); + + fp.set("enable", [ + function(date) { + let day = date.getDate(); + let month = date.getMonth(); + month = month + 1; + if((String(day)).length===1) + day='0'+day; + if((String(month)).length===1) + month='0'+month; + let formattedDate = day + '.' + month + '.' + date.getFullYear(); + //Excluded Dates + if($.inArray(formattedDate, dtgsDeliveryDateExcludedDates) > -1) { + return false; + } + // Datum auf Bereich Montag = 0, Sonntag = 7 bringen + return spwnIncludedDays.indexOf(((date.getDay() + 6) % 7) + 1) !== -1; + } + ]); +} diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig new file mode 100644 index 0000000..d8d8882 --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig @@ -0,0 +1,40 @@ +{% block block_gallery_buybox %} + {% block block_gallery_buybox_column_left %} + {% set element = block.slots.getSlot('left') %} + {% set config = element.fieldConfig.elements %} + +
+ {% block block_gallery_buybox_column_left_inner %} + {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing + with { + 'isProduct': config.sliderItems.value == 'product.media' and config.sliderItems.source == 'mapped' + } %} + {% endblock %} +
+ {% endblock %} + + {% block block_gallery_buybox_column_right %} + {% set element = block.slots.getSlot('right') %} + +
+ {# ... add headline here #} + {% block page_product_detail_headline %} +
+ {% sw_include '@Storefront/storefront/page/product-detail/headline.html.twig' %} +
+ {% endblock %} + + {# ... add short description #} + {% block zen_page_product_detail_short_description %} + {% if page.product.translated.metaDescription and theme_config('zen-product-details-short-description') %} +
+ {{ page.product.translated.metaDescription|raw }} +
+ {% endif %} + {% endblock %} + {% block block_gallery_buybox_column_right_inner %} + {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} + {% endblock %} +
+ {% endblock %} +{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-swag-gallery-buybox-abnehmplan-component.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-swag-gallery-buybox-abnehmplan-component.html.twig new file mode 100644 index 0000000..e69de29 diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/buy-widget/buy-widget.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/buy-widget/buy-widget.html.twig new file mode 100644 index 0000000..13900d3 --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/buy-widget/buy-widget.html.twig @@ -0,0 +1,21 @@ +{% sw_extends '@Storefront/storefront/component/buy-widget/buy-widget.html.twig' %} + +{% block buy_widget_price %} +
+ {% if page.product.translated.customFields.deposittype %} +
+ {{ page.product.translated.customFields.deposittype }} +
+ {% endif %} + {{ parent() }} + {% if page.product.translated.customFields.deposit %} + {% set deposit = page.product.translated.customFields.deposit|currency %} + +
+ {{ "FlowsiteDepositSystemBasic.plusDeposit"|trans({ + '%deposit%': deposit + })|sw_sanitize }} +
+ {% endif %} +
+{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-cart.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-cart.html.twig new file mode 100644 index 0000000..3c57829 --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-cart.html.twig @@ -0,0 +1,74 @@ +{% sw_extends '@Storefront/storefront/component/checkout/offcanvas-cart.html.twig' %} + +{# Start added by spawntree #} +{% block component_offcanvas_cart_items %} + {% set customizedProductsCount = 0 %} + {% set customizedProductsCountTemp = 0 %} + {% set addCustomizedProducts = 0 %} + + {# copy from SpnoSortBasket #} + {% set sortBasketConfig = context.extensions.SpnoSortBasket %} + + {% for lineItem in page.cart.lineItems %} + {% if lineItem.payload is defined and lineItem.payload.customFields is defined and + lineItem.payload.customFields.spwn_discountable_box is defined %} + {% set customizedProductsCount = customizedProductsCount + lineItem.quantity %} + {% endif %} + {% endfor %} +
+{# spawntree start #} + {% if customizedProductsCount == 1 || customizedProductsCount == 2 %} +
+ {% sw_icon 'checkmark-circle' %} +
+ {% if customizedProductsCount == 1 %} +

Ihr Abnehmplan wurde erfolgreich zum Warenkorb hinzugefügt – ein guter Start!

+

Wählen Sie bis zu 2 weitere Pläne für Ihr optimales Abnehmprogramm und sparen Sie ab 150 € Bestellsumme die Versandkosten.

+ {% elseif customizedProductsCount == 2 %} +

Ihr zweiter Abnehmplan wurde zum Warenkorb hinzugefügt - Sie sparen die Versandkosten!

+

Wählen Sie einen weiteren Plan für Ihr optimales, mehrwöchiges Abnehmprogramm.

+ {% endif %} +
+
+ {% endif %} +{# spawntree end #} + {% for lineItem in page.cart.lineItems %} +{# spawntree start #} + {% if lineItem.payload.customFields.spwn_discountable_box %} + + {% if lineItem.payload is defined and lineItem.payload.customFields is defined and + lineItem.payload.customFields.spwn_discountable_box is defined and customizedProductsCount < 3 %} + {% set customizedProductsCountTemp = customizedProductsCountTemp + lineItem.quantity %} + {% if customizedProductsCountTemp == customizedProductsCount %} + {% set addCustomizedProducts = customizedProductsCount %} + {% endif %} + {% endif %} + {% block component_offcanvas_cart_item %} + {% sw_include '@Storefront/storefront/component/checkout/offcanvas-item.html.twig' with { + data: { + addCustomizedProducts: addCustomizedProducts + } + } %} + {% endblock %} + {% endif %} +{# spawntree end #} + {% endfor %} + {% set addCustomizedProducts = 0 %} + {% for lineItem in page.cart.lineItems %} + {% if not lineItem.payload.customFields.spwn_discountable_box %} + {{ block ('component_offcanvas_cart_item') }} + {% endif %} + {% endfor %} +
+{% endblock %} + +{% block component_offcanvas_cart_actions_promotion_submit %} +
+ +
+{% endblock %} +{# End added by spawntree #} diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig new file mode 100644 index 0000000..57fece3 --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig @@ -0,0 +1,69 @@ +{% sw_extends '@Storefront/storefront/component/checkout/offcanvas-item.html.twig' %} + +{# Start added by spawntree #} +{% block component_offcanvas_cart_item_container %} + {% if isCustomizedProduct %} + {% set isNested = false %} + {% for child in lineItem.children %} + {% if child.type == 'product' %} + {% set label = child.label %} + {% set referencedId = child.referencedId %} + {% set productNumber = lineItem.payload|merge({ 'productNumber': child.payload.productNumber }) %} + + {% if child.cover.url %} + {% set cover = child.cover %} + {% endif %} + + {% do lineItem.setLabel(label) %} + {% do lineItem.setCover(cover) %} + {% do lineItem.setReferencedId(referencedId) %} + {% do lineItem.setPayload(productNumber) %} + {% endif %} + {% endfor %} + {% endif %} + + {% set isDiscountableItem = false %} + {% if lineItem.payload is defined and lineItem.payload.customFields is defined and + lineItem.payload.customFields.spwn_discountable_box is defined %} + {% set isDiscountableItem = true %} + {% endif %} +
+
+ {{ block('component_offcanvas_product_image') }} + {{ block('component_offcanvas_product_details') }} + {{ block('component_offcanvas_product_remove') }} + {{ block('component_offcanvas_children') }} +
+
+{% endblock %} + +{% block component_offcanvas_children %} + {% if isNested %} + {# @deprecated tag:v6.5.0 - block will be removed, use `component_offcanvas_item_children` in `@Storefront/storefront/component/checkout/offcanvas-item-children.html.twig` instead #} + {% block component_offcanvas_cart_item_children %} + {% sw_include childrenTemplate %} + {% endblock %} + {% endif %} + {% set addCustomizedProducts = addCustomizedProducts | default(0) %} + {% if lineItem.payload is defined and lineItem.payload.customFields is defined and + lineItem.payload.customFields.spwn_discountable_box is defined and addCustomizedProducts !== 0 %} +
+ Fügen Sie einen weiteren Plan hinzu für ihr optimales Abnehmprogramm + {% if addCustomizedProducts == 1 %} + Fügen Sie einen weiteren Plan hinzu für ihr optimales Abnehmprogramm + {% endif %} +
+ {% endif %} +{% endblock %} + +{# coming from AtlProductConfigurator #} +{% block cart_item_variant_characteristics %} +
+ {% for input in lineItem.payload.atlProductConfigurator %} +
+ {{ input.value }} +
+ {% endfor %} +
+{% endblock %} +{# End added by spawntree #} diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/listing/filter/filter-multi-select.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/listing/filter/filter-multi-select.html.twig new file mode 100644 index 0000000..c898e7e --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/listing/filter/filter-multi-select.html.twig @@ -0,0 +1,56 @@ +{% sw_extends '@Storefront/storefront/component/listing/filter/filter-multi-select.html.twig' %} + +{% block component_filter_multi_select %} +
+ + {% block component_filter_multi_select_toggle %} + + {% endblock %} + + {% block component_filter_multi_select_dropdown %} +
+ {% block component_filter_multi_select_list %} +
    + {% for element in elements %} + {% block component_filter_multi_select_list_item %} +
  • + {% block component_filter_multi_select_list_item_inner %} + {% sw_include '@Storefront/storefront/component/listing/filter/filter-multi-select-list-item.html.twig' %} + {% endblock %} +
    • + {% endblock %} + {% endfor %} +
+ {% endblock %} +
+ {% endblock %} +
+{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/box-standard.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/box-standard.html.twig new file mode 100644 index 0000000..bc5e051 --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/box-standard.html.twig @@ -0,0 +1,170 @@ +{% sw_extends '@Storefront/storefront/component/product/card/box-standard.html.twig' %} + +{% block component_product_box %} + {% if product %} + {% set name = product.translated.name %} + {% set id = product.id %} + {% set cover = product.cover.media %} + {% set variation = product.variation %} + +
+ {% block component_product_box_content %} +
+ {% block component_product_box_badges %} + {% sw_include '@Storefront/storefront/component/product/card/badges.html.twig' %} + {% endblock %} + + {% block component_product_box_rich_snippets %} + {% sw_include '@Storefront/storefront/component/product/card/meta.html.twig' %} + {% endblock %} + + {% block component_product_box_image %} + + {# fallback if display mode is not set #} + {% set displayMode = displayMode ?: 'standard' %} + + {# set display mode 'cover' for box-image with default display mode #} + {% if layout == 'image' and displayMode == 'standard' %} + {% set displayMode = 'cover' %} + {% endif %} + +
+ + + {% if cover.url %} + {% set attributes = { + 'class': 'product-image is-'~displayMode, + 'alt': (cover.translated.alt ?: name), + 'title': (cover.translated.title ?: name) + } %} + + {% if displayMode == 'cover' or displayMode == 'contain' %} + {% set attributes = attributes|merge({ 'data-object-fit': displayMode }) %} + {% endif %} + + {# ... enables lazy loading for images #} + {% if config('zenitPlatformAtmos.config.lazyloading') %} + {% set attributes = attributes|merge({ 'loading': 'lazy' }) %} + {% endif %} + + {% sw_thumbnails 'product-image-thumbnails' with { + media: cover, + sizes: { + 'xs': '701px', + 'sm': '515px', + 'md': '627px', + 'lg': '533px', + 'xl': '484px' + } + } %} + {% else %} +
+ {% sw_icon 'placeholder' style { + 'size': 'fluid' + } %} +
+ {% endif %} + + {% block zen_component_product_box_image_switch %} + {% sw_include '@Storefront/storefront/component/product/card/zen-cover-switch.html.twig' %} + {% endblock %} + + + {% if config('core.cart.wishlistEnabled') %} + {% if theme_config('zen-product-listing-card-rating-position') is not same as ('overlay-top-right') or (theme_config('zen-product-listing-card-rating-position') is same as ('overlay-top-right') and theme_config('zen-product-listing-card-actions') is not same as ('overlay')) %} + {% block component_product_box_wishlist_action %} + {% sw_include '@Storefront/storefront/component/product/card/wishlist.html.twig' with { + appearance: 'circle', + productId: id + } %} + {% endblock %} + {% endif %} + {% endif %} + + {% block zen_component_product_box_action_overlay_rating %} + {% if config('core.listing.showReview') and theme_config('zen-product-listing-card-rating-position') is not same as ('default') %} + +
+ {% if product.ratingAverage %} + {% sw_include '@Storefront/storefront/component/review/rating.html.twig' with { + points: product.ratingAverage, + style: 'text-primary' + } %} + {% endif %} +
+ {% endif %} + {% endblock %} + + {% block zen_component_product_box_action_overlay %} + {% if theme_config('zen-product-listing-card-actions') is same as ('overlay') %} + {% sw_include '@Storefront/storefront/component/product/card/action.html.twig' %} + {% endif %} + {% endblock %} +
+ {% endblock %} + + {% block component_product_box_info %} +
+ {% if product.customFields.custom_productteaser_logo is defined %} + {% set logoImageId = product.customFields.custom_productteaser_logo %} + {% set mediaCollection = searchMedia([logoImageId], context.context) %} + {% set logoImage = mediaCollection.get(logoImageId) %} + + {% endif %} + {% block component_product_box_rating %} + {% if theme_config('zen-product-listing-card-rating-position') is same as ('default') %} + {{ parent() }} + {% endif %} + {% endblock %} + + {% block component_product_box_name %} + + {{ name }} + + {% endblock %} + + {% block component_product_box_variant_characteristics %} + {% if theme_config('zen-product-listing-card-variant-characteristics') %} + {{ parent() }} + {% endif %} + {% endblock %} + + {% block component_product_box_description %} +
+ {{ product.customFields.custom_productteaser_category|striptags|raw }} +
+ {% endblock %} + + {% block component_product_box_price %} + {% sw_include '@Storefront/storefront/component/product/card/price-unit.html.twig' %} + {% endblock %} + + {% block component_product_box_action %} + {% if theme_config('zen-product-listing-card-actions') is not same as ('overlay') %} + {{ parent() }} + {% endif %} + + {% if config('core.cart.wishlistEnabled') %} + {% if theme_config('zen-product-listing-card-rating-position') is same as ('overlay-top-right') and theme_config('zen-product-listing-card-actions') is same as ('overlay') %} + {% block zen_component_product_box_wishlist_action %} + {% sw_include '@Storefront/storefront/component/product/card/wishlist.html.twig' with { + appearance: 'circle', + productId: id + } %} + {% endblock %} + {% endif %} + {% endif %} + {% endblock %} +
+ {% endblock %} +
+ {% endblock %} +
+ {% endif %} +{% endblock %} diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/price-unit.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/price-unit.html.twig new file mode 100644 index 0000000..46b0f53 --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/price-unit.html.twig @@ -0,0 +1,55 @@ +{% sw_extends '@Storefront/storefront/component/product/card/price-unit.html.twig' %} + +{% block component_product_box_price %} +
+ {% set price = real %} + +
+ {% if cheapest.unitPrice != real.unitPrice %} +
{{ "listing.cheapestPriceLabel"|trans|sw_sanitize }} {{ cheapest.unitPrice|currency }}{{ "general.star"|trans|sw_sanitize }}
+ {% endif %} +
+ + {% if displayFrom %} + {{ "listing.listingTextFrom"|trans|sw_sanitize }} + {% endif %} + + {% set isListPrice = price.listPrice.percentage > 0 %} + + + {{ price.unitPrice|currency }}{{ "general.star"|trans|sw_sanitize }} + + {% if isListPrice and not displayFrom %} + {% set afterListPriceSnippetExists = "listing.afterListPrice"|trans|length > 0 %} + {% set beforeListPriceSnippetExists = "listing.beforeListPrice"|trans|length > 0 %} + {% set hideStrikeTrough = beforeListPriceSnippetExists or afterListPriceSnippetExists %} + + + {% if beforeListPriceSnippetExists %}{{ "listing.beforeListPrice"|trans|trim|sw_sanitize }}{% endif %} + + {{ price.listPrice.price|currency }}{{ "general.star"|trans|sw_sanitize }} + + {% if afterListPriceSnippetExists %}{{ "listing.afterListPrice"|trans|trim|sw_sanitize }}{% endif %} + + {{ "detail.listPricePercentage"|trans({'%price%': price.listPrice.percentage })|sw_sanitize }} + + {% endif %} + + {{ product.customFields.custom_productteaser_price|trans }} € pro Tag +
+ {% if product.translated.customFields.deposittype %} +
+ {{ product.translated.customFields.deposittype }} +
+ {% endif %} + {% if product.translated.customFields.deposit %} + {% set deposit = product.translated.customFields.deposit|currency %} +
+ + {{ "FlowsiteDepositSystemBasic.plusDeposit"|trans({ + '%deposit%': deposit + })|sw_sanitize }} + +
+ {% endif %} +{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/listing.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/listing.html.twig new file mode 100644 index 0000000..b061141 --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/listing.html.twig @@ -0,0 +1,41 @@ + +{% sw_extends '@Storefront/storefront/component/product/listing.html.twig' %} + +{% block element_product_listing_row %} +
+ {% if page.footer.navigation.active.customFields.custom_listing_textbox_text is defined %} +
+
+
+ {{ page.footer.navigation.active.customFields.custom_listing_textbox_text|trans|sw_sanitize }} +
+
+
+ {% endif %} + {% if searchResult.total > 0 %} + {% block element_product_listing_col %} + {% for product in searchResult %} +
+ {% block element_product_listing_box %} + {% sw_include '@Storefront/storefront/component/product/card/box.html.twig' with { + 'layout': boxLayout, + 'displayMode': displayMode + } %} + {% endblock %} +
+ {% endfor %} + {% endblock %} + {% else %} + {% block element_product_listing_col_empty %} +
+ {% block element_product_listing_col_empty_alert %} + {% sw_include '@Storefront/storefront/utilities/alert.html.twig' with { + type: 'info', + content: 'listing.emptyResultMessage'|trans|sw_sanitize + } %} + {% endblock %} +
+ {% endblock %} + {% endif %} +
+{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/footer/footer.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/footer/footer.html.twig new file mode 100644 index 0000000..abdd7c6 --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/footer/footer.html.twig @@ -0,0 +1,11 @@ +{% sw_extends '@Storefront/storefront/layout/footer/footer.html.twig' %} + +{% block layout_footer_payment_shipping_logos %} +{% endblock %} + + +{% block layout_footer_copyright %} +
+ {{ "footer.copyrightInfo"|trans|sw_sanitize }} +
+{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/header/header.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/header/header.html.twig new file mode 100644 index 0000000..af7e24e --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/header/header.html.twig @@ -0,0 +1,141 @@ +{% sw_extends '@Storefront/storefront/layout/header/header.html.twig' %} + +{% block layout_header_actions %} +
+
+ {% block layout_header_search_toggle %} +
+
+ +
+
+ {% endblock %} + + {% block layout_header_hotline %} +
+
+ + + + + + + + + + + + + + + + + + + +
+
+ {% endblock %} + + {% if config('core.cart.wishlistEnabled') %} + {% block layout_header_actions_wishlist %} +
+
+ + {% sw_include '@Storefront/storefront/layout/header/actions/wishlist-widget.html.twig' %} + +
+
+ {% endblock %} + {% endif %} + + {% block layout_header_actions_account %} +
+ +
+ {% endblock %} + + {% block layout_header_actions_cart %} +
+
+ + {% sw_include '@Storefront/storefront/layout/header/actions/cart-widget.html.twig' %} + +
+
+ {% endblock %} + + {% block zen_layout_header_top_bar_toggle %} + {# marketingBannerId is needed for storagekey invalidation #} + {% set marketingBanner = [] %} + {% set marketingBanner = [config('zenitPlatformAtmos.config.marketingActive')]|merge(marketingBanner) %} + {% set marketingBanner = [config('zenitPlatformAtmos.config.marketingText')]|merge(marketingBanner) %} + {% set marketingBanner = [config('zenitPlatformAtmos.config.marketingButtonText')]|merge(marketingBanner) %} + {% set marketingBanner = [config('zenitPlatformAtmos.config.marketingButtonLink')]|merge(marketingBanner) %} + {% set marketingBanner = [config('zenitPlatformAtmos.config.marketingButtonTarget')]|merge(marketingBanner) %} + {% set marketingBannerId = marketingBanner|json_encode()|length %} + + {% set zenCollapseTopBarOptions = { + id: topBarStyle ~ '-' ~ marketingBannerId, + type: topBarStyle + } %} + + {% if topBarStyle is not same as ('default') and topBarStyle is not same as ('hidden') %} + {% if theme_config('zen-header-style') is not same as ('two-line') or (theme_config('zen-header-style') is same as ('two-line') and config('zenitPlatformAtmos.config.marketingActive')) %} +
+
+ +
+
+ {% endif %} + {% endif %} + {% endblock %} +
+
+{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/cart/index.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/cart/index.html.twig new file mode 100644 index 0000000..6dae3e7 --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/cart/index.html.twig @@ -0,0 +1,63 @@ +{% sw_extends '@Storefront/storefront/page/checkout/cart/index.html.twig' %} + +{% block page_checkout_cart_add_promotion_submit %} +
+ +
+{% endblock %} + +{% block page_checkout_cart_product_table %} + {% set customizedProductsCount = 0 %} + {% set customizedProductsCountTemp = 0 %} + {% set addCustomizedProducts = 0 %} + + {% for lineItem in page.cart.lineItems %} + {% if lineItem.payload is defined and lineItem.payload.customFields is defined and + lineItem.payload.customFields.spwn_discountable_box is defined %} + {% set customizedProductsCount = customizedProductsCount + lineItem.quantity %} + {% endif %} + {% endfor %} + +
+
+ {% block page_checkout_cart_table_header %} + {% sw_include '@Storefront/storefront/page/checkout/cart/cart-product-header.html.twig' %} + {% endblock %} + + {% block page_checkout_cart_table_items %} + {% for lineItem in page.cart.lineItems %} + + {% if lineItem.payload.customFields.spwn_discountable_box %} + + {% if lineItem.payload is defined and lineItem.payload.customFields is defined and + lineItem.payload.customFields.spwn_discountable_box is defined and customizedProductsCount < 3 %} + {% set customizedProductsCountTemp = customizedProductsCountTemp + lineItem.quantity %} + {% if customizedProductsCountTemp == customizedProductsCount %} + {% set addCustomizedProducts = customizedProductsCount %} + {% endif %} + {% endif %} + {% block page_checkout_cart_table_item %} + {% block page_checkout_item %} + {% sw_include '@Storefront/storefront/page/checkout/checkout-item.html.twig' with { + data: { + addCustomizedProducts: addCustomizedProducts + } + } %} + {% endblock %} + {% endblock %} + {% endif %} + {% endfor %} + {% set addCustomizedProducts = 0 %} + {% for lineItem in page.cart.lineItems %} + {% if not lineItem.payload.customFields.spwn_discountable_box %} + {{ block ('page_checkout_item') }} + {% endif %} + {% endfor %} + {% endblock %} +
+
+{% endblock %} diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/checkout-item.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/checkout-item.html.twig new file mode 100644 index 0000000..4171b5b --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/checkout-item.html.twig @@ -0,0 +1,50 @@ +{% sw_extends '@Storefront/storefront/page/checkout/checkout-item.html.twig' %} + +{% block page_checkout_item_info_variant_characteristics %} +
+ {% for input in lineItem.payload.atlProductConfigurator %} +
+ {{ input.value }} +
+ {% endfor %} +
+{% endblock %} + +{% block page_checkout_item_info_label %} + {% if lineItem.type == PRODUCT_LINE_ITEM_TYPE %} + + {{ label|u.truncate(60, '...', false) }} + + {% else %} +
+ {{ label|u.truncate(60, '...', false) }} +
+ {% endif %} +{% endblock %} + +{% block page_checkout_item_children_template %} + {% if isNested %} + {# @deprecated tag:v6.5.0 - block will be moved to `@Storefront/storefront/page/checkout/checkout-item-children.html.twig` #} + {% block page_checkout_item_children %} + {% sw_include childrenTemplate %} + {% endblock %} + {% endif %} + {% set addCustomizedProducts = addCustomizedProducts | default(0) %} + {% if lineItem.payload is defined and lineItem.payload.customFields is defined and + lineItem.payload.customFields.spwn_discountable_box is defined and addCustomizedProducts !== 0 %} +
+ Fügen Sie einen weiteren Plan hinzu für ihr optimales Abnehmprogramm + {% if addCustomizedProducts == 1 %} + Fügen Sie einen weiteren Plan hinzu für ihr optimales Abnehmprogramm + {% endif %} +
+ {% endif %} +{% endblock %} diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/confirm/confirm-address.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/confirm/confirm-address.html.twig new file mode 100644 index 0000000..dcda92d --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/confirm/confirm-address.html.twig @@ -0,0 +1,17 @@ +{% sw_extends '@Storefront/storefront/page/checkout/confirm/confirm-address.html.twig' %} + +{% block page_checkout_confirm_address_shipping_data %} +
+ {% if billingAddress.id is same as(shippingAddress.id) %} + {% block page_checkout_confirm_address_shipping_data_equal %} +

+ {{ "checkout.addressEqualText"|trans|sw_sanitize }} +

+ {% endblock %} + {% else %} + {% sw_include '@Storefront/storefront/component/address/address.html.twig' with { + 'address': shippingAddress + } %} + {% endif %} +
+{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/confirm/index.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/confirm/index.html.twig new file mode 100644 index 0000000..6c97c11 --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/confirm/index.html.twig @@ -0,0 +1,112 @@ +{% sw_extends '@Storefront/storefront/page/checkout/confirm/index.html.twig' %} + + +{% block page_checkout_confirm_tos %} +{% endblock %} + +{% block page_checkout_confirm_product_table %} +{% endblock %} + +{% block page_checkout_additional %} + {% if config('core.cart.showCustomerComment') %} +
+
+ {% block page_checkout_confirm_table_container %} +
+
+ {% block page_checkout_confirm_table_header %} + {% sw_include '@Storefront/storefront/page/checkout/confirm/confirm-product-header.html.twig' %} + {% endblock %} + + {% block page_checkout_confirm_table_items %} + {% for lineItem in page.cart.lineItems %} + {% block page_checkout_confirm_table_item %} + {% sw_include '@Storefront/storefront/page/checkout/confirm/confirm-item.html.twig' %} + {% endblock %} + {% endfor %} + {% endblock %} +
+
+ {% endblock %} +
+ {% block page_checkout_finish_customer_comment %} +
+
+ {% block page_checkout_confirm_customer_comment_header %} +
+ {{ "checkout.customerCommentHeader"|trans|sw_sanitize }} +
+ {% endblock %} + + {% block page_checkout_confirm_customer_comment_control %} +
+ {% block page_checkout_confirm_customer_comment_control_textfield_label %} + + {% endblock %} + + {% block page_checkout_confirm_customer_comment_control_textfield %} + + {% endblock %} +
+ {% endblock %} +
+
+ {% endblock %} +
+ {% endif %} +{% endblock %} + +{% block page_checkout_aside_actions %} +
+ {% block page_checkout_confirm_tos_control %} +
+ {% block page_checkout_confirm_tos_control_checkbox %} + + {% endblock %} + + {% block page_checkout_confirm_tos_control_label %} + + {% endblock %} +
+ {% endblock %} +
+ + {% block page_checkout_aside_actions_csrf %} + {{ sw_csrf('frontend.checkout.finish.order') }} + {% endblock %} + + {% block page_checkout_confirm_form_submit %} + + {% endblock %} +
+
+{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/summary/summary-shipping.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/summary/summary-shipping.html.twig new file mode 100644 index 0000000..f63e1a5 --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/summary/summary-shipping.html.twig @@ -0,0 +1,25 @@ +{% sw_extends '@Storefront/storefront/page/checkout/summary/summary-shipping.html.twig' %} + +{% block page_checkout_summary_shippings %} + {% for delivery in summary.deliveries %} + {% block page_checkout_summary_shipping %} + {% block page_checkout_summary_shipping_label %} +
+ + {{ "checkout.summaryShipping"|trans|sw_sanitize }} + +
+ {% endblock %} + + {% block page_checkout_summary_shipping_value %} +
+ {{ delivery.shippingCosts.totalPrice|currency }}{{ "general.star"|trans|sw_sanitize }} +
+ {% endblock %} + {% endblock %} + {% endfor %} +{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/description.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/description.html.twig new file mode 100644 index 0000000..d9c965d --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/description.html.twig @@ -0,0 +1,16 @@ +{% sw_extends '@Storefront/storefront/page/product-detail/description.html.twig' %} + +{% block page_product_detail_description_content_text %} + {{ parent() }} + {% if product.customFields.custom_weightlossplan_day1_image is defined %} + {{ product.customFields.custom_weightlossplan_day1_image }} + {% endif %} + + {% if product.customFields.custom_weightlossplan_day1_notice is defined %} + {{ product.customFields.custom_weightlossplan_day1_notice|trans }} + {% endif %} + + {% if product.customFields.custom_weightlossplan_day1_shake is defined %} + {{ product.customFields.custom_weightlossplan_day1_shake|trans }} + {% endif %} +{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/index.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/index.html.twig new file mode 100644 index 0000000..08cec4a --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/index.html.twig @@ -0,0 +1,18 @@ +{% sw_extends '@Storefront/storefront/page/product-detail/index.html.twig' %} + +{% block page_product_detail_content %} + {{ parent() }} + + {% if page.product.customFields.custom_weightlossplan_day1_image is defined %} + {% set day1ImageId = page.product.customFields.custom_weightlossplan_day1_image %} + {% set mediaCollection = searchMedia([day1ImageId], context.context) %} + {% set day1Image = mediaCollection.get(day1ImageId) %} +
+ +
+ {% endif %} + + {% if page.product.customFields.custom_weightlossplan_day1_shake is defined %} + Shake: {{ page.product.customFields.custom_weightlossplan_day1_shake|trans }} + {% endif %} +{% endblock %} \ No newline at end of file