Merge pull request #53 from CE-PhoenixCart/1.0.9.8

1.0.9.8

Author: gburton

README.md

@@ -124,5 +124,6 @@ Tomatoes | [Rocky_H](https://pixabay.com/users/rocky_h-11790006/) from Pixabay |
 Glasses | [Alexander Lesnitsky](https://pixabay.com/users/alles-2597842/) from Pixabay | https://pixabay.com/service/license/
 Farm | [OpenClipart-Vectors](https://pixabay.com/users/openclipart-vectors-30363/) from Pixabay | https://pixabay.com/service/license/
 Strawberries | [Gerd Altman](https://pixabay.com/users/geralt-9301/) from Pixabay | https://pixabay.com/service/license/
+Fruit, Laptop | [Ylanite Koppens](https://pixabay.com/users/nietjuhart-30460544/) from Pixabay | https://pixabay.com/service/license/
 
 Other fruit images are based on modified images from the named owners.

admin/includes/actions/customers/views/edit.php

@@ -13,7 +13,7 @@
   $cID = (int)$_GET['cID'];
 
   $hooks =& $admin_hooks;
-  $Template = new Template();
+  $Template = new Template('default');
 
   echo (new Form('customers', $Admin->link('customers.php')->retain_query_except()->set_parameter('action', 'update'), 'post'))
       ->hide('default_address_id', $customer_data->get('default_address_id', $customer_details));

admin/includes/modules/cfg_modules/cfgm_layout.php

@@ -20,6 +20,7 @@ class cfgm_layout extends abstract_page_cfgm {
       'contact_us' => 'MODULE_CONTENT_CU_INSTALLED',
       'index' => 'MODULE_CONTENT_I_INSTALLED',
       'product_info' => 'MODULE_CONTENT_PI_INSTALLED',
+      'info' => 'MODULE_CONTENT_INFO_INSTALLED',
     ];
 
     const GET_HELP_LINK = 'https://phoenixcart.org/phoenixcartwiki/index.php?title=Layout';

admin/includes/stylesheet.css

@@ -1 +0,0 @@
-.form-floating{position:relative}.form-floating>.form-control,.form-floating>.form-control-plaintext,.form-floating>.form-select{min-height:58px; line-height:1.25}.form-floating>label{position:absolute;top:0;left:0;z-index:2;height:100%;padding:1rem .75rem;overflow:hidden;text-align:start;text-overflow:ellipsis;white-space:nowrap;pointer-events:none;transform-origin:0 0;transition:opacity .1s ease-in-out,transform .1s ease-in-out}@media (prefers-reduced-motion:reduce){.form-floating>label{transition:none}}.form-floating>.form-control,.form-floating>.form-control-plaintext{padding:1rem .75rem}.form-floating>.form-control-plaintext::-moz-placeholder,.form-floating>.form-control::-moz-placeholder{color:transparent}.form-floating>.form-control-plaintext::placeholder,.form-floating>.form-control::placeholder{color:transparent}.form-floating>.form-control-plaintext:not(:-moz-placeholder-shown),.form-floating>.form-control:not(:-moz-placeholder-shown){padding-top:1.625rem;padding-bottom:.625rem}.form-floating>.form-control-plaintext:focus,.form-floating>.form-control-plaintext:not(:placeholder-shown),.form-floating>.form-control:focus,.form-floating>.form-control:not(:placeholder-shown){padding-top:1.625rem;padding-bottom:.625rem}.form-floating>.form-control-plaintext:-webkit-autofill,.form-floating>.form-control:-webkit-autofill{padding-top:1.625rem;padding-bottom:.625rem}.form-floating>.form-select{padding-top:1.625rem;padding-bottom:.625rem}.form-floating>.form-control:not(:-moz-placeholder-shown)~label{transform:scale(.85) translateY(-.5rem) translateX(.15rem)}.form-floating>.form-control-plaintext~label,.form-floating>.form-control:focus~label,.form-floating>.form-control:not(:placeholder-shown)~label,.form-floating>.form-select~label{transform:scale(.85) translateY(-.5rem) translateX(.15rem)}.form-floating>.form-control:not(:-moz-placeholder-shown)~label::after{position:absolute;inset:1rem 0.375rem;z-index:-1;height:1.5em;content:"";}.form-floating>.form-control-plaintext~label::after,.form-floating>.form-control:focus~label::after,.form-floating>.form-control:not(:placeholder-shown)~label::after,.form-floating>.form-select~label::after{position:absolute;inset:1rem 0.375rem;z-index:-1;height:1.5em;content:"";}.form-floating>.form-control:-webkit-autofill~label{transform:scale(.85) translateY(-.5rem) translateX(.15rem)}

ext/modules/content/account/nuke_account.php

@@ -29,7 +29,7 @@
       $db->query("DELETE FROM products_notifications WHERE customers_id = " . (int)$_SESSION['customer_id']);
       $db->query("DELETE FROM whos_online WHERE customer_id = " . (int)$_SESSION['customer_id']);
       $db->query("DELETE r, rd FROM reviews r LEFT JOIN reviews_description rd ON r.reviews_id = rd.reviews_id WHERE r.customers_id = " . (int)$_SESSION['customer_id']);
-      $db->query("DELETE t, td FROM testimonials t LEFT JOIN testimonials_description rd ON t.testimonials_id = td.testimonials_id WHERE t.customers_id = " . (int)$_SESSION['customer_id']);
+      $db->query("DELETE t, td FROM testimonials t LEFT JOIN testimonials_description td ON t.testimonials_id = td.testimonials_id WHERE t.customers_id = " . (int)$_SESSION['customer_id']);
       $db->query("DELETE FROM outgoing WHERE customer_id = " . (int)$_SESSION['customer_id']);
 
 // delete cookies

images/brands/fiacre.jpg

@@ -0,0 +1,14 @@
+<?php
+/*
+  $Id$
+
+  CE Phoenix, E-Commerce made Easy
+  https://phoenixcart.org
+
+  Copyright (c) 2024 Phoenix Cart
+
+  Released under the GNU General Public License
+*/
+
+  const MODULE_CONTENT_I_MODULAR_TITLE        = '&pi; Modular index';
+  const MODULE_CONTENT_I_MODULAR_DESCRIPTION  = 'Now you can more easily layout your Index Page.<div class="alert alert-warning">This module requires the use of &pi; child modules.  Any slots that have no child modules...will not display!</div>';