Skip to content

Commit 3277cb8

Browse files
authored
Merge pull request #1545 from abantecart/1.3.3.0
1.3.3.0
2 parents 0778779 + 56099ce commit 3277cb8

File tree

5 files changed

+64
-22
lines changed

5 files changed

+64
-22
lines changed

public_html/extensions/bootstrap5/storefront/base.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
let text_add_cart_confirm = "Added to cart";
3838
let cart_ajax_url = baseUrl + 'index.php?rt=r/product/product/addToCart';
3939
</script>
40-
<script type="text/javascript" src="extensions/bootstrap5/storefront/view/bootstrap5/js/custom.js"></script>
40+
<script type="text/javascript" src="extensions/bootstrap5/storefront/view/bootstrap5/js/main.js"></script>
4141
</head>
4242
<header></header>
4343
<body>

public_html/install/abantecart_database.sql

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12918,7 +12918,7 @@ CREATE TABLE `ac_email_templates` (
1291812918
--
1291912919
INSERT INTO `ac_email_templates` (`id`, `status`, `text_id`, `language_id`, `headers`, `subject`, `html_body`, `text_body`, `allowed_placeholders`, `store_id` )
1292012920
VALUES
12921-
(1,1,'admin_reset_password_link',1,'','{{store_name}} - Password reset','A password reset was requested from {{store_name}}&lt;br /&gt;\r\nTo reset your password click link below:&lt;br /&gt;\r\n{{ reset_link }}\r\n&lt;br /&gt;&lt;br /&gt;\r\n{{{ text_project_label }}}','A password reset was requested from {{store_name}} \r\nTo reset your password click link below:\r\n{{ reset_link }}\r\n\r\n\r\n{{{ text_project_label }}}','store_name, reset_link, text_project_label',0),
12921+
(1,1,'storefront_reset_password_link',1,'','{{store_name}} - Password reset','A password reset was requested from {{store_name}}&lt;br /&gt;\r\nTo reset your password click link below:&lt;br /&gt;\r\n&lt;a href="{{ reset_link }}"&gt;{{ reset_link }}&lt;/a &gt;\r\n&lt;br /&gt;&lt;br /&gt;\r\n{{{ text_project_label }}}','A password reset was requested from {{store_name}} \r\nTo reset your password click link below:\r\n{{ reset_link }}\r\n\r\n\r\n{{{ text_project_label }}}','store_name, reset_link, text_project_label',0),
1292212922
(2,1,'storefront_welcome_email_activated',1,'','Welcome, {{store_name}}','&lt;html&gt;\r\n &lt;head&gt;\r\n &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=utf-8&quot;&gt;\r\n &lt;/head&gt;\r\n &lt;body&gt;\r\n &lt;table style=&quot;font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 600px;&quot;&gt;\r\n &lt;tr&gt;\r\n &lt;td class=&quot;align_left&quot;&gt;\r\n &lt;a href=&quot;{{ store_url }}&quot; title=&quot;{{ store_name }}&quot;&gt;\r\n {{# logo_uri}}\r\n &lt;img src=&quot;{{ logo_uri }}&quot; alt=&quot;{{store_name}}&quot; style=&quot;border: none;&quot;&gt;\r\n {{/ logo_uri}}\r\n {{^ logo_uri}}\r\n {{# logo_html}}\r\n {{logo_html}}\r\n {{/ logo_html}}\r\n {{/ logo_uri}}\r\n &lt;/a&gt;\r\n &lt;/td&gt;\r\n &lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;&amp;nbsp;&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;Welcome and thank you for registering at {{ store_name }}&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;&amp;nbsp;&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;\r\n Your account has now been created and you can log in by using your email address and password by visiting our website or at the following URL:&lt;br/&gt;\r\n&lt;a href=&quot;{{ login_url }}&quot;&gt;{{ login_url }}&lt;/a&gt;&lt;br/&gt;\r\nOnce you logging in, you will be able to access, your wishlist, order history, printing invoices and editing your account information.\r\n &lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;&amp;nbsp;&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;\r\n Thank you.&lt;br/&gt;\r\n {{ store_name }}\r\n&lt;br/&gt;&lt;br/&gt;\r\n{{{ text_project_label }}}\r\n &lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;/table&gt;\r\n &lt;/body&gt;\r\n&lt;/html&gt;','Welcome and thank you for registering at {{ store_name }}\r\n\r\nYour account has now been created and you can log in by using your email address and password by visiting our website or at the following URL:\r\n{{ login_url }}\r\n\r\nOnce you logging in, you will be able to access, your wishlist, order history, printing invoices and editing your account information.\r\n\r\nThank you.\r\n{{ store_name }}\r\n{{{ text_project_label }}}','store_name, login_url, store_url, logo_html, logo_uri, text_project_label',0),
1292312923
(3,1,'storefront_welcome_email_approval',1,'','Welcome, {{store_name}}','&lt;html&gt;\r\n &lt;head&gt;\r\n &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=utf-8&quot;&gt;\r\n &lt;/head&gt;\r\n &lt;body&gt;\r\n &lt;table style=&quot;font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 600px;&quot;&gt;\r\n &lt;tr&gt;\r\n &lt;td class=&quot;align_left&quot;&gt;\r\n &lt;a href=&quot;{{ store_url }}&quot; title=&quot;{{ store_name }}&quot;&gt;\r\n {{#logo_uri}}\r\n &lt;img src=&quot;{{ logo_uri }}&quot; alt=&quot;{{store_name}}&quot; style=&quot;border: none;&quot;&gt;\r\n {{/logo_uri}}\r\n {{^logo_uri}}\r\n {{#logo_html}}\r\n {{logo_html}}\r\n {{/logo_html}}\r\n {{/logo_uri}}\r\n &lt;/a&gt;\r\n &lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;&amp;nbsp;&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;Welcome and thank you for registering at {{ store_name }}&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;&amp;nbsp;&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;\r\n Your account must be approved before you can login. Once approved you can log in by using your email address and password by visiting our website or at the following URL:&lt;br/&gt;\r\n&lt;a href=&quot;{{ login_url }}&quot;&gt;{{ login_url }}&lt;/a&gt;&lt;br/&gt;\r\nOnce you logging in, you will be able to access, your wishlist, order history, printing invoices and editing your account information.\r\n &lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;&amp;nbsp;&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;\r\n Thank you.&lt;br/&gt;\r\n {{ store_name }}\r\n&lt;br/&gt;&lt;br/&gt;\r\n{{{ text_project_label }}}\r\n &lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;/table&gt;\r\n &lt;/body&gt;\r\n&lt;/html&gt;','Welcome and thank you for registering at {{ store_name }}\r\n\r\nYour account must be approved before you can login. Once approved you can log in by using your email address and password by visiting our website or at the following URL:\r\n{{ login_url }}\r\n\r\nOnce you logging in, you will be able to access, your wishlist, order history, printing invoices and editing your account information.\r\n\r\nThank you.\r\n{{ store_name }}\r\n{{{ text_project_label }}}','store_name, login_url, store_url, logo_html, logo_uri, text_project_label',0),
1292412924
(4,1,'storefront_send_activate_link',1,'','{{store_name}} - Thank you for registering','&lt;html&gt;\r\n &lt;head&gt;\r\n &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=utf-8&quot;&gt;\r\n &lt;/head&gt;\r\n &lt;body&gt;\r\n &lt;table style=&quot;font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 600px;&quot;&gt;\r\n &lt;tr&gt;\r\n &lt;td class=&quot;align_left&quot;&gt;\r\n &lt;a href=&quot;{{ store_url }}&quot; title=&quot;{{ store_name }}&quot;&gt;\r\n {{#logo_uri}}\r\n &lt;img src=&quot;{{ logo_uri }}&quot; alt=&quot;{{store_name}}&quot; style=&quot;border: none;&quot;&gt;\r\n {{/logo_uri}}\r\n {{^logo_uri}}\r\n {{#logo_html}}\r\n {{logo_html}}\r\n {{/logo_html}}\r\n {{/logo_uri}}\r\n &lt;/a&gt;\r\n &lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;&amp;nbsp;&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;Welcome and thank you for registering at {{ store_name }}&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;&amp;nbsp;&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;\r\n Before we can activate your account one last step must be taken to complete your registration.&lt;br/&gt;\r\nYou must complete this last step to become a registered member. Please click the following link to activate your account:&lt;br/&gt;\r\n{{{ activate_url }}}&lt;br/&gt;\r\n\r\n &lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;&amp;nbsp;&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;\r\n Thank you.&lt;br/&gt;\r\n {{ store_name }}\r\n&lt;br/&gt;\r\n&lt;br/&gt;\r\n{{{ text_project_label }}}\r\n &lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;/table&gt;\r\n &lt;/body&gt;\r\n&lt;/html&gt;','Welcome and thank you for registering at {{ store_name }}!\r\n\r\nBefore we can activate your account one last step must be taken to complete your registration.\r\nYou must complete this last step to become a registered member. Please click the following link to activate your account\r\n{{ activate_url }}\r\n\r\nThank you,\r\n{{ store_name }}\r\n\r\n{{{ text_project_label }}}','store_name, activate_url, logo_uri, logo_html, store_url, text_project_label',0),
@@ -12938,7 +12938,8 @@ VALUES
1293812938
(21,1,'storefront_product_out_of_stock_admin_notify',1,'','Product with ID #{{ product_id }} is out of Stock. ',' Product with ID #{{ product_id }} is out of Stock. \r\n&lt;br/&gt;&lt;br/&gt;\r\n{{{ text_project_label }}}',' Product with ID #{{ product_id }} is out of Stock. \r\n\r\n{{{ text_project_label }}}','product_id, text_project_label',0),
1293912939
(22,1,'storefront_product_review_admin_notify',1,'',' New product review has been added.',' New product review has been added. See details {{ product_url }}\r\n&lt;br/&gt;&lt;br/&gt;\r\n{{{ text_project_label }}}',' New product review has been added. See details {{ product_url }}\r\n\r\n{{{ text_project_label }}}','product_url, product_id, text_project_label',0),
1294012940
(23,1,'storefront_welcome_email_approved',1,'','Welcome, {{store_name}} ','&lt;html&gt;\r\n &lt;head&gt;\r\n &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=utf-8&quot;&gt;\r\n &lt;/head&gt;\r\n &lt;body&gt;\r\n &lt;table style=&quot;font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 600px;&quot;&gt;\r\n &lt;tr&gt;\r\n &lt;td class=&quot;align_left&quot;&gt;\r\n &lt;a href=&quot;{{ store_url }}&quot; title=&quot;{{ store_name }}&quot;&gt;\r\n {{# logo_uri}}\r\n &lt;img src=&quot;{{ logo_uri }}&quot; alt=&quot;{{store_name}}&quot; style=&quot;border: none;&quot;&gt;\r\n {{/ logo_uri}}\r\n {{^ logo_uri}}\r\n {{# logo_html}}\r\n {{logo_html}}\r\n {{/ logo_html}}\r\n {{/ logo_uri}}\r\n &lt;/a&gt;\r\n &lt;/td&gt;\r\n &lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;&amp;nbsp;&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;Welcome and thank you for registering at {{ store_name }}&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;&amp;nbsp;&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;\r\n Your account has now been created and you can log in by using your email address and password by visiting our website or at the following URL:&lt;br/&gt;\r\n&lt;a href=&quot;{{ login_url }}&quot;&gt;{{ login_url }}&lt;/a&gt;&lt;br/&gt;\r\nOnce you logging in, you will be able to access, your wishlist, order history, printing invoices and editing your account information.\r\n &lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;&amp;nbsp;&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;\r\n Thank you.&lt;br/&gt;\r\n {{ store_name }}\r\n&lt;br/&gt;&lt;br/&gt;\r\n{{{ text_project_label }}}\r\n &lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;/table&gt;\r\n &lt;/body&gt;\r\n&lt;/html&gt;','Welcome and thank you for registering at {{ store_name }}\r\n\r\nYour account has now been created and you can log in by using your email address and password by visiting our website or at the following URL:\r\n{{ login_url }}\r\n\r\nOnce you logging in, you will be able to access, your wishlist, order history, printing invoices and editing your account information.\r\n\r\nThank you.\r\n{{ store_name }}\r\n{{{ text_project_label }}}','store_name, login_url, store_url, logo_html, logo_uri, text_project_label',0),
12941-
(24, 1,'fast_checkout_welcome_email_guest_registration',1,'','Welcome, {{store_name}}','&lt;html&gt;\r\n &lt;head&gt;\r\n &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=utf-8&quot;&gt;\r\n &lt;/head&gt;\r\n &lt;body&gt;\r\n &lt;table style=&quot;font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 600px;&quot;&gt;\r\n &lt;tr&gt;\r\n &lt;td class=&quot;align_left&quot;&gt;\r\n &lt;a href=&quot;{{ store_url }}&quot; title=&quot;{{ store_name }}&quot;&gt;\r\n {{# logo_uri}}\r\n &lt;img src=&quot;{{ logo_uri }}&quot; alt=&quot;{{store_name}}&quot; style=&quot;border: none;&quot;&gt;\r\n {{/ logo_uri}}\r\n {{^ logo_uri}}\r\n {{# logo_html}}\r\n {{logo_html}}\r\n {{/ logo_html}}\r\n {{/ logo_uri}}\r\n &lt;/a&gt;\r\n &lt;/td&gt;\r\n &lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;&amp;nbsp;&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;Welcome and thank you for registering at {{ store_name }}&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;&amp;nbsp;&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;\r\n Your account has now been created and you can log in by using your email address and password by visiting our website or at the following URL:&lt;br/&gt;\r\n&lt;a href=&quot;{{ login_url }}&quot;&gt;{{ login_url }}&lt;/a&gt;&lt;br/&gt;\r\n&lt;br/&gt;\r\nYour Login Name: {{login}} &lt;br/&gt;\r\nYour Password: {{password}} &lt;br/&gt;\r\n &lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;&amp;nbsp;&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;\r\n Thank you.&lt;br/&gt;\r\n {{ store_name }}\r\n&lt;br/&gt;&lt;br/&gt;\r\n{{{ text_project_label }}}\r\n &lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;/table&gt;\r\n &lt;/body&gt;\r\n&lt;/html&gt;','Welcome and thank you for registering at {{ store_name }}\r\n\r\nYour account has now been created and you can log in by using your email address and password by visiting our website or at the following URL:\r\n{{ login_url }}\r\n\r\nYour Login Name: {{login}}\r\nYour Password: {{password}}\r\n\r\n\r\nThank you.\r\n{{ store_name }}\r\n{{{ text_project_label }}}','store_name, login_url, store_url, logo_html, logo_uri, text_project_label, login, password',0)
12941+
(24, 1,'fast_checkout_welcome_email_guest_registration',1,'','Welcome, {{store_name}}','&lt;html&gt;\r\n &lt;head&gt;\r\n &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=utf-8&quot;&gt;\r\n &lt;/head&gt;\r\n &lt;body&gt;\r\n &lt;table style=&quot;font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 600px;&quot;&gt;\r\n &lt;tr&gt;\r\n &lt;td class=&quot;align_left&quot;&gt;\r\n &lt;a href=&quot;{{ store_url }}&quot; title=&quot;{{ store_name }}&quot;&gt;\r\n {{# logo_uri}}\r\n &lt;img src=&quot;{{ logo_uri }}&quot; alt=&quot;{{store_name}}&quot; style=&quot;border: none;&quot;&gt;\r\n {{/ logo_uri}}\r\n {{^ logo_uri}}\r\n {{# logo_html}}\r\n {{logo_html}}\r\n {{/ logo_html}}\r\n {{/ logo_uri}}\r\n &lt;/a&gt;\r\n &lt;/td&gt;\r\n &lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;&amp;nbsp;&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;Welcome and thank you for registering at {{ store_name }}&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;&amp;nbsp;&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;\r\n Your account has now been created and you can log in by using your email address and password by visiting our website or at the following URL:&lt;br/&gt;\r\n&lt;a href=&quot;{{ login_url }}&quot;&gt;{{ login_url }}&lt;/a&gt;&lt;br/&gt;\r\n&lt;br/&gt;\r\nYour Login Name: {{login}} &lt;br/&gt;\r\nYour Password: {{password}} &lt;br/&gt;\r\n &lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;&amp;nbsp;&lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;tr&gt;\r\n &lt;td&gt;\r\n Thank you.&lt;br/&gt;\r\n {{ store_name }}\r\n&lt;br/&gt;&lt;br/&gt;\r\n{{{ text_project_label }}}\r\n &lt;/td&gt;\r\n &lt;/tr&gt;\r\n &lt;/table&gt;\r\n &lt;/body&gt;\r\n&lt;/html&gt;','Welcome and thank you for registering at {{ store_name }}\r\n\r\nYour account has now been created and you can log in by using your email address and password by visiting our website or at the following URL:\r\n{{ login_url }}\r\n\r\nYour Login Name: {{login}}\r\nYour Password: {{password}}\r\n\r\n\r\nThank you.\r\n{{ store_name }}\r\n{{{ text_project_label }}}','store_name, login_url, store_url, logo_html, logo_uri, text_project_label, login, password',0),
12942+
(25,1,'admin_reset_password_link',1,'','{{store_name}} - Password reset','A password reset was requested from {{store_name}}&lt;br /&gt;\r\nTo reset your password click link below:&lt;br /&gt;\r\n&lt;a href="{{ reset_link }}"&gt;{{ reset_link }}&lt;/a &gt;\r\n&lt;br /&gt;&lt;br /&gt;\r\n{{{ text_project_label }}}','A password reset was requested from {{store_name}} \r\nTo reset your password click link below:\r\n{{ reset_link }}\r\n\r\n\r\n{{{ text_project_label }}}','store_name, reset_link, text_project_label',0)
1294212943
;
1294312944

1294412945
DROP TABLE IF EXISTS `ac_collections`;

public_html/install/abantecart_database_upgrade.sql

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,3 @@ ADD COLUMN `price_prefix` CHAR(1) NOT NULL DEFAULT '' AFTER `priority`;
33

44
ALTER TABLE `ac_product_specials`
55
ADD COLUMN `price_prefix` CHAR(1) NOT NULL DEFAULT '' AFTER `priority`;
6-
7-
UPDATE `ac_email_templates`
8-
SET `text_id` = 'admin_reset_password_link'
9-
WHERE `text_id` = 'storefront_reset_password_link';

0 commit comments

Comments
 (0)