From 1785060e8c168bc3bc4507c4edc33e5e44adaa2d Mon Sep 17 00:00:00 2001 From: Aimeos Date: Sun, 22 Dec 2024 15:07:13 +0100 Subject: [PATCH] Adapt to moved basket domain --- js/basket.js | 2 +- src/Admin/JQAdm/Basket/Standard.php | 20 ++++----- templates/admin/jqadm/basket/item.php | 2 +- templates/admin/jqadm/basket/list.php | 54 +++++++++++------------ tests/Admin/JQAdm/Basket/StandardTest.php | 9 ++-- 5 files changed, 43 insertions(+), 44 deletions(-) diff --git a/js/basket.js b/js/basket.js index e464d81ed..006b4e42c 100644 --- a/js/basket.js +++ b/js/basket.js @@ -33,7 +33,7 @@ Aimeos.Basket = { mixins: { methods: { can(action) { - return Aimeos.can(action, this.item['order.basket.siteid'] || null, this.siteid) + return Aimeos.can(action, this.item['basket.siteid'] || null, this.siteid) }, } }, diff --git a/src/Admin/JQAdm/Basket/Standard.php b/src/Admin/JQAdm/Basket/Standard.php index 2984adf03..148036b1e 100644 --- a/src/Admin/JQAdm/Basket/Standard.php +++ b/src/Admin/JQAdm/Basket/Standard.php @@ -100,7 +100,7 @@ public function copy() : ?string throw new \Aimeos\Admin\JQAdm\Exception( sprintf( $msg, 'id' ) ); } - $manager = \Aimeos\MShop::create( $context, 'order/basket' ); + $manager = \Aimeos\MShop::create( $context, 'basket' ); $view->item = $manager->get( $id ); $view->itemData = $this->toArray( $view->item, true ); @@ -124,7 +124,7 @@ public function delete() : ?string { $view = $this->view(); - $manager = \Aimeos\MShop::create( $this->context(), 'order/basket' ); + $manager = \Aimeos\MShop::create( $this->context(), 'basket' ); $manager->begin(); try @@ -136,7 +136,7 @@ public function delete() : ?string } $search = $manager->filter()->slice( 0, count( (array) $ids ) ); - $search->setConditions( $search->compare( '==', 'order.basket.id', $ids ) ); + $search->setConditions( $search->compare( '==', 'basket.id', $ids ) ); $items = $manager->search( $search ); foreach( $items as $item ) @@ -178,7 +178,7 @@ public function get() : ?string throw new \Aimeos\Admin\JQAdm\Exception( sprintf( $msg, 'id' ) ); } - $manager = \Aimeos\MShop::create( $context, 'order/basket' ); + $manager = \Aimeos\MShop::create( $context, 'basket' ); $view->item = $manager->get( $id ); $view->itemData = $this->toArray( $view->item ); @@ -206,9 +206,9 @@ public function search() : ?string { $total = 0; $params = $this->storeFilter( $view->param(), 'basket' ); - $manager = \Aimeos\MShop::create( $this->context(), 'order/basket' ); + $manager = \Aimeos\MShop::create( $this->context(), 'basket' ); - $search = $manager->filter( false, true )->order( 'order.basket.ctime' ); + $search = $manager->filter( false, true )->order( 'basket.ctime' ); $search = $this->initCriteria( $search, $params ); $view->items = $manager->search( $search, [], $total ); @@ -376,18 +376,18 @@ protected function getSubClientNames() : array /** * Constructs the data array for the view from the given item * - * @param \Aimeos\MShop\Order\Item\Basket\Iface $item Basket item object + * @param \Aimeos\MShop\Basket\Item\Iface $item Basket item object * @return string[] Multi-dimensional associative list of item data */ - protected function toArray( \Aimeos\MShop\Order\Item\Basket\Iface $item, bool $copy = false ) : array + protected function toArray( \Aimeos\MShop\Basket\Item\Iface $item, bool $copy = false ) : array { $siteId = $this->context()->locale()->getSiteId(); $data = $item->toArray( true ); if( $copy === true ) { - $data['order.basket.siteid'] = $siteId; - $data['order.basket.id'] = ''; + $data['basket.siteid'] = $siteId; + $data['basket.id'] = ''; } return $data; diff --git a/templates/admin/jqadm/basket/item.php b/templates/admin/jqadm/basket/item.php index f4874dd4b..e2e97a337 100644 --- a/templates/admin/jqadm/basket/item.php +++ b/templates/admin/jqadm/basket/item.php @@ -26,7 +26,7 @@ translate( 'currency', $this->item->getItem()->getPrice()->getCurrencyId() ) ?>
- + csrf()->formfield() ?> diff --git a/templates/admin/jqadm/basket/list.php b/templates/admin/jqadm/basket/list.php index 7492cb42e..d2f244d20 100644 --- a/templates/admin/jqadm/basket/list.php +++ b/templates/admin/jqadm/basket/list.php @@ -16,12 +16,12 @@ * interface. * * The names of the colums are in fact the search keys defined by the managers, - * e.g. "order.basket.id" for the order basket ID. + * e.g. "basket.id" for the order basket ID. * * @param array List of field names, i.e. search keys * @since 2023.10 */ -$default = $this->config( 'admin/jqadm/basket/fields', ['order.basket.id', 'order.basket.customerid', 'order.basket.name', 'order.basket.ctime'] ); +$default = $this->config( 'admin/jqadm/basket/fields', ['basket.id', 'basket.customerid', 'basket.name', 'basket.ctime'] ); $fields = $this->session( 'aimeos/admin/jqadm/basket/fields', $default ); $searchParams = $params = $this->get( 'pageParams', [] ); @@ -39,12 +39,12 @@ $columnList = [ - 'order.basket.id' => $this->translate( 'admin', 'ID' ), - 'order.basket.customerid' => $this->translate( 'admin', 'Customer ID' ), - 'order.basket.name' => $this->translate( 'admin', 'Name' ), - 'order.basket.ctime' => $this->translate( 'admin', 'Created' ), - 'order.basket.mtime' => $this->translate( 'admin', 'Modified' ), - 'order.basket.editor' => $this->translate( 'admin', 'Editor' ), + 'basket.id' => $this->translate( 'admin', 'ID' ), + 'basket.customerid' => $this->translate( 'admin', 'Customer ID' ), + 'basket.name' => $this->translate( 'admin', 'Name' ), + 'basket.ctime' => $this->translate( 'admin', 'Created' ), + 'basket.mtime' => $this->translate( 'admin', 'Modified' ), + 'basket.editor' => $this->translate( 'admin', 'Editor' ), ]; @@ -57,7 +57,7 @@
@@ -141,12 +141,12 @@ $this->config( 'admin/jqadm/partial/listsearch', 'listsearch' ), [ 'fields' => array_merge( $fields, ['select'] ), 'filter' => $this->session( 'aimeos/admin/jqadm/basket/filter', [] ), 'data' => [ - 'order.basket.id' => ['op' => '=='], - 'order.basket.customerid' => ['op' => '=='], - 'order.basket.name' => [], - 'order.basket.ctime' => ['op' => '-', 'type' => 'date'], - 'order.basket.mtime' => ['op' => '-', 'type' => 'date'], - 'order.basket.editor' => [], + 'basket.id' => ['op' => '=='], + 'basket.customerid' => ['op' => '=='], + 'basket.name' => [], + 'basket.ctime' => ['op' => '-', 'type' => 'date'], + 'basket.mtime' => ['op' => '-', 'type' => 'date'], + 'basket.editor' => [], ] ] ); @@ -164,23 +164,23 @@ v-bind:checked="checked(`js( $id ) ?>`)" v-bind:disabled="readonly(`js( $id ) ?>`)"> - - html( $item->getId() ) ?> + + html( $item->getId() ) ?> - - html( $item->getCustomerId() ) ?> + + html( $item->getCustomerId() ) ?> - - html( $item->getName() ) ?> + + html( $item->getName() ) ?> - - html( $item->getTimeCreated() ) ?> + + html( $item->getTimeCreated() ) ?> - - html( $item->getTimeModified() ) ?> + + html( $item->getTimeModified() ) ?> - - html( $item->editor() ) ?> + + html( $item->editor() ) ?> diff --git a/tests/Admin/JQAdm/Basket/StandardTest.php b/tests/Admin/JQAdm/Basket/StandardTest.php index c6a8433a1..0113aea55 100644 --- a/tests/Admin/JQAdm/Basket/StandardTest.php +++ b/tests/Admin/JQAdm/Basket/StandardTest.php @@ -103,11 +103,11 @@ public function testSearch() $param = array( 'site' => 'unittest', 'locale' => 'de', 'filter' => array( - 'key' => array( 0 => 'order.basket.name' ), + 'key' => array( 0 => 'basket.name' ), 'op' => array( 0 => '=~' ), 'val' => array( 0 => 'unittest' ), ), - 'sort' => array( 'order.basket.ctime' ), + 'sort' => array( 'basket.ctime' ), ); $helper = new \Aimeos\Base\View\Helper\Param\Standard( $this->view, $param ); $this->view->addHelper( 'param', $helper ); @@ -180,9 +180,8 @@ protected function getViewNoRender( $real = true ) protected function getBasketId( $name = 'unittest name' ) { - $manager = \Aimeos\MShop::create( $this->context, 'order/basket' ); - $search = $manager->filter()->slice( 0, 1 ); - $search->setConditions( $search->compare( '==', 'order.basket.name', $name ) ); + $manager = \Aimeos\MShop::create( $this->context, 'basket' ); + $search = $manager->filter()->add( 'basket.name', '==', $name )->slice( 0, 1 ); return $manager->search( $search ) ->first( new \Exception( sprintf( 'No basket item found for name "%1$s"', $name ) ) )