Merge pull request #93 from CE-PhoenixCart/1.1.0.5

1.1.0.5

Author: gburton

admin/includes/actions/languages/delete_confirm.php

@@ -29,5 +29,7 @@
   $db->query("DELETE FROM orders_status WHERE language_id = " . (int)$lID);
   $db->query("DELETE FROM customer_data_groups WHERE language_id = " . (int)$lID);
   $db->query("DELETE FROM languages WHERE languages_id = " . (int)$lID);
+  $db->query("DELETE FROM outgoing WHERE languages_id = " . (int)$lID);
+  $db->query("DELETE FROM outgoing_tpl_info WHERE languages_id = " . (int)$lID);
 
   return $link;

admin/includes/actions/languages/insert.php

@@ -29,6 +29,7 @@
   $db->query("INSERT INTO manufacturers_info (manufacturers_id, languages_id, manufacturers_url) SELECT manufacturers_id, " . (int)$lID . ", manufacturers_url FROM manufacturers_info WHERE languages_id = " . (int)$_SESSION['languages_id']);
   $db->query("INSERT INTO orders_status (orders_status_id, language_id, orders_status_name) SELECT orders_status_id, " . (int)$lID . ", orders_status_name FROM orders_status WHERE language_id = " . (int)$_SESSION['languages_id']);
   $db->query("INSERT INTO customer_data_groups (customer_data_groups_id, language_id, customer_data_groups_name, cdg_vertical_sort_order, customer_data_groups_width) SELECT customer_data_groups_id, " . (int)$lID . ", customer_data_groups_name, cdg_vertical_sort_order, customer_data_groups_width FROM customer_data_groups WHERE language_id = " . (int)$_SESSION['languages_id']);
+  $db->query("INSERT INTO outgoing_tpl_info (id, languages_id, text, title) SELECT id, " . (int)$lID . ", text, title FROM outgoing_tpl_info WHERE languages_id = " . (int)$_SESSION['languages_id']);
 
   if (isset($_POST['default']) && ($_POST['default'] == 'on')) {
     $db->query("UPDATE configuration SET configuration_value = '" . $db->escape($sql_data['code']) . "' WHERE configuration_key = 'DEFAULT_LANGUAGE'");

admin/includes/actions/manufacturers/infoboxes/default.php

@@ -26,7 +26,7 @@
     }
     $contents[] = ['text' => $GLOBALS['Admin']->catalog_image("images/{$mInfo->manufacturers_image}", [], $mInfo->manufacturers_name)];
 
-    $contents[] = ['text' => sprintf(TEXT_MANUFACTURERS_ADDRESS, nl2br($mInfo->manufacturers_address) ?? TEXT_NA)];
+    $contents[] = ['text' => sprintf(TEXT_MANUFACTURERS_ADDRESS, nl2br($mInfo->manufacturers_address ?? TEXT_NA))];
     $contents[] = ['text' => sprintf(TEXT_MANUFACTURERS_EMAIL, $mInfo->manufacturers_email ?? TEXT_NA)];
 
     $contents[] = ['text' => sprintf(TEXT_PRODUCTS, $mInfo->products_count)];

admin/includes/actions/outgoing/infoboxes/default.php

@@ -15,7 +15,7 @@
     $link = $GLOBALS['link']->set_parameter('oID', (int)$oInfo->id);
     $heading = $oInfo->email_address;
 
-    $email_query = \Outgoing::getEmail(['slug' => $oInfo->slug, 'id' => $oInfo->id]);
+    $email_query = \Outgoing::getEmail(['slug' => $oInfo->slug, 'id' => $oInfo->id, 'languages_id' => $oInfo->languages_id]);
     $email = json_decode($email_query, true);
 
     $modal_title = $email[$oInfo->id]['email']['title'];

admin/includes/actions/outgoing/infoboxes/edit.php

@@ -22,6 +22,13 @@
   $contents[] = ['text' => TEXT_OUTGOING_DATE . '<br>' . new Input('send_at', ['value' => $send_at_date], 'date')];
   $contents[] = ['text' => TEXT_OUTGOING_SLUG . '<br>' . new Input('slug', ['value' => $oInfo->slug])];
   $contents[] = ['text' => TEXT_OUTGOING_EMAIL . '<br>' . new Input('email_address', ['value' => $oInfo->email_address])];
+  
+  $languages = [];
+  foreach (language::load_all() as $l) {
+    $languages[] = ['id' => $l['id'], 'text' => $l['name']];
+  }
+  $contents[] = ['text' => TEXT_OUTGOING_i18n . '<br>' . (new Select('language_id', $languages, ['class' => 'form-select']))->set_selection($oInfo->languages_id)];
+  
   $contents[] = ['text' => TEXT_OUTGOING_MERGE_TAGS . (new Textarea('text', ['cols' => '80', 'rows' => '10']))->set_text($oInfo->merge_tags)];
 
   $contents[] = [

admin/includes/actions/outgoing/infoboxes/new.php

@@ -20,6 +20,12 @@
   $contents[] = ['text' => TEXT_OUTGOING_DATE . '<br>' . (new Input('send_at', ['id' => 'sendAtDate'], 'date'))->require()];
   $contents[] = ['text' => TEXT_OUTGOING_SLUG . '<br>' . (new Select('slug', $slug_array))->require()];
   $contents[] = ['text' => TEXT_OUTGOING_CUSTOMER . '<br>' . Customers::select('customer_id')->require()];
+  
+  $languages = [];
+  foreach (language::load_all() as $l) {
+    $languages[] = ['id' => $l['id'], 'text' => $l['name']];
+  }
+  $contents[] = ['text' => TEXT_OUTGOING_i18n . '<br>' . new Select('language_id', $languages, ['class' => 'form-select'])];
 
   $contents[] = [
     'class' => 'text-center',

admin/includes/actions/outgoing/insert.php

@@ -13,9 +13,10 @@
   $slug        = Text::input($_POST['slug']);
   $customer_id = (int)$_POST['customer_id'];
   $send_at     = Text::input($_POST['send_at']);
+  $language_id = (int)$_POST['language_id'];
 
-  include_once(DIR_FS_CATALOG . 'includes/modules/outgoing/' . $slug . '.php');
-  call_user_func_array(['Outgoing_' . $slug, 'admin_add'], [$customer_id, $send_at]);
+  include_once(DIR_FS_CATALOG . "includes/modules/outgoing/$slug.php");
+  call_user_func_array(["Outgoing_$slug", 'admin_add'], [$customer_id, $send_at, $language_id]);
 
   return $link;
 

admin/includes/actions/outgoing/save.php

@@ -17,6 +17,7 @@
     'slug' => Text::input($_POST['slug']),
     'email_address' => Text::input($_POST['email_address']),
     'merge_tags' => Text::prepare($_POST['text']),
+    'languages_id' => (int)$_POST['language_id'],
     'last_modified' => 'NOW()',
   ];
 

admin/includes/actions/outgoing/views/default.php

@@ -10,6 +10,8 @@
   Released under the GNU General Public License
 */
 
+  $l = language::load_all();
+
   $table_definition = [
     'columns' => [
       [
@@ -50,6 +52,16 @@
           return $row['slug'];
         },
       ],
+      [
+        'name' => 'i18n',
+        'is_heading' => false,
+        'function' => function ($row) use ($l) {
+          foreach ($l as $data) {
+            if ($data['id'] == $row['languages_id']) return $data['name'];
+          }
+          return null;
+        },
+      ],
       [
         'name' => TABLE_HEADING_ACTION,
         'class' => 'text-end',

admin/includes/actions/outgoing_tpl/delete_confirm.php

@@ -13,6 +13,7 @@
   $id = (int)$_GET['oID'];
 
   $db->query("DELETE FROM outgoing_tpl WHERE id = " . $id);
+  $db->query("DELETE FROM outgoing_tpl_info WHERE id = " . $id);
 
   if (isset($_POST['delete_queued']) && ($_POST['delete_queued'] == 'on')) {
     $del = $_POST['slugworth'];