Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/10.3' into 11.0
Browse files Browse the repository at this point in the history 
# Conflicts:
#	dump/data-1-settings_store.sql
  • Loading branch information
@kingjia90
kingjia90 committed Jul 6, 2023
2 parents 057cca0 + c7c7c54 commit 56ce204
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 8 deletions.
14 changes: 7 additions & 7 deletions dump/data-1-settings_store.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,32 @@
SET NAMES utf8mb4;

INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('1','pimcore_document_types','{\"name\":\"Standard-Teaser\",\"group\":\"\",\"controller\":null,\"template\":\"snippets\\/standard-teaser.html.twig\",\"type\":\"snippet\",\"priority\":0,\"creationDate\":1564046858,\"modificationDate\":1643204608,\"staticGeneratorEnabled\":null}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('1','pimcore_custom_views','{\"treetype\":\"object\",\"name\":\"Cars\",\"condition\":null,\"icon\":\"\\/bundles\\/pimcoreadmin\\/img\\/flat-white-icons\\/automotive.svg\",\"id\":1,\"rootfolder\":\"\\/Product Data\\/Cars\",\"showroot\":false,\"classes\":[\"CAR\"],\"position\":\"left\",\"sort\":\"3\",\"expanded\":true}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('1','pimcore_custom_views','{\"treetype\":\"object\",\"name\":\"Cars\",\"condition\":null,\"icon\":\"\\/bundles\\/pimcoreadmin\\/img\\/flat-white-icons\\/automotive.svg\",\"id\":1,\"rootfolder\":\"\\/Product Data\\/Cars\",\"showroot\":false,\"classes\":\"CAR\",\"position\":\"left\",\"sort\":\"3\",\"expanded\":true}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('1','pimcore_predefined_asset_metadata','{\"name\":\"author\",\"description\":\"\",\"type\":\"input\",\"targetSubtype\":null,\"data\":\"\",\"config\":null,\"language\":null,\"group\":\"\",\"creationDate\":1557394593,\"modificationDate\":1643206076}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('1','pimcore_predefined_properties','{\"name\":\"Show LeftNav\",\"description\":\"Defines if left navigation should be visible. \\n\",\"key\":\"left_nav_show\",\"type\":\"bool\",\"data\":\"\",\"config\":\"\",\"ctype\":\"document\",\"inheritable\":true,\"creationDate\":1564138072,\"modificationDate\":1643206308}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('10','pimcore_predefined_properties','{\"name\":\"Terms & Conditions Page\",\"description\":\"Link to Terms and Conditions page\\n\",\"key\":\"terms_and_conditions\",\"type\":\"document\",\"data\":\"\",\"config\":\"\",\"ctype\":\"document\",\"inheritable\":true,\"creationDate\":1566463224,\"modificationDate\":1643206320}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('2','pimcore_custom_views','{\"treetype\":\"object\",\"name\":\"Accessories\",\"condition\":null,\"icon\":\"\\/bundles\\/pimcoreadmin\\/img\\/flat-white-icons\\/pimcore-main-icon-product.svg\",\"id\":2,\"rootfolder\":\"\\/Product Data\\/Accessories\",\"showroot\":false,\"classes\":[\"AP\"],\"position\":\"left\",\"sort\":\"4\",\"expanded\":true}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('2','pimcore_custom_views','{\"treetype\":\"object\",\"name\":\"Accessories\",\"condition\":null,\"icon\":\"\\/bundles\\/pimcoreadmin\\/img\\/flat-white-icons\\/pimcore-main-icon-product.svg\",\"id\":2,\"rootfolder\":\"\\/Product Data\\/Accessories\",\"showroot\":false,\"classes\":\"AP\",\"position\":\"left\",\"sort\":\"4\",\"expanded\":true}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('2','pimcore_document_types','{\"name\":\"Portal-Page\",\"group\":\"\",\"controller\":\"App\\\\Controller\\\\ContentController::portalAction\",\"template\":null,\"type\":\"page\",\"priority\":0,\"creationDate\":1564393927,\"modificationDate\":1643204610,\"staticGeneratorEnabled\":false}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('2','pimcore_predefined_asset_metadata','{\"name\":\"authorLink\",\"description\":\"\",\"type\":\"input\",\"targetSubtype\":null,\"data\":\"\",\"config\":null,\"language\":null,\"group\":null,\"creationDate\":1557394612,\"modificationDate\":1643206077}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('2','pimcore_predefined_properties','{\"name\":\"Root Category\",\"description\":\"Defines root category of shop.\",\"key\":\"root_category\",\"type\":\"object\",\"data\":\"\",\"config\":\"\",\"ctype\":\"document\",\"inheritable\":false,\"creationDate\":1565339891,\"modificationDate\":1643206310}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('3','pimcore_custom_views','{\"treetype\":\"object\",\"name\":\"Orders\",\"icon\":\"\\/bundles\\/pimcoreadmin\\/img\\/flat-white-icons\\/pimcore-main-icon-cart.svg\",\"id\":3,\"showroot\":false,\"rootfolder\":\"\\/Shop\\/Orders\",\"classes\":[],\"position\":\"left\",\"sort\":\"10\",\"expanded\":true}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('3','pimcore_custom_views','{\"treetype\":\"object\",\"name\":\"Orders\",\"icon\":\"\\/bundles\\/pimcoreadmin\\/img\\/flat-white-icons\\/pimcore-main-icon-cart.svg\",\"id\":3,\"showroot\":false,\"rootfolder\":\"\\/Shop\\/Orders\",\"classes\":\"\",\"position\":\"left\",\"sort\":\"10\",\"expanded\":true}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('3','pimcore_document_types','{\"name\":\"Content-Page\",\"group\":\"\",\"controller\":\"App\\\\Controller\\\\ContentController::defaultAction\",\"template\":null,\"type\":\"page\",\"priority\":0,\"creationDate\":1564393950,\"modificationDate\":1643204611,\"staticGeneratorEnabled\":null}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('3','pimcore_predefined_asset_metadata','{\"name\":\"license\",\"description\":\"\",\"type\":\"input\",\"targetSubtype\":null,\"data\":\"\",\"config\":null,\"language\":null,\"group\":null,\"creationDate\":1557394618,\"modificationDate\":1643206078}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('3','pimcore_predefined_properties','{\"name\":\"Navigation Extension Point\",\"description\":\"Defines and extension point for adding dynamic elements to navigation.\",\"key\":\"navigation_extension_point\",\"type\":\"select\",\"data\":\"\",\"config\":\"category\",\"ctype\":\"document\",\"inheritable\":false,\"creationDate\":1565339906,\"modificationDate\":1643206311}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('4','pimcore_custom_views','{\"treetype\":\"object\",\"name\":\"Categories\",\"icon\":\"\\/bundles\\/pimcoreadmin\\/img\\/flat-white-icons\\/pimcore-main-icon-category.svg\",\"id\":4,\"showroot\":false,\"rootfolder\":\"\\/Product Data\\/Categories\",\"classes\":[\"CA\"],\"position\":\"left\",\"sort\":\"5\",\"expanded\":true}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('4','pimcore_custom_views','{\"treetype\":\"object\",\"name\":\"Categories\",\"icon\":\"\\/bundles\\/pimcoreadmin\\/img\\/flat-white-icons\\/pimcore-main-icon-category.svg\",\"id\":4,\"showroot\":false,\"rootfolder\":\"\\/Product Data\\/Categories\",\"classes\":\"CA\",\"position\":\"left\",\"sort\":\"5\",\"expanded\":true}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('4','pimcore_document_types','{\"name\":\"Sidebar\",\"group\":\"\",\"controller\":null,\"template\":\"includes\\/sidebar.html.twig\",\"type\":\"snippet\",\"priority\":0,\"creationDate\":1564394007,\"modificationDate\":1643204612,\"staticGeneratorEnabled\":null}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('4','pimcore_predefined_asset_metadata','{\"name\":\"licensePath\",\"description\":null,\"type\":\"input\",\"targetSubtype\":null,\"data\":\"\",\"config\":null,\"language\":null,\"group\":null,\"creationDate\":1557394626,\"modificationDate\":1643206078}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('4','pimcore_predefined_properties','{\"name\":\"LeftNav Start Node\",\"description\":\"Start node for left navigation.\",\"key\":\"left_nav_start_node\",\"type\":\"document\",\"data\":\"\",\"config\":\"\",\"ctype\":\"document\",\"inheritable\":true,\"creationDate\":1565342864,\"modificationDate\":1643206312}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('5','pimcore_custom_views','{\"treetype\":\"object\",\"name\":\"Product Attributes\",\"icon\":\"\\/bundles\\/pimcoreadmin\\/img\\/flat-white-icons\\/pimcore-main-icon-setting.svg\",\"id\":5,\"showroot\":false,\"rootfolder\":\"\\/Product Data\",\"classes\":[\"BS\",\"MA\"],\"position\":\"left\",\"sort\":\"6\",\"expanded\":true,\"where\":\"(`path` LIKE \'\\/Product Data\\/Manufacturer\\/%\' OR `key` = \'Manufacturer\' OR `path` LIKE \'\\/Product Data\\/Body-Styles\\/%\' OR `key` = \'Body-Styles\')\"}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('5','pimcore_custom_views','{\"treetype\":\"object\",\"name\":\"Product Attributes\",\"icon\":\"\\/bundles\\/pimcoreadmin\\/img\\/flat-white-icons\\/pimcore-main-icon-setting.svg\",\"id\":5,\"showroot\":false,\"rootfolder\":\"\\/Product Data\",\"classes\":\"BS,MA\",\"position\":\"left\",\"sort\":\"6\",\"expanded\":true,\"where\":\"(`path` LIKE \'\\/Product Data\\/Manufacturer\\/%\' OR `key` = \'Manufacturer\' OR `path` LIKE \'\\/Product Data\\/Body-Styles\\/%\' OR `key` = \'Body-Styles\')\"}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('5','pimcore_document_types','{\"name\":\"Default Mail\",\"group\":\"\",\"controller\":\"App\\\\Controller\\\\DefaultController::genericMailAction\",\"template\":null,\"type\":\"email\",\"priority\":0,\"creationDate\":1564393950,\"modificationDate\":1643204613,\"staticGeneratorEnabled\":null}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('5','pimcore_predefined_asset_metadata','{\"name\":\"source\",\"description\":\"\",\"type\":\"input\",\"targetSubtype\":null,\"data\":\"\",\"config\":\"\",\"language\":null,\"group\":null,\"creationDate\":1557394633,\"modificationDate\":1643206079}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('5','pimcore_predefined_properties','{\"name\":\"Header Color\",\"description\":\"Specify header color. \",\"key\":\"header_color\",\"type\":\"select\",\"data\":\"\",\"config\":\"black,red,purple,blue\",\"ctype\":\"document\",\"inheritable\":false,\"creationDate\":1565351556,\"modificationDate\":1643206313}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('6','pimcore_custom_views','{\"treetype\":\"document\",\"name\":\"Katalog\",\"icon\":\"\\/bundles\\/pimcoreadmin\\/img\\/flat-white-icons\\/pimcore-main-icon-print.svg\",\"id\":6,\"showroot\":false,\"rootfolder\":\"\\/print\",\"position\":\"left\",\"sort\":\"5\",\"expanded\":false}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('6','pimcore_document_types','{\"name\":\"Newsletter\",\"group\":\"\",\"controller\":\"App\\\\Controller\\\\DefaultController::genericMailAction\",\"template\":null,\"type\":\"newsletter\",\"priority\":0,\"creationDate\":1566819624,\"modificationDate\":1643204615,\"staticGeneratorEnabled\":null}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('6','pimcore_predefined_properties','{\"name\":\"Sidebar Snippet\",\"description\":\"Specify a sidebar snippet.\",\"key\":\"sidebar\",\"type\":\"document\",\"data\":\"\",\"config\":\"\",\"ctype\":\"document\",\"inheritable\":true,\"creationDate\":1565795435,\"modificationDate\":1643206315}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('7','pimcore_custom_views','{\"treetype\":\"object\",\"name\":\"Customers\",\"icon\":\"\\/bundles\\/pimcoreadmin\\/img\\/flat-white-icons\\/businessman.svg\",\"id\":7,\"showroot\":false,\"rootfolder\":\"\\/Customer Management\\/customers\",\"classes\":[\"CU\"],\"position\":\"left\",\"sort\":\"6\",\"expanded\":true}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('7','pimcore_custom_views','{\"treetype\":\"object\",\"name\":\"Customers\",\"icon\":\"\\/bundles\\/pimcoreadmin\\/img\\/flat-white-icons\\/businessman.svg\",\"id\":7,\"showroot\":false,\"rootfolder\":\"\\/Customer Management\\/customers\",\"classes\":\"CU\",\"position\":\"left\",\"sort\":\"6\",\"expanded\":true}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('7','pimcore_predefined_properties','{\"name\":\"News Default Document\",\"description\":\"Defines the default news document (for canonical url)\",\"key\":\"news_default_document\",\"type\":\"document\",\"data\":\"\",\"config\":\"\",\"ctype\":\"document\",\"inheritable\":true,\"creationDate\":1565959224,\"modificationDate\":1643206316}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('8','pimcore_custom_views','{\"treetype\":\"object\",\"name\":\"Customer Segments\",\"icon\":\"\\/bundles\\/pimcoreadmin\\/img\\/flat-white-icons\\/pie_chart.svg\",\"id\":8,\"showroot\":false,\"rootfolder\":\"\\/Customer Management\\/segments\",\"classes\":[1,2,3],\"position\":\"left\",\"sort\":\"6\",\"expanded\":true}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('8','pimcore_custom_views','{\"treetype\":\"object\",\"name\":\"Customer Segments\",\"icon\":\"\\/bundles\\/pimcoreadmin\\/img\\/flat-white-icons\\/pie_chart.svg\",\"id\":8,\"showroot\":false,\"rootfolder\":\"\\/Customer Management\\/segments\",\"classes\":\"1,2,3\",\"position\":\"left\",\"sort\":\"6\",\"expanded\":true}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('8','pimcore_predefined_properties','{\"name\":\"Print Register Type\",\"description\":\"Defines color and size of register.\",\"key\":\"print_register_type\",\"type\":\"select\",\"data\":\"\",\"config\":\"orange,red,violett,green,blue,yellow\",\"ctype\":\"document\",\"inheritable\":true,\"creationDate\":1566309612,\"modificationDate\":1643206317}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('9','pimcore_predefined_properties','{\"name\":\"Print Register Title\",\"description\":\"Defines title for register.\",\"key\":\"print_register_title\",\"type\":\"text\",\"data\":\"\",\"config\":\"\",\"ctype\":\"document\",\"inheritable\":true,\"creationDate\":1566309660,\"modificationDate\":1643206319}','string');
INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('system_settings','pimcore_system_settings','{\"general\":{\"domain\":\"\",\"redirect_to_maindomain\":false,\"language\":\"en\",\"valid_languages\":[\"en\",\"de\",\"fr\"],\"fallback_languages\":{\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"default_language\":\"en\",\"debug_admin_translations\":false},\"documents\":{\"versions\":{\"days\":null,\"steps\":null},\"error_pages\":{\"default\":\"\",\"localized\":{\"en\":\"\",\"de\":\"\",\"fr\":\"\"}}},\"objects\":{\"versions\":{\"days\":null,\"steps\":null}},\"assets\":{\"versions\":{\"days\":null,\"steps\":null}},\"email\":[]}','string');
Expand Down
11 changes: 10 additions & 1 deletion src/Controller/CartController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\Routing\Annotation\Route;

class CartController extends FrontendController
Expand Down Expand Up @@ -100,15 +101,23 @@ public function cartListingAction(Request $request, BreadcrumbHelperService $bre
$cart = $this->getCart();

if ($request->getMethod() == Request::METHOD_POST) {
if (!$this->isCsrfTokenValid('cartListing', $request->get('_csrf_token'))) {
throw new AccessDeniedHttpException('Invalid request');
}

$items = $request->get('items');

foreach ($items as $itemKey => $quantity) {
if (!is_numeric($quantity)) {
continue;
}

if ($cart->getItemCount() > 99) {
break;
}
$product = AbstractProduct::getById($itemKey);
if ($product instanceof CheckoutableInterface) {
$cart->updateItem($itemKey, $product, $quantity, true);
$cart->updateItem($itemKey, $product, floor($quantity), true);
}
}
$cart->save();
Expand Down
1 change: 1 addition & 0 deletions templates/cart/cart_listing.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
<h4 class="mb-3">{{ 'cart.title' | trans }}</h4>
<div class="card shopping-cart">
<form method="post">
<input type="hidden" name="_csrf_token" value="{{ csrf_token('cartListing') }}">
<div class="card-body">

{% for item in cart.items %}
Expand Down

0 comments on commit 56ce204

Please sign in to comment.