Skip to content

Commit

Permalink
Merge pull request #132 from sameday-courier/sip-711
Browse files Browse the repository at this point in the history
added select2 and updated pickup input
  • Loading branch information
Soptareanu authored Nov 26, 2024
2 parents af29ba1 + f141c6e commit e9ee8ae
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
5 changes: 3 additions & 2 deletions samedaycourier.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public function __construct()
$this->name = 'samedaycourier';
$this->tab = 'shipping_logistics';

$this->version = '1.7.2';
$this->version = '1.7.3';
$this->author = 'Sameday Courier';
$this->need_instance = 0;
$this->bootstrap = true;
Expand Down Expand Up @@ -223,6 +223,7 @@ public function uninstall()
/**
* Load the configuration form
*/

public function getContent()
{
$this->html = '';
Expand Down Expand Up @@ -1673,7 +1674,7 @@ private function displayAdminOrderContent($params)
'isLastMileToShow' => $isLastMileToShow,
'isOpenPackage' => ((int) SamedayOpenPackage::checkOrderIfIsOpenPackage($order->id)) > 0,
'ajaxRoute' => $this->ajaxRoute,
'messages' => $this->messages,
'messages' => $this->messages
)
);

Expand Down
8 changes: 8 additions & 0 deletions views/templates/hook/displayAdminOrder.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/select2.min.css" rel="stylesheet" />
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/select2.min.js"></script>
<style>
.select2{
width: 100% !important;
}
</style>
<script src="https://cdn.sameday.ro/locker-plugin/lockerpluginsdk.js"></script>
{if $messages|count}
{foreach from=$messages item=message}
Expand Down Expand Up @@ -532,6 +539,7 @@
$(this).attr('submitted', true);
});
$('#input-status-sameday-pickup_point').select2();
});
</script>
{/if}
Expand Down

0 comments on commit e9ee8ae

Please sign in to comment.