From ceee1ec90d1a69bf57f5bcc11b2ebc910c3fcdd5 Mon Sep 17 00:00:00 2001 From: gulsarrays Date: Mon, 28 Apr 2014 13:03:44 +0530 Subject: [PATCH 001/168] D1545 Reports Phase 1 --- .../manufacturers/classes/manufacturers.php | 13 + .../applications/orders/classes/orders.php | 54 +++- .../statistics/classes/statistics.php | 14 + .../statistics/js/statistics.js.php | 129 +++++++++- .../applications/statistics/pages/main.php | 240 +++++++++++++++++- .../modules/statistics/customer_orders.php | 12 + .../statistics/inventory_cost_margin.php | 32 +++ .../en_US/modules/statistics/low_stock.php | 10 - .../modules/statistics/low_stock_report.php | 14 + .../statistics/margin_report_sales.php | 29 +++ .../en_US/modules/statistics/sales_report.php | 18 ++ .../modules/statistics/sales_tax_report.php | 19 ++ .../includes/languages/en_US/statistics.php | 13 +- .../modules/statistics/customer_orders.php | 115 +++++++++ .../statistics/inventory_cost_margin.php | 191 ++++++++++++++ .../includes/modules/statistics/low_stock.php | 65 ----- .../modules/statistics/low_stock_report.php | 76 ++++++ .../statistics/margin_report_sales.php | 161 ++++++++++++ .../modules/statistics/sales_report.php | 201 +++++++++++++++ .../modules/statistics/sales_tax_report.php | 144 +++++++++++ catalog/admin/templates/default/css/style.css | 29 +++ 21 files changed, 1490 insertions(+), 89 deletions(-) create mode 100644 catalog/admin/includes/languages/en_US/modules/statistics/customer_orders.php create mode 100644 catalog/admin/includes/languages/en_US/modules/statistics/inventory_cost_margin.php delete mode 100644 catalog/admin/includes/languages/en_US/modules/statistics/low_stock.php create mode 100644 catalog/admin/includes/languages/en_US/modules/statistics/low_stock_report.php create mode 100644 catalog/admin/includes/languages/en_US/modules/statistics/margin_report_sales.php create mode 100644 catalog/admin/includes/languages/en_US/modules/statistics/sales_report.php create mode 100644 catalog/admin/includes/languages/en_US/modules/statistics/sales_tax_report.php create mode 100644 catalog/admin/includes/modules/statistics/customer_orders.php create mode 100644 catalog/admin/includes/modules/statistics/inventory_cost_margin.php delete mode 100644 catalog/admin/includes/modules/statistics/low_stock.php create mode 100644 catalog/admin/includes/modules/statistics/low_stock_report.php create mode 100644 catalog/admin/includes/modules/statistics/margin_report_sales.php create mode 100644 catalog/admin/includes/modules/statistics/sales_report.php create mode 100644 catalog/admin/includes/modules/statistics/sales_tax_report.php diff --git a/catalog/admin/includes/applications/manufacturers/classes/manufacturers.php b/catalog/admin/includes/applications/manufacturers/classes/manufacturers.php index 862cceedb..9f4c8e1f0 100644 --- a/catalog/admin/includes/applications/manufacturers/classes/manufacturers.php +++ b/catalog/admin/includes/applications/manufacturers/classes/manufacturers.php @@ -288,5 +288,18 @@ public static function batchDelete($batch) { } return true; } + public static function getManufacturersArray() { + global $lC_Language, $lC_Database; + // build the manufacturers array + $manufacturers_array = array(); + $Qmanufacturers = $lC_Database->query('select manufacturers_id, manufacturers_name from :table_manufacturers order by manufacturers_name'); + $Qmanufacturers->bindTable(':table_manufacturers', TABLE_MANUFACTURERS); + $Qmanufacturers->execute(); + while ($Qmanufacturers->next()) { + $manufacturersArray[] = array('id' => $Qmanufacturers->valueInt('manufacturers_id'), + 'text' => $Qmanufacturers->value('manufacturers_name')); + } + return $manufacturersArray; + } } ?> \ No newline at end of file diff --git a/catalog/admin/includes/applications/orders/classes/orders.php b/catalog/admin/includes/applications/orders/classes/orders.php index ee3bafe02..0d522c6dd 100644 --- a/catalog/admin/includes/applications/orders/classes/orders.php +++ b/catalog/admin/includes/applications/orders/classes/orders.php @@ -926,7 +926,7 @@ public static function getOrderTransactions($id = null) { return $tData; } - public static function getOrderStatusArray() { + /* public static function getOrderStatusArray() { global $lC_Language, $lC_Database; // build the order status array @@ -947,7 +947,7 @@ public static function getOrderStatusArray() { } return $orderStatusArray; - } + } */ public static function getOrdersProducts($id) { global $lC_Language, $lC_Database; @@ -1591,5 +1591,55 @@ public static function deleteOrderProduct() { return $data; } + public static function getOrderStatusArray() { + global $lC_Language, $lC_Database; + + // build the order status array + $orders_status_type_array = array(); + $Qstatuses_type = $lC_Database->query('select distinct(orders_status_type) as orders_status_type from :table_orders_status where language_id = :language_id'); + $Qstatuses_type->bindTable(':table_orders_status', TABLE_ORDERS_STATUS); + $Qstatuses_type->bindInt(':language_id', $lC_Language->getID()); + $Qstatuses_type->execute(); + + + + + while ($Qstatuses_type->next()) { + $orderStatusType_Array[$Qstatuses_type->value('orders_status_type')] = $Qstatuses_type->value('orders_status_type'); + } + + + $orderStatusTypeArray[] = array('id' => -1, 'text' => $lC_Language->get('text_status_type')); + foreach($orderStatusType_Array as $id => $text) { + $orderStatusTypeArray[] = array('id' => $id, 'text' => ' - '.$text); + } + + + + // build the order status array + $orders_status_array = array(); + $Qstatuses = $lC_Database->query('select orders_status_id, orders_status_name from :table_orders_status where language_id = :language_id'); + $Qstatuses->bindTable(':table_orders_status', TABLE_ORDERS_STATUS); + $Qstatuses->bindInt(':language_id', $lC_Language->getID()); + $Qstatuses->execute(); + + while ($Qstatuses->next()) { + $orders_status_array[$Qstatuses->valueInt('orders_status_id')] = $Qstatuses->value('orders_status_name'); + } + + $orderStatusArray = array(); + $orderStatusArray[] = array('id' => 0, 'text' => $lC_Language->get('text_all')); + + $orderStatusArray = array_merge($orderStatusArray,$orderStatusTypeArray); + $orderStatusArray[] = array('id' => -2, 'text' => $lC_Language->get('text_statuses')); + + + + foreach($orders_status_array as $id => $text) { + $orderStatusArray[] = array('id' => $id, 'text' => ' - '.$text); + } + + return $orderStatusArray; + } } ?> diff --git a/catalog/admin/includes/applications/statistics/classes/statistics.php b/catalog/admin/includes/applications/statistics/classes/statistics.php index 4d75e9a3d..7c8e177aa 100644 --- a/catalog/admin/includes/applications/statistics/classes/statistics.php +++ b/catalog/admin/includes/applications/statistics/classes/statistics.php @@ -74,6 +74,20 @@ public static function getData($module) { $result['aaData'][] = array("$col[0]", "$col[1]", "$col[2]", "$col[3]"); } else if ($columns == 5) { $result['aaData'][] = array("$col[0]", "$col[1]", "$col[2]", "$col[3]", "$col[4]"); + } else if ($columns == 6) { + $result['aaData'][] = array("$col[0]", "$col[1]", "$col[2]", "$col[3]", "$col[4]", "$col[5]"); + } else if ($columns == 7) { + $result['aaData'][] = array("$col[0]", "$col[1]", "$col[2]", "$col[3]", "$col[4]", "$col[5]", "$col[6]"); + } else if ($columns == 8) { + $result['aaData'][] = array("$col[0]", "$col[1]", "$col[2]", "$col[3]", "$col[4]", "$col[5]", "$col[6]", "$col[7]"); + } else if ($columns == 9) { + $result['aaData'][] = array("$col[0]", "$col[1]", "$col[2]", "$col[3]", "$col[4]", "$col[5]", "$col[6]", "$col[7]", "$col[8]"); + } else if ($columns == 10) { + $result['aaData'][] = array("$col[0]", "$col[1]", "$col[2]", "$col[3]", "$col[4]", "$col[5]", "$col[6]", "$col[7]", "$col[8]", "$col[9]"); + } else if ($columns == 11) { + $result['aaData'][] = array("$col[0]", "$col[1]", "$col[2]", "$col[3]", "$col[4]", "$col[5]", "$col[6]", "$col[7]", "$col[8]", "$col[9]", "$col[10]"); + } else if ($columns == 12) { + $result['aaData'][] = array("$col[0]", "$col[1]", "$col[2]", "$col[3]", "$col[4]", "$col[5]", "$col[6]", "$col[7]", "$col[8]", "$col[9]", "$col[10]", "$col[11]"); } } $result['total'] = $cnt; diff --git a/catalog/admin/includes/applications/statistics/js/statistics.js.php b/catalog/admin/includes/applications/statistics/js/statistics.js.php index 19f4361aa..d1be22f78 100644 --- a/catalog/admin/includes/applications/statistics/js/statistics.js.php +++ b/catalog/admin/includes/applications/statistics/js/statistics.js.php @@ -11,8 +11,13 @@ global $lC_Template, $lC_Language, $modulesArr, $accessArr, $cols; if (!empty($_GET['module'])) { // module listing ?> + modCheck('includes/applications/orders/classes/orders.php')); + require_once($lC_Vqmod->modCheck('includes/applications/manufacturers/classes/manufacturers.php')); + + $note = '

NOTE'. + $lC_Language->get('text1').'' .lc_go_pro().$lC_Language->get('text2').''.lc_go_pro().$lC_Language->get('text3').'

'; + + $breakout = ' + ' . $lC_Language->get("text_breakout_by") . ' + + + + + + '; + + function get_dropdown_list_array($type) { + global $lC_Language; + + $list_arr = array(); + + switch($type) { + case 'manufacturer': + $list_str = $lC_Language->get('text_select_manufacturers'); + $list_arr = lC_Manufacturers_Admin::getManufacturersArray(); + break; + case 'supplier': + $list_str = $lC_Language->get('text_select_supplier'); + //$list_arr = lC_Orders_Admin::getOrderStatusArray(); + break; + case 'order_status': + //$list_str = $lC_Language->get('text_statuses'); + $list_arr = lC_Orders_Admin::getOrderStatusArray(); + break; + } + + $i = 0; + if($list_str != '') { + $i = 1; + $return_arr[0] = array('id' => '', + 'text' => $list_str + ); + } + + if(is_array($list_arr) && count($list_arr) > 0) { + foreach($list_arr as $k => $arr) { + $return_arr[$k+$i] = $arr; + } + } + return $return_arr; + } + + $arr_time_span = array( + array('id' => 'daily', + 'text' => $lC_Language->get('text_daily')), + array('id' => 'monthly', + 'text' => $lC_Language->get('text_monthly')), + array('id' => 'quaterly', + 'text' => $lC_Language->get('text_quarterly')), + array('id' => 'annually', + 'text' => $lC_Language->get('text_annually')) + ); + $arr_summary = array( + array('id' => 'summary', + 'text' => $lC_Language->get('text_summary')), + array('id' => 'detailed', + 'text' => $lC_Language->get('text_detailed')), + array('id' => 'detailed_amounts', + 'text' => $lC_Language->get('text_detailed_amounts')) + ); + + + $manufacturer_arr = get_dropdown_list_array('manufacturer'); + $supplier_arr = get_dropdown_list_array('supplier'); + $order_status_arr = get_dropdown_list_array('order_status'); + + $manufacturer_dropdown = lc_draw_pull_down_menu('manufacturer', $manufacturer_arr, null, 'class="input with-small-padding small-margin-bottom"') . ' '; + $supplier_dropdown = lc_draw_pull_down_menu('supplier', $supplier_arr, null, 'class="input with-small-padding small-margin-bottom"') . ' '; + $order_status_dropdown = lc_draw_pull_down_menu('order_status', $order_status_arr, null, 'class="input with-small-padding small-margin-bottom"') . ' '; + $time_span_dropdown = lc_draw_pull_down_menu('time_span', $arr_time_span, null, 'class="green-gradient select expandable-list small-margin-bottom"') . ' '; + $summary_dropdown = lc_draw_pull_down_menu('summary', $arr_summary, null, 'class="green-gradient select expandable-list"') . ' '; + + $start_date_input = ' + + + '; + $expires_date_input = ' + + + '; + + $go_date = ''; + + switch($_GET['module']) { + case 'orders': + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + + case 'products_purchased': + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + + case 'products_viewed': + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + + case 'customer_orders': + $list_criteria .= $order_status_dropdown; + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + + case 'inventory_cost_margin': + $list_criteria .= $note; + $list_criteria .= $breakout; + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + + case 'low_stock_report': + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + + case 'margin_report_sales': + $list_criteria .= $note; + $list_criteria .= $manufacturer_dropdown; + $list_criteria .= $supplier_dropdown; + $list_criteria .= $order_status_dropdown; + $list_criteria .= $time_span_dropdown; + $list_criteria .= $start_date_input; + $list_criteria .= $expires_date_input; + $list_criteria .= $go_date; + // added for mobile css per report + $dataTableTopMargin320 = '0px'; + $dataTableTopMargin480 = '0px'; + break; + + case 'sales_report': + $list_criteria .= $order_status_dropdown; + $list_criteria .= $time_span_dropdown; + $list_criteria .= $summary_dropdown; + $list_criteria .= $start_date_input; + $list_criteria .= $expires_date_input; + $list_criteria .= $go_date; + // added for mobile css per report + $dataTableTopMargin320 = '0px'; + $dataTableTopMargin480 = '0px'; + break; + + case 'sales_tax_report': + $list_criteria .= $order_status_dropdown; + $list_criteria .= $time_span_dropdown; + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + } + + ?> +
-

getPageTitle(); ?>

+

+ getPageTitle(); + } else { + echo $lC_Statistics->_title; + } + ?> +

-
+
+
+
+ +
+
+
@@ -40,7 +264,7 @@ - +
  
diff --git a/catalog/admin/includes/languages/en_US/modules/statistics/customer_orders.php b/catalog/admin/includes/languages/en_US/modules/statistics/customer_orders.php new file mode 100644 index 000000000..37694a079 --- /dev/null +++ b/catalog/admin/includes/languages/en_US/modules/statistics/customer_orders.php @@ -0,0 +1,12 @@ +# @package admin::languages::modules +# @author Loaded Commerce +# @copyright Copyright 2003-2014 Loaded Commerce, LLC +# @copyright Portions Copyright 2003 osCommerce +# @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt +# @version $Id: customer_orders.php v1.0 2013-08-08 datazen $ + + +statistics_customer_orders_title = Customer Orders +statistics_customers_table_heading_customers_name = Customers Name +statistics_customers_table_heading_group = Group +statistics_customers_table_heading_order_total = Order Total diff --git a/catalog/admin/includes/languages/en_US/modules/statistics/inventory_cost_margin.php b/catalog/admin/includes/languages/en_US/modules/statistics/inventory_cost_margin.php new file mode 100644 index 000000000..331998aad --- /dev/null +++ b/catalog/admin/includes/languages/en_US/modules/statistics/inventory_cost_margin.php @@ -0,0 +1,32 @@ +# @package admin::languages::modules +# @author Loaded Commerce +# @copyright Copyright 2003-2014 Loaded Commerce, LLC +# @copyright Portions Copyright 2003 osCommerce +# @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt +# @version $Id: inventory_cost_margin.php v1.0 2013-08-08 datazen $ + + +statistics_inventory_cost_margin_title = Inventory Cost Margin +statistics_inventory_table_heading_breakout = Breakout +statistics_inventory_table_heading_of_products = #of Products +statistics_inventory_table_heading_total_qoh = Total QOH +statistics_inventory_table_heading_total_cost = Total Cost +statistics_inventory_table_heading_retail_value = Retail Value +statistics_inventory_table_heading_retail_margin = Retail Margin +statistics_inventory_table_heading_retail_special = Retail Special + +text_supplier = Supplier +text_class = Class +text_category = Category +text_product/SKU = Product/SKU +text_manufacturers = Manufacturers +text_supplier_upsell_title = Class + +text_class_upsell_title = Class +text_class_upsell_desc = Additional Images Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. + +text1 = Recommended for +text2 = This reports uses for cost data only collected and managed in +text3 = Edition. + + diff --git a/catalog/admin/includes/languages/en_US/modules/statistics/low_stock.php b/catalog/admin/includes/languages/en_US/modules/statistics/low_stock.php deleted file mode 100644 index 66ededf62..000000000 --- a/catalog/admin/includes/languages/en_US/modules/statistics/low_stock.php +++ /dev/null @@ -1,10 +0,0 @@ -# @package admin::languages::modules -# @author Loaded Commerce -# @copyright Copyright 2003-2014 Loaded Commerce, LLC -# @copyright Portions Copyright 2003 osCommerce -# @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt -# @version $Id: low_stock.php v1.0 2013-08-08 datazen $ - -statistics_low_stock_title = Low Stock -statistics_low_stock_table_heading_products = Products -statistics_low_stock_table_heading_level = Level diff --git a/catalog/admin/includes/languages/en_US/modules/statistics/low_stock_report.php b/catalog/admin/includes/languages/en_US/modules/statistics/low_stock_report.php new file mode 100644 index 000000000..186622d67 --- /dev/null +++ b/catalog/admin/includes/languages/en_US/modules/statistics/low_stock_report.php @@ -0,0 +1,14 @@ +# @package admin::languages::modules +# @author Loaded Commerce +# @copyright Copyright 2003-2014 Loaded Commerce, LLC +# @copyright Portions Copyright 2003 osCommerce +# @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt +# @version $Id: low_stock_report.php v1.0 2013-08-08 datazen $ + +statistics_low_stock_report_title = Low Stock Report +statistics_low_stock_table_heading_products = Product Name +statistics_low_stock_table_heading_qty_available = Qty Available +statistics_low_stock_table_heading_model = Model +statistics_low_stock_table_heading_sales = 60 Days Sales +statistics_low_stock_table_heading_est_stock = Est. Stock +statistics_low_stock_table_heading_status = Status diff --git a/catalog/admin/includes/languages/en_US/modules/statistics/margin_report_sales.php b/catalog/admin/includes/languages/en_US/modules/statistics/margin_report_sales.php new file mode 100644 index 000000000..735ca0e13 --- /dev/null +++ b/catalog/admin/includes/languages/en_US/modules/statistics/margin_report_sales.php @@ -0,0 +1,29 @@ +# @package admin::languages::modules +# @author Loaded Commerce +# @copyright Copyright 2003-2014 Loaded Commerce, LLC +# @copyright Portions Copyright 2003 osCommerce +# @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt +# @version $Id: margin_report_sales.php v1.0 2013-08-08 datazen $ + + +statistics_margin_title = Margin Report Sales +statistics_margin_table_heading_order_id = Order ID +statistics_margin_table_heading_item_sold = #Item Sold +statistics_margin_table_heading_sales_amount = Sales Amount +statistics_margin_table_heading_cost = Cost +statistics_margin_table_heading_margin($) = Margin($) +statistics_margin_table_heading_margin(%) = Margin(%) + +text_select_manufacturers = Select Manufacturers +text_select_supplier = Select Supplier +text_from_date =From Date +text_to_date =To Date + +text1 = Recommended for +text2 = This reports uses for cost data only collected and managed in +text3 = Edition. + +text_class_upsell_title = Class +text_class_upsell_desc = Additional Images Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. + + diff --git a/catalog/admin/includes/languages/en_US/modules/statistics/sales_report.php b/catalog/admin/includes/languages/en_US/modules/statistics/sales_report.php new file mode 100644 index 000000000..c975d8cbf --- /dev/null +++ b/catalog/admin/includes/languages/en_US/modules/statistics/sales_report.php @@ -0,0 +1,18 @@ +# @package admin::languages::modules +# @author Loaded Commerce +# @copyright Copyright 2003-2014 Loaded Commerce, LLC +# @copyright Portions Copyright 2003 osCommerce +# @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt +# @version $Id: sales_report.php v1.0 2013-08-08 datazen $ + + +statistics_sales_title = Sales Report +statistics_sales_table_heading_date = Date +statistics_sales_table_heading_orders = #Orders +statistics_sales_table_heading_items = #Items +statistics_sales_table_heading_revenue = Revenue +statistics_sales_table_heading_shipping = Shipping +statistics_sales_table_heading_discount = Discount + +text_from_date =From Date +text_to_date =To Date \ No newline at end of file diff --git a/catalog/admin/includes/languages/en_US/modules/statistics/sales_tax_report.php b/catalog/admin/includes/languages/en_US/modules/statistics/sales_tax_report.php new file mode 100644 index 000000000..f30ee67b3 --- /dev/null +++ b/catalog/admin/includes/languages/en_US/modules/statistics/sales_tax_report.php @@ -0,0 +1,19 @@ +# @package admin::languages::modules +# @author Loaded Commerce +# @copyright Copyright 2003-2014 Loaded Commerce, LLC +# @copyright Portions Copyright 2003 osCommerce +# @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt +# @version $Id: sales_tax_report.php v1.0 2013-08-08 datazen $ + +statistics_sales_tax_report_title = Sales Tax Report + +statistics_sales_tax_table_heading_month = Month +statistics_sales_tax_table_heading_day = Day +statistics_sales_tax_table_heading_gross_income= Gross Income +statistics_sales_tax_table_heading_product_sales = Product Sales +statistics_sales_tax_table_heading_non_taxed_sales = Non Taxed Sales +statistics_sales_tax_table_heading_taxed_sales = Taxed Sales +statistics_sales_tax_table_heading_taxes_collected = Taxes Collected +statistics_sales_tax_table_heading_shipping_handling = Shipping & Handling +statistics_sales_tax_table_heading_tax_shipping = Tax On Shipping +statistics_sales_tax_table_heading_gift_vouchers = Gift Vouchers \ No newline at end of file diff --git a/catalog/admin/includes/languages/en_US/statistics.php b/catalog/admin/includes/languages/en_US/statistics.php index cc9f38d76..6b571e229 100644 --- a/catalog/admin/includes/languages/en_US/statistics.php +++ b/catalog/admin/includes/languages/en_US/statistics.php @@ -10,4 +10,15 @@ table_heading_modules = Modules table_heading_action = Action -modules_location = Modules Directory: \ No newline at end of file +modules_location = Modules Directory: +text_monthly = Monthly +text_quarterly = Quarterly +text_annually = Annually +text_summary = Summary +text_detailed = Detailed +text_detailed_amounts = Detailed Amounts +text_breakout_by = Breakout by: +text_statuses = Statuses +text_status_type = Status Types +text_go = Go +text_daily = Daily \ No newline at end of file diff --git a/catalog/admin/includes/modules/statistics/customer_orders.php b/catalog/admin/includes/modules/statistics/customer_orders.php new file mode 100644 index 000000000..932d5e9ea --- /dev/null +++ b/catalog/admin/includes/modules/statistics/customer_orders.php @@ -0,0 +1,115 @@ +modCheck('includes/classes/statistics.php')); +} + +class lC_Statistics_Customer_Orders extends lC_Statistics { + + // Class constructor + public function lC_Statistics_Customer_Orders() { + global $lC_Language, $lC_Currencies, $lC_Vqmod; + + $lC_Language->loadIniFile('modules/statistics/customer_orders.php'); + + if ( !isset($lC_Currencies) ) { + if ( !class_exists('lC_Currencies') ) { + include($lC_Vqmod->modCheck('../includes/classes/currencies.php')); + } + + $lC_Currencies = new lC_Currencies(); + } + + $this->_setIcon(); + $this->_setTitle(); + } + + // Private methods + protected function _setIcon() { + $this->_icon = lc_icon_admin('reports.png'); + } + + protected function _setTitle() { + global $lC_Language; + + $this->_title = $lC_Language->get('statistics_customer_orders_title'); + } + + protected function _setHeader() { + global $lC_Language; + + $this->_header = + array($lC_Language->get('statistics_customers_table_heading_customers_name'), + $lC_Language->get('statistics_customers_table_heading_group'), + $lC_Language->get('statistics_customers_table_heading_order_total') + ); + } + + protected function _setData() { + global $lC_Database, $lC_Language, $lC_Currencies; + + $this->_data = array(); + + $this->_resultset = $lC_Database->query('select c.customers_id, c.customers_firstname, cg.customers_group_name, sum(ot.value) as orders_total from :table_customers c, :table_customers_groups cg, :table_orders o, :table_orders_total ot where cg.customers_group_id = c.customers_group_id and c.customers_id = o.customers_id and o.orders_id = ot.orders_id and ot.class = "total" '); + + if (isset($_GET['statusID'])) { + + switch($_GET['statusID']) { + + case 'Pending': + case 'Approved': + case 'Rejected': + $query = $lC_Database->query('select orders_status_id, orders_status_name from :table_orders_status where orders_status_type = "'.$_GET['statusID'].'"' ); + $query->bindTable(':table_orders_status', TABLE_ORDERS_STATUS); + $query->bindInt(':language_id', $lC_Language->getID()); + $query->execute(); + + $ids = ''; + while($query->next()) { + $ids .= $query->value('orders_status_id').","; + } + $ids = substr($ids, 0, -1); + $this->_resultset->appendQuery(' and o.orders_status IN ( :orders_status )'); + $this->_resultset->bindValue(':orders_status', $ids); + + break; + + default: + if((int)$_GET['statusID'] > 0) { + $this->_resultset->appendQuery(' and o.orders_status = :orders_status '); + $this->_resultset->bindInt(':orders_status', $_GET['statusID']); + } + } + } + + $this->_resultset->appendQuery(' group by o.customers_id order by o.customers_id '); + + $this->_resultset->bindTable(':table_customers', TABLE_CUSTOMERS); + $this->_resultset->bindTable(':table_customers_groups', + TABLE_CUSTOMERS_GROUPS); + $this->_resultset->bindTable(':table_orders', TABLE_ORDERS); + $this->_resultset->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + + $this->_resultset->setBatchLimit($_GET['page'], + MAX_DISPLAY_SEARCH_RESULTS); + $this->_resultset->execute(); + + while ( $this->_resultset->next() ) { + $this->_data[] = + array($this->_resultset->value('customers_firstname'), + $this->_resultset->value('customers_group_name'), + $lC_Currencies->format($this->_resultset->valueInt('orders_total'))); + } + } +} +?> \ No newline at end of file diff --git a/catalog/admin/includes/modules/statistics/inventory_cost_margin.php b/catalog/admin/includes/modules/statistics/inventory_cost_margin.php new file mode 100644 index 000000000..46287353d --- /dev/null +++ b/catalog/admin/includes/modules/statistics/inventory_cost_margin.php @@ -0,0 +1,191 @@ +modCheck('includes/classes/statistics.php')); +} + +class lC_Statistics_Inventory_Cost_Margin extends lC_Statistics { + + // Class constructor + public function lC_Statistics_Inventory_Cost_Margin() { + global $lC_Language, $lC_Currencies, $lC_Vqmod; + + $lC_Language->loadIniFile('modules/statistics/inventory_cost_margin.php'); + + if ( !isset($lC_Currencies) ) { + if ( !class_exists('lC_Currencies') ) { + include($lC_Vqmod->modCheck('../includes/classes/currencies.php')); + } + + $lC_Currencies = new lC_Currencies(); + } + + $this->_setIcon(); + $this->_setTitle(); + } + + // Private methods + protected function _setIcon() { + $this->_icon = lc_icon_admin('reports.png'); + } + + protected function _setTitle() { + global $lC_Language; + + $this->_title = $lC_Language->get('statistics_inventory_cost_margin_title'); + } + + protected function _setHeader() { + global $lC_Language; + + $this->_header = array($lC_Language->get('statistics_inventory_table_heading_breakout'), + $lC_Language->get('statistics_inventory_table_heading_of_products'), + $lC_Language->get('statistics_inventory_table_heading_total_qoh'), + $lC_Language->get('statistics_inventory_table_heading_total_cost'), + $lC_Language->get('statistics_inventory_table_heading_retail_value'), + $lC_Language->get('statistics_inventory_table_heading_retail_margin'), + $lC_Language->get('statistics_inventory_table_heading_retail_special') + ); + } + + protected function _setData() { + global $lC_Database, $lC_Language, $lC_Currencies; + + $this->_data = array(); + + $breakoutType = "category"; + if (isset($_GET['breakoutType'])) { + $breakoutType = $_GET['breakoutType']; + } + + switch($breakoutType) { + case 'class': + return false; + break; + case 'supplier': + return false; + break; + case 'product_sku': + $breakout_qry = $lC_Database->query('select p.products_id as id, p.products_sku as sku, p.products_quantity as qohTotal,p.products_cost as costTotal, p.products_price as valueTotal, (p.products_price-p.products_cost) as marginTotal, s.specials_new_products_price as special from :table_products p LEFT JOIN :table_specials s on(s.products_id = p.products_id) order by p.products_sku'); + $breakout_qry->bindTable(':table_products', TABLE_PRODUCTS); + $breakout_qry->bindTable(':table_specials', TABLE_SPECIALS); + $breakout_qry->execute(); + break; + case 'manufacturers': + $breakout_qry = $lC_Database->query('select m.manufacturers_id as id, m.manufacturers_name as name from :table_manufacturers m order by m.manufacturers_name'); + $breakout_qry->bindTable(':table_manufacturers', TABLE_MANUFACTURERS); + $breakout_qry->execute(); + break; + case 'category': + default: + $breakout_qry = $lC_Database->query('select cd.categories_id as id, cd.categories_name as name from :table_categories c, :table_categories_description cd where c.categories_id = cd.categories_id and c.categories_mode = :categories_mode and cd.language_id = :language_id order by cd.categories_name'); + $breakout_qry->bindTable(':table_categories_description', TABLE_CATEGORIES_DESCRIPTION); + $breakout_qry->bindTable(':table_categories', TABLE_CATEGORIES); + $breakout_qry->bindInt(':language_id', $lC_Language->getID()); + $breakout_qry->bindvalue(':categories_mode', 'category'); + $breakout_qry->execute(); + } + + + while($breakout_qry->next()) { + if($breakoutType == 'product_sku'){ + + $breakout = $breakout_qry->value('sku'); + $numOfProduct = $breakout_qry->value('-'); + $qohTotal = $breakout_qry->value('qohTotal'); + $costTotal = $breakout_qry->value('costTotal'); + $valueTotal = $breakout_qry->value('valueTotal'); + $marginTotal = $breakout_qry->value('marginTotal'); + $specialTotal = $breakout_qry->value('special'); + } else if($breakoutType == 'category' || $breakoutType == 'manufacturers') { + $id = $breakout_qry->value('id'); + $tmp_arry = $this->_getDetailsForBreakoutType($id, $breakoutType); + $breakout = $breakout_qry->value('name'); + $numOfProduct = $tmp_arry['numOfProduct']; + $qohTotal = $tmp_arry['qohTotal']; + $costTotal = $tmp_arry['costTotal']; + $valueTotal = $tmp_arry['valueTotal']; + $marginTotal = $tmp_arry['marginTotal']; + $specialTotal = $tmp_arry['specialTotal']; + } + + $this->_data[] = array($breakout, + $numOfProduct, + $qohTotal, + $lC_Currencies->format($costTotal), + $lC_Currencies->format($valueTotal), + $lC_Currencies->format($marginTotal), + $lC_Currencies->format($specialTotal) + ); + } + } + + function _getDetailsForBreakoutType($id, $breakoutType) { + global $lC_Database, $lC_Language, $lC_Currencies; + + $productDetails_qry = $lC_Database->query('select p.products_id, p.products_quantity, p.products_cost, p.products_price, (p.products_price-p.products_cost) as margin from :table_products p'); + + if ($breakoutType == 'category') { + $productDetails_qry->appendQuery(', :table_products_to_categories ptc '); + $productDetails_qry->bindTable(':table_products_to_categories', TABLE_PRODUCTS_TO_CATEGORIES); + } + + if ($breakoutType == 'manufacturers') { + $productDetails_qry->appendQuery(' where p.manufacturers_id = :manufacturers_id '); + $productDetails_qry->bindValue(':manufacturers_id',$id); + } + + if ($breakoutType == 'category') { + $productDetails_qry->appendQuery(' where p.products_id = ptc.products_id and ptc.categories_id = :categories_id' ); + $productDetails_qry->bindValue(':categories_id',$id); + } + + $productDetails_qry->bindTable(':table_products', TABLE_PRODUCTS); + $productDetails_qry->execute(); + + $numOfProduct = 0; + $qoh = 0; + $cost = 0; + $value = 0; + $margin = 0; + $specials = 0; + + while($productDetails_qry->next()) { + $numOfProduct++; + $qoh += $productDetails_qry->value('products_quantity'); + $cost += $productDetails_qry->value('products_cost'); + $value += $productDetails_qry->value('products_price'); + $margin += $productDetails_qry->value('margin'); + + $specails_qry = $lC_Database->query('select specials_new_products_price from :table_specials s where s.products_id = :products_id and (s.expires_date > now() OR s.expires_date IS NULL )'); + $specails_qry->bindTable(':table_specials', TABLE_SPECIALS); + $specails_qry->bindValue(':products_id',$productDetails_qry->value('products_id')); + $specails_qry->execute(); + + while($specails_qry->next()) { + $specials += $specails_qry->value('specials_new_products_price'); + } + } + + $return_arr = array('numOfProduct' => $numOfProduct, + 'qohTotal' => $qoh, + 'costTotal' => $cost, + 'valueTotal' => $value, + 'marginTotal' => $margin, + 'specialTotal' => $specials + ); + + return $return_arr; + } +} +?> \ No newline at end of file diff --git a/catalog/admin/includes/modules/statistics/low_stock.php b/catalog/admin/includes/modules/statistics/low_stock.php deleted file mode 100644 index 5078b5f37..000000000 --- a/catalog/admin/includes/modules/statistics/low_stock.php +++ /dev/null @@ -1,65 +0,0 @@ -modCheck('includes/classes/statistics.php')); -} - -class lC_Statistics_Low_Stock extends lC_Statistics { - - // Class constructor - public function lC_Statistics_Low_Stock() { - global $lC_Language; - - $lC_Language->loadIniFile('modules/statistics/low_stock.php'); - - $this->_setIcon(); - $this->_setTitle(); - } - - // Private methods - protected function _setIcon() { - $this->_icon = lc_icon_admin('products.png'); - } - - protected function _setTitle() { - global $lC_Language; - - $this->_title = $lC_Language->get('statistics_low_stock_title'); - } - - protected function _setHeader() { - global $lC_Language; - - $this->_header = array($lC_Language->get('statistics_low_stock_table_heading_products'), - $lC_Language->get('statistics_low_stock_table_heading_level')); - } - - protected function _setData() { - global $lC_Database, $lC_Language; - - $this->_data = array(); - - $this->_resultset = $lC_Database->query('select p.products_id, pd.products_name, products_quantity from :table_products p, :table_products_description pd where p.products_id = pd.products_id and pd.language_id = :language_id and p.products_quantity <= :stock_reorder_level order by p.products_quantity desc'); - $this->_resultset->bindTable(':table_products', TABLE_PRODUCTS); - $this->_resultset->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION); - $this->_resultset->bindInt(':language_id', $lC_Language->getID()); - $this->_resultset->bindInt(':stock_reorder_level', STOCK_REORDER_LEVEL); - $this->_resultset->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS); - $this->_resultset->execute(); - - while ( $this->_resultset->next() ) { - $this->_data[] = array(lc_link_object(lc_href_link_admin(FILENAME_DEFAULT, 'products&pID=' . $this->_resultset->valueInt('products_id') . '&action=preview'), $this->_icon . ' ' . $this->_resultset->value('products_name')), - $this->_resultset->valueInt('products_quantity')); - } - } -} -?> \ No newline at end of file diff --git a/catalog/admin/includes/modules/statistics/low_stock_report.php b/catalog/admin/includes/modules/statistics/low_stock_report.php new file mode 100644 index 000000000..32ff3373a --- /dev/null +++ b/catalog/admin/includes/modules/statistics/low_stock_report.php @@ -0,0 +1,76 @@ +modCheck('includes/classes/statistics.php')); +} + +class lC_Statistics_Low_Stock_Report extends lC_Statistics { + + // Class constructor + public function lC_Statistics_Low_Stock_Report() { + global $lC_Language; + + $lC_Language->loadIniFile('modules/statistics/low_stock_report.php'); + + $this->_setIcon(); + $this->_setTitle(); + } + + // Private methods + protected function _setIcon() { + $this->_icon = lc_icon_admin('reports.png'); + } + + protected function _setTitle() { + global $lC_Language; + + $this->_title = $lC_Language->get('statistics_low_stock_report_title'); + } + + protected function _setHeader() { + global $lC_Language; + + $this->_header = array($lC_Language->get('statistics_low_stock_table_heading_products'), + $lC_Language->get('statistics_low_stock_table_heading_qty_available'), + $lC_Language->get('statistics_low_stock_table_heading_model'), + $lC_Language->get('statistics_low_stock_table_heading_sales'), + $lC_Language->get('statistics_low_stock_table_heading_est_stock'), + $lC_Language->get('statistics_low_stock_table_heading_status')); + } + + protected function _setData() { + global $lC_Database, $lC_Language; + + $this->_data = array(); + + $this->_resultset = $lC_Database->query('select p.products_id, pd.products_name, p.products_quantity, p.products_model, count( op.products_quantity ) AS ordertotal, p.products_status from :table_products p, :table_products_description pd, :table_orders_products op LEFT JOIN :table_orders o on(op.orders_id = o.orders_id ) WHERE p.products_id = pd.products_id and pd.products_id = op.products_id and pd.language_id =1 and o.date_purchased >= DATE_SUB( CURDATE( ),INTERVAL 60 DAY) and p.products_quantity <=5 group by p.products_quantity desc'); + $this->_resultset->bindTable(':table_products', TABLE_PRODUCTS); + $this->_resultset->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION); + $this->_resultset->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); + $this->_resultset->bindTable(':table_orders', TABLE_ORDERS); + $this->_resultset->bindInt(':language_id', $lC_Language->getID()); + $this->_resultset->bindInt(':stock_reorder_level', STOCK_REORDER_LEVEL); + $this->_resultset->execute(); + + while ( $this->_resultset->next() ) { + $products_status = (($this->_resultset->valueInt('products_status') == 1) ? '' : ''); + + $this->_data[] = array($this->_resultset->value('products_name'), + $this->_resultset->valueInt('products_quantity'), + $this->_resultset->value('products_model'), + $this->_resultset->valueInt('ordertotal'), + '-', + $products_status ); + } + } +} +?> \ No newline at end of file diff --git a/catalog/admin/includes/modules/statistics/margin_report_sales.php b/catalog/admin/includes/modules/statistics/margin_report_sales.php new file mode 100644 index 000000000..af9cd3a41 --- /dev/null +++ b/catalog/admin/includes/modules/statistics/margin_report_sales.php @@ -0,0 +1,161 @@ +modCheck('includes/classes/statistics.php')); +} + +class lC_Statistics_Margin_Report_Sales extends lC_Statistics { + + // Class constructor + public function lC_Statistics_Margin_Report_Sales() { + global $lC_Language, $lC_Currencies, $lC_Vqmod; + + $lC_Language->loadIniFile('modules/statistics/margin_report_sales.php'); + + if ( !isset($lC_Currencies) ) { + if ( !class_exists('lC_Currencies') ) { + include($lC_Vqmod->modCheck('../includes/classes/currencies.php')); + } + + $lC_Currencies = new lC_Currencies(); + } + + $this->_setIcon(); + $this->_setTitle(); + } + + // Private methods + protected function _setIcon() { + $this->_icon = lc_icon_admin('reports.png'); + } + + protected function _setTitle() { + global $lC_Language; + + $this->_title = $lC_Language->get('statistics_margin_title'); + } + + protected function _setHeader() { + global $lC_Language; + + $this->_header = array($lC_Language->get('statistics_margin_table_heading_order_id'), + $lC_Language->get('statistics_margin_table_heading_item_sold'), + $lC_Language->get('statistics_margin_table_heading_sales_amount'), + $lC_Language->get('statistics_margin_table_heading_cost'), + $lC_Language->get('statistics_margin_table_heading_margin($)'), + $lC_Language->get('statistics_margin_table_heading_margin(%)')); + } + + protected function _setData() { + global $lC_Database, $lC_Language, $lC_Currencies; + + $this->_data = array(); + + $this->_resultset = $lC_Database->query('select + o.orders_id, op.products_quantity,p.products_price,p.products_cost, p.products_price-p.products_cost as margin,((p.products_price- + p.products_cost)/p.products_cost)*100 as margin_percent from + :table_orders o ,:table_products p, :table_orders_products op + where p.products_id = op.products_id and op.orders_id = o.orders_id '); + + if (isset($_GET['statusID'])) { + + switch($_GET['statusID']) { + + case 'Pending': + case 'Approved': + case 'Rejected': + $query = $lC_Database->query('select orders_status_id, orders_status_name from :table_orders_status where orders_status_type = "'.$_GET['statusID'].'"' ); + $query->bindTable(':table_orders_status', TABLE_ORDERS_STATUS); + $query->bindInt(':language_id', $lC_Language->getID()); + $query->execute(); + + $ids = ''; + while($query->next()) { + $ids .= $query->value('orders_status_id').","; + } + $ids = substr($ids, 0, -1); + + $this->_resultset->appendQuery(' and o.orders_status IN ( :orders_status )'); $this->_resultset->bindValue(':orders_status', $ids); + + break; + + default: + if((int)$_GET['statusID'] > 0) { + $this->_resultset->appendQuery(' and o.orders_status IN ( :orders_status )'); $this->_resultset->bindValue(':orders_status', $ids); + } + } + } + + if(isset($_GET['manufacturerID']) && (int)$_GET['manufacturerID'] > 0) { + $this->_resultset->appendQuery(' and p.manufacturers_id = :manufacturers_id '); + $this->_resultset->bindInt(':manufacturers_id', $_GET['manufacturerID']); + } + /*if(isset($_GET['supplierID']) && (int)$_GET['supplierID'] > 0) { + $this->_resultset->appendQuery(' and o.orders_status = :orders_status '); + $this->_resultset->bindInt(':orders_status', $_GET['statusID']); + }*/ + + + + $s_date_arr = explode('/', $_GET['startDate']); + $start = $s_date_arr['2']."-".$s_date_arr['0']."-".$s_date_arr['1']; + + $e_date_arr = explode('/', $_GET['expiresDate']); + $end = $e_date_arr['2']."-".$e_date_arr['0']."-".$e_date_arr['1']; +/* + + print("_GET "); + print_r($s_date_arr); + print(""); + print("s_date : ".$s_date.'
'); + + + $s_date = str_replace('/', '-', $_GET['startDate']); + $start = date('Y-m-d', strtotime($s_date)); + + $e_date = str_replace('/', '-', $_GET['expiresDate']); + $end = date('Y-m-d', strtotime($e_date)); +*/ + if(isset($_GET['startDate']) && !empty($_GET['startDate']) ) { + $this->_resultset->appendQuery(' and o.date_purchased >= :start '); + $this->_resultset->bindvalue(':start', $start); + } + if(isset($_GET['expiresDate']) && !empty($_GET['expiresDate']) ) { + $this->_resultset->appendQuery(' and o.date_purchased <= :end'); + $this->_resultset->bindvalue(':end', $end); + } + $this->_resultset->appendQuery(' order by o.orders_id asc '); + + $this->_resultset->bindTable(':table_orders', TABLE_ORDERS); + $this->_resultset->bindTable(':table_products', TABLE_PRODUCTS); + $this->_resultset->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); + //$this->_resultset->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS); + $this->_resultset->execute(); + + + /*print(""); + print_r($this->_resultset); + print(""); + die('11111');*/ + + while ( $this->_resultset->next() ) { + $this->_data[] = + array($this->_resultset->value('orders_id'), + $this->_resultset->valueInt('products_quantity'), + $lC_Currencies->format($this->_resultset->value('products_price')), + $lC_Currencies->format($this->_resultset->value('products_cost')), + $lC_Currencies->format($this->_resultset->value('margin')), + $this->_resultset->valueInt('margin_percent')); + } + } +} +?> \ No newline at end of file diff --git a/catalog/admin/includes/modules/statistics/sales_report.php b/catalog/admin/includes/modules/statistics/sales_report.php new file mode 100644 index 000000000..8be2e12df --- /dev/null +++ b/catalog/admin/includes/modules/statistics/sales_report.php @@ -0,0 +1,201 @@ +modCheck('includes/classes/statistics.php')); + } + + class lC_Statistics_Sales_Report extends lC_Statistics { + + // Class constructor + public function lC_Statistics_Sales_Report() { + global $lC_Language, $lC_Currencies, $lC_Vqmod; + + $lC_Language->loadIniFile('modules/statistics/sales_report.php'); + + if (!isset($lC_Currencies)) { + if (!class_exists('lC_Currencies')) { + include($lC_Vqmod->modCheck('../includes/classes/currencies.php')); + } + + $lC_Currencies = new lC_Currencies(); + } + + $this->_setIcon(); + $this->_setTitle(); + } + + // Private methods + protected function _setIcon() { + $this->_icon = lc_icon_admin('reports.png'); + } + + protected function _setTitle() { + global $lC_Language; + + $this->_title = $lC_Language->get('statistics_sales_title'); + } + + protected function _setHeader() { + global $lC_Language; + + $this->_header = array($lC_Language->get('statistics_sales_table_heading_date'), + $lC_Language->get('statistics_sales_table_heading_orders'), + $lC_Language->get('statistics_sales_table_heading_items'), + $lC_Language->get('statistics_sales_table_heading_revenue'), + $lC_Language->get('statistics_sales_table_heading_shipping'), + $lC_Language->get('statistics_sales_table_heading_discount') + ); + } + + protected function _setData() { + global $lC_Database, $lC_Language, $lC_Currencies; + + $this->_data = array(); + + $orderDate_qry = $lC_Database->query('select o.date_purchased , count(*) as orderCount from :table_orders o where 1 '); + + + if (isset($_GET['statusID'])) { + + switch($_GET['statusID']) { + + case 'Pending': + case 'Approved': + case 'Rejected': + $query = $lC_Database->query('select orders_status_id, orders_status_name from :table_orders_status where orders_status_type = "'.$_GET['statusID'].'"' ); + $query->bindTable(':table_orders_status', TABLE_ORDERS_STATUS); + $query->bindInt(':language_id', $lC_Language->getID()); + $query->execute(); + + $ids = ''; + while($query->next()) { + $ids .= $query->value('orders_status_id').","; + } + $ids = substr($ids, 0, -1); + $orderDate_qry->appendQuery(' and o.orders_status IN ( :orders_status )'); + $orderDate_qry->bindValue(':orders_status', $ids); + + break; + + default: + if((int)$_GET['statusID'] > 0) { + $orderDate_qry->appendQuery(' and o.orders_status = :orders_status '); + $orderDate_qry->bindInt(':orders_status', $_GET['statusID']); + } + } + } + + $s_date_arr = explode('/', $_GET['startDate']); + $start = $s_date_arr['2']."-".$s_date_arr['0']."-".$s_date_arr['1']; + + $e_date_arr = explode('/', $_GET['expiresDate']); + $end = $e_date_arr['2']."-".$e_date_arr['0']."-".$e_date_arr['1']; + + if(isset($_GET['startDate']) && !empty($_GET['startDate']) ) { + $orderDate_qry->appendQuery(' and o.date_purchased >= :start '); + $orderDate_qry->bindvalue(':start', $start); + } + if(isset($_GET['expiresDate']) && !empty($_GET['expiresDate']) ) { + $orderDate_qry->appendQuery(' and o.date_purchased <= :end'); + $orderDate_qry->bindvalue(':end', $end); + } + + $orderDate_qry->appendQuery(' group by o.date_purchased '); + + $orderDate_qry->bindTable(':table_orders', TABLE_ORDERS); + $orderDate_qry->execute(); + + + while($orderDate_qry->next()) { + + $orderCount = 0; + $itemCount = 0; + $revenueTotal = 0; + $shippingTotal= 0; + $couponTotal = 0; + + $datePurchased = lC_DateTime::getShort($orderDate_qry->value('date_purchased')); + $orderCount = $orderDate_qry->value('orderCount'); + + $order_qry = $lC_Database->query('select orders_id from :table_orders where date_purchased = :date_purchased '); + + $order_qry->bindTable(':table_orders', TABLE_ORDERS); + $order_qry->bindValue(':date_purchased',$orderDate_qry->value('date_purchased')); + $order_qry->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS); + $order_qry->execute(); + + while($order_qry->next()) { + $tmp_arry = $this->_getOrdersProductsDetails_sales($order_qry->value('orders_id')); + foreach($tmp_arry as $k => $v) { + switch($k) { + case 'itemCount': + $itemCount += $v; + break; + case 'revenueTotal': + $revenueTotal += $v; + break; + case 'shippingTotal': + $shippingTotal += $v; + break; + case 'couponTotal': + $couponTotal += $v; + break; + } + } + } + $this->_data[] = array($datePurchased, + $orderCount, + $itemCount, + $lC_Currencies->format($revenueTotal), + $lC_Currencies->format($shippingTotal), + $lC_Currencies->format($couponTotal) + ); + } + } + + function _getOrdersProductsDetails_sales($orders_id) { + global $lC_Database; + + $orderProducts_qry = $lC_Database->query('select ((p.products_price-p.products_cost)* op.products_quantity) as revenue, op.products_quantity from :table_products p, :table_orders_products op where p.products_id = op.products_id and op.orders_id = :orders_id '); + $orderProducts_qry->bindTable(':table_products', TABLE_PRODUCTS); + $orderProducts_qry->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); + $orderProducts_qry->bindValue(':orders_id', $orders_id); + + while($orderProducts_qry->next()) { + $qty += $orderProducts_qry->value('products_quantity'); + $revenue += $orderProducts_qry->value('revenue'); + } + + $orderTotals_qry = $lC_Database->query('select title,text,value,class from :table_orders_total where orders_id = :orders_id and (class=:class or class=:class )'); + $orderTotals_qry->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + $orderTotals_qry->bindValue(':class', 'shipping'); + $orderTotals_qry->bindValue(':class', 'coupon'); + $orderTotals_qry->bindValue(':orders_id', $orders_id); + + while($orderTotals_qry->next()) { + if ($orderTotals_qry->value('class') == 'shipping') { + $shipping += $orderTotals_qry->value('value'); + } else if ($orderTotals_qry->value('class') == 'coupon' ) { + $coupon += $orderTotals_qry->value('value'); + } + } + + $return_arr = array('itemCount' => $qty, + 'revenueTotal' => $revenue, + 'shippingTotal' => $shipping, + 'couponTotal' => $coupon + ); + + return $return_arr; + } + } +?> \ No newline at end of file diff --git a/catalog/admin/includes/modules/statistics/sales_tax_report.php b/catalog/admin/includes/modules/statistics/sales_tax_report.php new file mode 100644 index 000000000..2ad5622d7 --- /dev/null +++ b/catalog/admin/includes/modules/statistics/sales_tax_report.php @@ -0,0 +1,144 @@ +modCheck('includes/classes/statistics.php')); +} + +class lC_Statistics_Sales_Tax_Report extends lC_Statistics { + + // Class constructor + public function lC_Statistics_Sales_Tax_Report() { + global $lC_Language, $lC_Currencies, $lC_Vqmod; + + $lC_Language->loadIniFile('modules/statistics/sales_tax_report.php'); + + if (!isset($lC_Currencies)) { + if (!class_exists('lC_Currencies')) { + include($lC_Vqmod->modCheck('../includes/classes/currencies.php')); + } + $lC_Currencies = new lC_Currencies(); + } + $this->_setIcon(); + $this->_setTitle(); + } + + // Private methods + protected function _setIcon() { + $this->_icon = lc_icon_admin('reports.png'); + } + + protected function _setTitle() { + global $lC_Language; + + $this->_title = $lC_Language->get('statistics_sales_tax_report_title'); + } + + protected function _setHeader() { + global $lC_Language; + + $this->_header = array($lC_Language->get('statistics_sales_tax_table_heading_month'), + $lC_Language->get('statistics_sales_tax_table_heading_day'), + $lC_Language->get('statistics_sales_tax_table_heading_gross_income'), + $lC_Language->get('statistics_sales_tax_table_heading_product_sales'), + $lC_Language->get('statistics_sales_tax_table_heading_non_taxed_sales'), + $lC_Language->get('statistics_sales_tax_table_heading_taxed_sales'), + $lC_Language->get('statistics_sales_tax_table_heading_taxes_collected'), + $lC_Language->get('statistics_sales_tax_table_heading_shipping_handling'), + $lC_Language->get('statistics_sales_tax_table_heading_tax_shipping'), + $lC_Language->get('statistics_sales_tax_table_heading_gift_vouchers') + ); + } + + protected function _setData() { + global $lC_Database, $lC_Language, $lC_Currencies; + $this->_data = array(); + $this->_resultset = $lC_Database->query('select o.orders_id, ot.value, op.products_price, op.products_price, MONTHNAME(o.date_purchased) as month from :table_orders o, :table_orders_products op, :table_orders_total ot where o.orders_id = op.orders_id and op.orders_id = ot.orders_id and ot.class = :class '); + + if (isset($_GET['statusID'])) { + + switch($_GET['statusID']) { + + case 'Pending': + case 'Approved': + case 'Rejected': + $query = $lC_Database->query('select orders_status_id, orders_status_name from :table_orders_status where orders_status_type = "'.$_GET['statusID'].'"' ); + $query->bindTable(':table_orders_status', TABLE_ORDERS_STATUS); + $query->bindInt(':language_id', $lC_Language->getID()); + $query->execute(); + + $ids = ''; + while($query->next()) { + $ids .= $query->value('orders_status_id').","; + } + $ids = substr($ids, 0, -1); + $this->_resultset->appendQuery(' and o.orders_status IN ( :orders_status )'); + $this->_resultset->bindValue(':orders_status', $ids); + + break; + + default: + if((int)$_GET['statusID'] > 0) { + $this->_resultset->appendQuery(' and o.orders_status = :orders_status '); + $this->_resultset->bindInt(':orders_status', $_GET['statusID']); + } + } + } + + $this->_resultset->appendQuery('order by o.date_purchased Desc'); + $this->_resultset->bindTable(':table_orders', TABLE_ORDERS); + $this->_resultset->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); + $this->_resultset->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + $this->_resultset->bindValue(':class', 'total'); + $this->_resultset->execute(); + + while($this->_resultset->next()) { + // get order tax,shipping and coupon + $orderTotal = $lC_Database->query('select o.orders_id ,ot.* from :table_orders o, :table_orders_total ot where ot.orders_id = o.orders_id and o.orders_id = :orders_id'); + $orderTotal->bindTable(':table_orders', TABLE_ORDERS); + $orderTotal->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + $orderTotal->bindInt(':orders_id', $this->_resultset->value('orders_id')); + $orderTotal->execute(); + + $tax = 0; + $shipping = 0; + $coupon = 0; + $taxed_sale = 0; + $non_taxed_sale = $this->_resultset->valueInt('products_price'); + + while($orderTotal->next()) { + if($orderTotal->value('class') == "tax") { + $taxed_sale = $this->_resultset->valueInt('products_price'); + $non_taxed_sale = 0; + $tax = $orderTotal->value('value'); + } elseif($orderTotal->value('class') == "shipping") { + $shipping = $orderTotal->value('value'); + } elseif($orderTotal->value('class') == "coupon") { + $coupon = $orderTotal->value('value'); + } + } + + $this->_data[] = array($this->_resultset->value('month'), + '-', + $lC_Currencies->format($this->_resultset->valueInt('value')), + $lC_Currencies->format($this->_resultset->valueInt('products_price')), + $lC_Currencies->format($non_taxed_sale), + $lC_Currencies->format($taxed_sale), + $lC_Currencies->format($tax), + $lC_Currencies->format($shipping), + $lC_Currencies->format($this->_resultset->valueInt('-')), + $lC_Currencies->format($coupon) + ); + } + } +} +?> \ No newline at end of file diff --git a/catalog/admin/templates/default/css/style.css b/catalog/admin/templates/default/css/style.css index 5e1478965..e39b73e5a 100644 --- a/catalog/admin/templates/default/css/style.css +++ b/catalog/admin/templates/default/css/style.css @@ -4759,3 +4759,32 @@ a:link { .padding{ padding-bottom:25px;padding-top:8px;} /*order_total page*/ +/*inventory_cost_margin reports page*/ +.back-color { + background-color:#FFCC99; + height:30px; + padding-left:30px; + padding-top:18px; + padding-bottom:18px; + } +.padding-align { padding-right:10px; } +.glyphicon { + position: relative; + top: 1px; + display: inline-block; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} +.glyphicon-exclamation-sign:before { + content: "\e101"; +} +@font-face { + font-family: 'Glyphicons Halflings'; + src: url('../../../../ext/bootstrap/fonts/glyphicons-halflings-regular.eot'); + src: url('../../../../ext/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../../../ext/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../../../ext/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../../../ext/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg'); +} +/*inventory_cost_margin reports page*/ From 7d320c172fedf6244b6db27cc7b1587a3547c898 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Mon, 28 Apr 2014 16:15:51 -0400 Subject: [PATCH 002/168] adjusted css for mobile reports datatable heading layout --- catalog/admin/templates/default/css/orders.css | 10 +++++----- catalog/admin/templates/default/css/styles/custom.css | 6 ++++++ catalog/includes/modules/order_total/tax.php | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/catalog/admin/templates/default/css/orders.css b/catalog/admin/templates/default/css/orders.css index 6501efbb2..96fa3a8b3 100644 --- a/catalog/admin/templates/default/css/orders.css +++ b/catalog/admin/templates/default/css/orders.css @@ -19,8 +19,8 @@ .field-block-address { position: relative; left: 0; } .field-block-address-offset { margin-left: 0; } #section_orders_customer_content { margin: 0 -7px 0 -20px; } - .dataTables_filter { float: none; text-align: left; } - .dataTables_filter input { margin-top: 40px; } + .dataTables_filter { width: 100%; } + .dataTables_filter input { max-width: 200px; } #statusSelectorContainer { position:absolute; top:92px; left:15px; z-index:2; } } @@ -29,7 +29,7 @@ .field-block-address-offset { margin-left: 0; } #section_orders_customer_content { margin: 0 -10px 0 -20px; } .orders-print-packing-slip-button-text { display: none; } - .dataTables_filter { float: none; text-align: left; } - .dataTables_filter input { margin-top: 40px; } + .dataTables_filter { width: 100%; } + .dataTables_filter input { max-width: 200px; } #statusSelectorContainer { position:absolute; top:88px; left:15px; z-index:2; } -} +} \ No newline at end of file diff --git a/catalog/admin/templates/default/css/styles/custom.css b/catalog/admin/templates/default/css/styles/custom.css index dfad6b192..396be1476 100644 --- a/catalog/admin/templates/default/css/styles/custom.css +++ b/catalog/admin/templates/default/css/styles/custom.css @@ -915,6 +915,12 @@ select.error { border: 2px solid red !important; } word-break: break-all; } +div.DTTT_container { + margin-right: 0.5em; + margin-top: 0.8em; + margin-bottom: 0 !important; +} + /* needed for custom media query settings */ @media screen and (min-width: 1200px) { #menu header .headerInner { diff --git a/catalog/includes/modules/order_total/tax.php b/catalog/includes/modules/order_total/tax.php index e0990fda8..cc482def7 100644 --- a/catalog/includes/modules/order_total/tax.php +++ b/catalog/includes/modules/order_total/tax.php @@ -29,7 +29,7 @@ function lC_OrderTotal_tax() { function process() { global $lC_ShoppingCart, $lC_Currencies; - if (DISPLAY_PRICE_WITH_TAX == '1') return; + //if (DISPLAY_PRICE_WITH_TAX == '1') return; foreach ($lC_ShoppingCart->getTaxGroups() as $key => $value) { if ($value > 0) { From d58562d1325840eb8a1f769eb2789e666e3ac9a4 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Thu, 22 May 2014 15:51:58 -0400 Subject: [PATCH 003/168] fix for add payment address when skip shipping enabled --- catalog/includes/content/checkout/payment.php | 9 +++++++++ .../content/checkout/payment_address.php | 8 ++++---- catalog/includes/content/checkout/shipping.php | 4 ++-- .../content/checkout/checkout_confirmation.php | 6 +++++- .../core/content/checkout/checkout_payment.php | 6 +++++- .../checkout/checkout_payment_address.php | 18 +++++++++++------- .../javascript/checkout/payment_address.js.php | 11 +++++++---- 7 files changed, 43 insertions(+), 19 deletions(-) diff --git a/catalog/includes/content/checkout/payment.php b/catalog/includes/content/checkout/payment.php index a17ddff31..f2c68a7ce 100644 --- a/catalog/includes/content/checkout/payment.php +++ b/catalog/includes/content/checkout/payment.php @@ -35,9 +35,18 @@ public function lC_Checkout_Payment() { // if no shipping method has been selected, redirect the customer to the shipping method selection page if ($lC_ShoppingCart->hasShippingMethod() === false ) { if (defined('SKIP_CHECKOUT_SHIPPING_PAGE') && SKIP_CHECKOUT_SHIPPING_PAGE == '1') { + if (lC_AddressBook::numberOfEntries() < 1) { + lc_redirect(lc_href_link(FILENAME_CHECKOUT, 'payment_address', 'SSL')); + } } else { lc_redirect(lc_href_link(FILENAME_CHECKOUT, 'shipping', 'SSL')); } + } else { + if (defined('SKIP_CHECKOUT_SHIPPING_PAGE') && SKIP_CHECKOUT_SHIPPING_PAGE == '1') { + if (lC_AddressBook::numberOfEntries() < 1) { + lc_redirect(lc_href_link(FILENAME_CHECKOUT, 'payment_address', 'SSL')); + } + } } // Stock Check diff --git a/catalog/includes/content/checkout/payment_address.php b/catalog/includes/content/checkout/payment_address.php index 6bddae879..b01f891e3 100644 --- a/catalog/includes/content/checkout/payment_address.php +++ b/catalog/includes/content/checkout/payment_address.php @@ -128,7 +128,7 @@ protected function _process() { $Qzone = $lC_Database->query('select zone_id from :table_zones where zone_country_id = :zone_country_id and zone_code like :zone_code'); $Qzone->bindTable(':table_zones', TABLE_ZONES); $Qzone->bindInt(':zone_country_id', $_POST['country']); - $Qzone->bindValue(':zone_code', preg_replace('/[^A-Z\s]/', '', $_POST['state'])); + $Qzone->bindValue(':zone_code', preg_replace('/[^A-Za-z\s]/', '', $_POST['state'])); $Qzone->execute(); if ($Qzone->numberOfRows() === 1) { @@ -137,7 +137,7 @@ protected function _process() { $Qzone = $lC_Database->query('select zone_id from :table_zones where zone_country_id = :zone_country_id and zone_name like :zone_name'); $Qzone->bindTable(':table_zones', TABLE_ZONES); $Qzone->bindInt(':zone_country_id', $_POST['country']); - $Qzone->bindValue(':zone_name', preg_replace('/[^A-Z\s]/', '', $_POST['state']) . '%'); + $Qzone->bindValue(':zone_name', preg_replace('/[^A-Za-z\s]/', '', $_POST['state']) . '%'); $Qzone->execute(); if ($Qzone->numberOfRows() === 1) { @@ -154,7 +154,7 @@ protected function _process() { } } } - + if ( (is_numeric($_POST['country']) === false) || ($_POST['country'] < 1) ) { $lC_MessageStack->add('checkout_address', $lC_Language->get('field_customer_country_error')); } @@ -170,7 +170,7 @@ protected function _process() { $lC_MessageStack->add('checkout_address', sprintf($lC_Language->get('field_customer_fax_number_error'), ACCOUNT_FAX)); } } - + if ($lC_MessageStack->size('checkout_address') === 0) { $Qab = $lC_Database->query('insert into :table_address_book (customers_id, entry_gender, entry_company, entry_firstname, entry_lastname, entry_street_address, entry_suburb, entry_postcode, entry_city, entry_state, entry_country_id, entry_zone_id, entry_telephone, entry_fax) values (:customers_id, :entry_gender, :entry_company, :entry_firstname, :entry_lastname, :entry_street_address, :entry_suburb, :entry_postcode, :entry_city, :entry_state, :entry_country_id, :entry_zone_id, :entry_telephone, :entry_fax)'); $Qab->bindTable(':table_address_book', TABLE_ADDRESS_BOOK); diff --git a/catalog/includes/content/checkout/shipping.php b/catalog/includes/content/checkout/shipping.php index d8630f785..8e2b86f0e 100644 --- a/catalog/includes/content/checkout/shipping.php +++ b/catalog/includes/content/checkout/shipping.php @@ -45,9 +45,9 @@ public function lC_Checkout_Shipping() { } if ($lC_Customer->hasDefaultAddress() === false) { - if(isset($_GET['account_created'])){ + if (isset($_GET['account_created'])) { lc_redirect(lc_href_link(FILENAME_CHECKOUT, 'shipping_address&account_created=true', 'SSL')); - }else{ + } else { lc_redirect(lc_href_link(FILENAME_CHECKOUT, 'shipping_address', 'SSL')); } } else { diff --git a/catalog/templates/core/content/checkout/checkout_confirmation.php b/catalog/templates/core/content/checkout/checkout_confirmation.php index 70b2335c4..70084e1c4 100644 --- a/catalog/templates/core/content/checkout/checkout_confirmation.php +++ b/catalog/templates/core/content/checkout/checkout_confirmation.php @@ -26,11 +26,13 @@ } ?>
+

get('box_ordering_steps_delivery'); ?>

+

get('box_ordering_steps_payment'); ?>

@@ -44,6 +46,7 @@
+

get('ship_to_address'); ?>

@@ -59,7 +62,8 @@
-
+
+

get('bill_to_address'); ?>

diff --git a/catalog/templates/core/content/checkout/checkout_payment.php b/catalog/templates/core/content/checkout/checkout_payment.php index 27ed8e668..f766c7919 100644 --- a/catalog/templates/core/content/checkout/checkout_payment.php +++ b/catalog/templates/core/content/checkout/checkout_payment.php @@ -27,11 +27,13 @@ ?>
+

get('box_ordering_steps_delivery'); ?>

+

get('box_ordering_steps_payment'); ?>

@@ -39,6 +41,7 @@
+

get('ship_to_address'); ?>

@@ -54,7 +57,8 @@
-
+
+
getOrderTotals() as $module) { diff --git a/catalog/templates/core/content/checkout/checkout_payment_address.php b/catalog/templates/core/content/checkout/checkout_payment_address.php index a2f238a16..8c1f02f45 100644 --- a/catalog/templates/core/content/checkout/checkout_payment_address.php +++ b/catalog/templates/core/content/checkout/checkout_payment_address.php @@ -17,11 +17,13 @@ if ( $lC_MessageStack->size('checkout_payment_address') > 0 ) echo '
' . $lC_MessageStack->get('checkout_payment_address') . '
' . "\n"; ?>
+

get('box_ordering_steps_delivery'); ?>

+

get('box_ordering_steps_payment'); ?>

@@ -29,12 +31,14 @@
+

get('ship_to_address'); ?>

getShippingAddress(), '
'); ?>
+
getOrderTotals() as $module) { @@ -52,8 +56,8 @@
hasDefaultAddress()) { + if (isset($_GET['payment_address']) && ($_GET['payment_address'] != 'process')) { + if ($lC_Customer->hasDefaultAddress()) { ?>

get('billing_address_title'); ?>

@@ -63,8 +67,8 @@
get('selected_billing_destination'); ?>
1) { + } + if (lC_AddressBook::numberOfEntries() > 1) { ?>

get('address_book_entries_title'); ?>

@@ -90,12 +94,12 @@ ?>
'; } - } + } return $string; } diff --git a/catalog/includes/work/updates/runAfter/controller.php b/catalog/includes/work/updates/runAfter/controller.php index 0b1790ce4..966bd6bd0 100644 --- a/catalog/includes/work/updates/runAfter/controller.php +++ b/catalog/includes/work/updates/runAfter/controller.php @@ -336,6 +336,19 @@ public static function updateDB() { $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "orders_products` ADD COLUMN `products_sku` VARCHAR(255) DEFAULT NULL AFTER `products_model`"); parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "orders_products` ADD COLUMN `products_sku` VARCHAR(255) DEFAULT NULL AFTER `products_model`"); + + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "configuration_group` (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES (22, 'File Uploads', 'File Upload Settings', 13, 1)"); + parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "configuration_group` (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES (22, 'File Uploads', 'File Upload Settings', 13, 1)"); + + if (!defined('PRODUCT_MODULES_FILE_UPLOAD_TYPES')) { + $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Allowed File Types', 'PRODUCT_MODULES_FILE_UPLOAD_TYPES', '.zip,.pdf,.png,.gif,.jpg,.tiff,.gzip,.gz', 'Enter the allowed file upload extensions in a comma delimited format.', 22, 0, now(), now(), NULL, NULL);"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Allowed File Types', 'PRODUCT_MODULES_FILE_UPLOAD_TYPES', '.zip,.pdf,.png,.gif,.jpg,.tiff,.gzip,.gz', 'Enter the allowed file upload extensions in a comma delimited format.', 22, 0, now(), now(), NULL, NULL);"); + } + + if (!defined('PRODUCT_MODULES_FILE_UPLOAD_MAX_SIZE')) { + $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Maximum Upload File Size', 'PRODUCT_MODULES_FILE_UPLOAD_MAX_SIZE', '10', 'Enter the maximum size allowed for file uploads.', 22, 0, now(), now(), NULL, NULL);"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Maximum Upload File Size', 'PRODUCT_MODULES_FILE_UPLOAD_MAX_SIZE', '10', 'Enter the maximum size (in MB) allowed for file uploads.', 22, 0, now(), now(), NULL, NULL);"); + } } } diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql index 5384957eb..8de3bd08f 100644 --- a/catalog/install/loadedcommerce.sql +++ b/catalog/install/loadedcommerce.sql @@ -1192,6 +1192,8 @@ INSERT INTO lc_configuration (configuration_id, configuration_title, configurati INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(180, 'Session Lifetime', 'SESSION_LIFETIME', 3600, 'The amount of time a user is logged in for after the last action.', 10, 0, now(), now(), NULL, NULL); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(181, 'Force Cookie Use', 'SESSION_FORCE_COOKIES', -1, 'Force the use cookies to handle sessions.', 10, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(182, 'Maximum New Products Per Page', 'NEW_PRODUCTS_PER_PAGE_DISPLAY', '9', 'Maximum number of new products to display in listing', 3, 20, now(), now(), NULL, NULL); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(183, 'Allowed File Types', 'PRODUCT_MODULES_FILE_UPLOAD_TYPES', '.zip,.pdf,.png,.gif,.jpg,.tiff,.gzip,.gz', 'Enter the allowed file upload extensions in a comma delimited format.', 22, 0, now(), now(), NULL, NULL); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(184, 'Maximum Upload File Size', 'PRODUCT_MODULES_FILE_UPLOAD_MAX_SIZE', '10', 'Enter the maximum size (in MB) allowed for file uploads.', 22, 1, now(), now(), NULL, NULL); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(1, 'My Store', 'General information about my store', 1, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(2, 'Minimum Values', 'The minimum values for functions / data', 2, 1); @@ -1211,6 +1213,7 @@ INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_ INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(19, 'Checkout', 'Checkout settings', 19, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(20, 'Editor', 'Editor settings', 20, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(21, 'cURL Proxy', 'cURL proxy configuration setttings.', 21, 1); +INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(22, 'File Uploads', 'File upload setttings.', 22, 1); INSERT INTO lc_countries VALUES (1,'Afghanistan','AF','AFG',''); diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql index 60c6748bd..0f21e0f8e 100644 --- a/catalog/install/loadedcommerce_innodb.sql +++ b/catalog/install/loadedcommerce_innodb.sql @@ -1192,6 +1192,8 @@ INSERT INTO lc_configuration (configuration_id, configuration_title, configurati INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(180, 'Session Lifetime', 'SESSION_LIFETIME', 3600, 'The amount of time a user is logged in for after the last action.', 10, 0, now(), now(), NULL, NULL); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(181, 'Force Cookie Use', 'SESSION_FORCE_COOKIES', -1, 'Force the use cookies to handle sessions.', 10, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(182, 'Maximum New Products Per Page', 'NEW_PRODUCTS_PER_PAGE_DISPLAY', '9', 'Maximum number of new products to display in listing', 3, 20, now(), now(), NULL, NULL); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(183, 'Allowed File Types', 'PRODUCT_MODULES_FILE_UPLOAD_TYPES', '.zip,.pdf,.png,.gif,.jpg,.tiff,.gzip,.gz', 'Enter the allowed file upload extensions in a comma delimited format.', 22, 0, now(), now(), NULL, NULL); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(184, 'Maximum Upload File Size', 'PRODUCT_MODULES_FILE_UPLOAD_MAX_SIZE', '10', 'Enter the maximum size (in MB) allowed for file uploads.', 22, 1, now(), now(), NULL, NULL); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(1, 'My Store', 'General information about my store', 1, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(2, 'Minimum Values', 'The minimum values for functions / data', 2, 1); @@ -1211,6 +1213,7 @@ INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_ INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(19, 'Checkout', 'Checkout settings', 19, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(20, 'Editor', 'Editor settings', 20, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(21, 'cURL Proxy', 'cURL proxy configuration setttings.', 21, 1); +INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(22, 'File Uploads', 'File upload setttings.', 22, 1); INSERT INTO lc_countries VALUES (1,'Afghanistan','AF','AFG',''); diff --git a/catalog/templates/core.php b/catalog/templates/core.php index 20b1afb23..6ce51824c 100644 --- a/catalog/templates/core.php +++ b/catalog/templates/core.php @@ -255,6 +255,7 @@ + isInStock($products['item_id']) === false) ) { echo '' . STOCK_MARK_PRODUCT_OUT_OF_STOCK . '' . "\n"; - } - if ( $lC_ShoppingCart->isVariant($products['item_id']) ) { + } + if ( $lC_ShoppingCart->isVariant($products['item_id']) ) { foreach ( $lC_ShoppingCart->getVariant($products['item_id']) as $variant) { echo '
- ' . $variant['group_title'] . ': ' . $variant['value_title'] . '
' . "\n"; } diff --git a/catalog/templates/core/content/products/info.php b/catalog/templates/core/content/products/info.php index 99616ff7d..b2ea7af83 100644 --- a/catalog/templates/core/content/products/info.php +++ b/catalog/templates/core/content/products/info.php @@ -47,7 +47,7 @@ hasSubProducts($lC_Product->getID()) === false) { ?> - + diff --git a/catalog/templates/core/css/template.css b/catalog/templates/core/css/template.css index 025b1afe0..46adfbfa5 100644 --- a/catalog/templates/core/css/template.css +++ b/catalog/templates/core/css/template.css @@ -706,7 +706,7 @@ #loaded7 .pr_gallery li:hover { border:1px solid #f0ad4e; -} +} /********************************************************/ /* 7. Error classes */ From 440ac639a56e5f24a3497dd4cda9484cad662bd6 Mon Sep 17 00:00:00 2001 From: datazen Date: Sat, 14 Jun 2014 01:40:24 -0400 Subject: [PATCH 017/168] file upload --- .../includes/modules/variants/file_upload.php | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 catalog/includes/modules/variants/file_upload.php diff --git a/catalog/includes/modules/variants/file_upload.php b/catalog/includes/modules/variants/file_upload.php new file mode 100644 index 000000000..82a874a88 --- /dev/null +++ b/catalog/includes/modules/variants/file_upload.php @@ -0,0 +1,85 @@ + $val) { + if (isset($val['group_title']) && empty($val['group_title']) === false) { + $group_title = $val['group_title']; + break; + } + } + + $string = '
' . + ' ' . + ' ' . + ' ' . + ' ' . + ' ' . + '
'; + + reset($data); + $cnt = 0; + foreach($data as $key => $val) { + $price_ind = ((float)$val['price_modifier'] < 0.00) ? '-' : '+'; + $price_formatted = ((float)$val['price_modifier'] != 0.00) ? $price_ind . $lC_Currencies->format(number_format($val['price_modifier'], DECIMAL_PLACES), $lC_Currencies->getCode()) : null; + $options[$val['value_id']] = $val['price_modifier']; + $group_id = $val['group_id']; + $group_title = $val['group_title']; + + $string .= '
' . + ' ' . + '
'; + $cnt++; + } + + $string .= '
' . + '
'; + + } else { + + $string = ''; + $i = 0; + foreach ( $data['data'] as $field ) { + $i++; + $string .= '
+ + +
'; + } + } + + return $string; + } + + static public function allowsMultipleValues() { + return self::ALLOW_MULTIPLE_VALUES; + } + + static public function hasCustomValue() { + return self::HAS_CUSTOM_VALUE; + } +} +?> \ No newline at end of file From f1bc3cae71aca9e0d8bafdf211b8a5e2bc3566ba Mon Sep 17 00:00:00 2001 From: gulsarrays Date: Wed, 18 Jun 2014 16:48:45 +0530 Subject: [PATCH 018/168] D1545 Reports Phase 1 --- .../statistics/js/statistics.js.php | 120 +++--- .../applications/statistics/pages/main.php | 2 +- .../modules/statistics/sales_tax_report.php | 2 + .../modules/statistics/customer_orders.php | 4 +- .../statistics/inventory_cost_margin.php | 10 +- .../statistics/margin_report_sales.php | 4 +- .../modules/statistics/sales_report.php | 4 +- .../modules/statistics/sales_tax_report.php | 378 ++++++++++++++---- 8 files changed, 400 insertions(+), 124 deletions(-) diff --git a/catalog/admin/includes/applications/statistics/js/statistics.js.php b/catalog/admin/includes/applications/statistics/js/statistics.js.php index d1be22f78..aeeec9b97 100644 --- a/catalog/admin/includes/applications/statistics/js/statistics.js.php +++ b/catalog/admin/includes/applications/statistics/js/statistics.js.php @@ -10,15 +10,29 @@ */ global $lC_Template, $lC_Language, $modulesArr, $accessArr, $cols; if (!empty($_GET['module'])) { // module listing +$SrNoCol_Visible = ''; +$Sorting = "[1,'desc']"; + +if($_GET['module'] == 'sales_tax_report') { + $SrNoCol_Visible = ', "bVisible": false'; + + if(isset($_GET['month'])) { + $Sorting = "[0,'asc']"; + } else { + $Sorting = "[2,'desc']"; + } +} + ?> - @@ -191,6 +220,7 @@ function (data) { var paginationType = ($.template.mediaQuery.isSmallerThan('tablet-portrait')) ? 'two_button' : 'full_numbers'; var dataTableDataURL = 'getModule() . '=' . $_GET[$lC_Template->getModule()] . '&action=getAll&media=MEDIA'); ?>'; oTable = $('#dataTable').dataTable({ + "sDom": 'frt', "bProcessing": true, "sAjaxSource": dataTableDataURL.replace('MEDIA', $.template.mediaQuery.name), "sPaginationType": paginationType, diff --git a/catalog/admin/includes/applications/statistics/pages/main.php b/catalog/admin/includes/applications/statistics/pages/main.php index cc1fafe1b..12e0e6ec9 100644 --- a/catalog/admin/includes/applications/statistics/pages/main.php +++ b/catalog/admin/includes/applications/statistics/pages/main.php @@ -264,7 +264,7 @@ function get_dropdown_list_array($type) { -   +   diff --git a/catalog/admin/includes/languages/en_US/modules/statistics/sales_tax_report.php b/catalog/admin/includes/languages/en_US/modules/statistics/sales_tax_report.php index f30ee67b3..7e68a0a48 100644 --- a/catalog/admin/includes/languages/en_US/modules/statistics/sales_tax_report.php +++ b/catalog/admin/includes/languages/en_US/modules/statistics/sales_tax_report.php @@ -7,7 +7,9 @@ statistics_sales_tax_report_title = Sales Tax Report +statistics_sales_tax_table_heading_srno = SrNo statistics_sales_tax_table_heading_month = Month +statistics_sales_tax_table_heading_year = Year statistics_sales_tax_table_heading_day = Day statistics_sales_tax_table_heading_gross_income= Gross Income statistics_sales_tax_table_heading_product_sales = Product Sales diff --git a/catalog/admin/includes/modules/statistics/customer_orders.php b/catalog/admin/includes/modules/statistics/customer_orders.php index 932d5e9ea..3bfe55b13 100644 --- a/catalog/admin/includes/modules/statistics/customer_orders.php +++ b/catalog/admin/includes/modules/statistics/customer_orders.php @@ -79,8 +79,8 @@ protected function _setData() { $ids .= $query->value('orders_status_id').","; } $ids = substr($ids, 0, -1); - $this->_resultset->appendQuery(' and o.orders_status IN ( :orders_status )'); - $this->_resultset->bindValue(':orders_status', $ids); + $this->_resultset->appendQuery(' and o.orders_status IN ('. $ids .')'); + //$this->_resultset->bindValue(':orders_status', $ids); break; diff --git a/catalog/admin/includes/modules/statistics/inventory_cost_margin.php b/catalog/admin/includes/modules/statistics/inventory_cost_margin.php index 46287353d..f20d7b181 100644 --- a/catalog/admin/includes/modules/statistics/inventory_cost_margin.php +++ b/catalog/admin/includes/modules/statistics/inventory_cost_margin.php @@ -97,10 +97,16 @@ protected function _setData() { } + + while($breakout_qry->next()) { if($breakoutType == 'product_sku'){ - - $breakout = $breakout_qry->value('sku'); + if($breakout_qry->value('sku') == NULL) { + $product_sku = $breakout_qry->value('id'); + }else { + $product_sku = $breakout_qry->value('sku'); + } + $breakout = $product_sku; $numOfProduct = $breakout_qry->value('-'); $qohTotal = $breakout_qry->value('qohTotal'); $costTotal = $breakout_qry->value('costTotal'); diff --git a/catalog/admin/includes/modules/statistics/margin_report_sales.php b/catalog/admin/includes/modules/statistics/margin_report_sales.php index af9cd3a41..cf9b5a348 100644 --- a/catalog/admin/includes/modules/statistics/margin_report_sales.php +++ b/catalog/admin/includes/modules/statistics/margin_report_sales.php @@ -84,13 +84,13 @@ protected function _setData() { } $ids = substr($ids, 0, -1); - $this->_resultset->appendQuery(' and o.orders_status IN ( :orders_status )'); $this->_resultset->bindValue(':orders_status', $ids); + $this->_resultset->appendQuery(' and o.orders_status IN ('. $ids .')'); //$this->_resultset->bindValue(':orders_status', $ids); break; default: if((int)$_GET['statusID'] > 0) { - $this->_resultset->appendQuery(' and o.orders_status IN ( :orders_status )'); $this->_resultset->bindValue(':orders_status', $ids); + $this->_resultset->appendQuery(' and o.orders_status = :orders_status '); $this->_resultset->bindInt(':orders_status', $_GET['statusID']); } } } diff --git a/catalog/admin/includes/modules/statistics/sales_report.php b/catalog/admin/includes/modules/statistics/sales_report.php index 8be2e12df..a164f9065 100644 --- a/catalog/admin/includes/modules/statistics/sales_report.php +++ b/catalog/admin/includes/modules/statistics/sales_report.php @@ -81,8 +81,8 @@ protected function _setData() { $ids .= $query->value('orders_status_id').","; } $ids = substr($ids, 0, -1); - $orderDate_qry->appendQuery(' and o.orders_status IN ( :orders_status )'); - $orderDate_qry->bindValue(':orders_status', $ids); + $orderDate_qry->appendQuery(' and o.orders_status IN ('. $ids .')'); + //$orderDate_qry->bindValue(':orders_status', $ids); break; diff --git a/catalog/admin/includes/modules/statistics/sales_tax_report.php b/catalog/admin/includes/modules/statistics/sales_tax_report.php index 2ad5622d7..d72e678e4 100644 --- a/catalog/admin/includes/modules/statistics/sales_tax_report.php +++ b/catalog/admin/includes/modules/statistics/sales_tax_report.php @@ -46,8 +46,9 @@ protected function _setTitle() { protected function _setHeader() { global $lC_Language; - $this->_header = array($lC_Language->get('statistics_sales_tax_table_heading_month'), - $lC_Language->get('statistics_sales_tax_table_heading_day'), + $this->_header = array($lC_Language->get('statistics_sales_tax_table_heading_srno'), + $lC_Language->get('statistics_sales_tax_table_heading_month'), + $lC_Language->get('statistics_sales_tax_table_heading_year'), $lC_Language->get('statistics_sales_tax_table_heading_gross_income'), $lC_Language->get('statistics_sales_tax_table_heading_product_sales'), $lC_Language->get('statistics_sales_tax_table_heading_non_taxed_sales'), @@ -62,83 +63,320 @@ protected function _setHeader() { protected function _setData() { global $lC_Database, $lC_Language, $lC_Currencies; $this->_data = array(); - $this->_resultset = $lC_Database->query('select o.orders_id, ot.value, op.products_price, op.products_price, MONTHNAME(o.date_purchased) as month from :table_orders o, :table_orders_products op, :table_orders_total ot where o.orders_id = op.orders_id and op.orders_id = ot.orders_id and ot.class = :class '); + $sel_month = isset($_GET['month']) ? $_GET['month']: '0'; + // clear footer totals + $footer_gross = 0; + $footer_sales = 0; + $footer_sales_nontaxed = 0; + $footer_sales_taxed = 0; + $footer_tax_coll = 0; + $footer_shiphndl = 0; + $footer_shipping_tax = 0; + $footer_loworder = 0; + $footer_other = 0; + + // create extra column so totals are comprehensively correct + $class_val_subtotal = 'sub_total'; + $class_val_tax = 'tax'; + $class_val_shiphndl = 'shipping'; + $class_val_loworder = 'low_order_fee'; + $class_val_total = 'total'; + + /**************** check for extra class ***************/ + $extra_class_query_raw = $lC_Database->query('select value from :table_orders_total ot where ot.class<>:class and ot.class<>:class and ot.class<>:class and ot.class<>:class and ot.class<>:class '); + + $extra_class_query_raw->bindValue(':class', $class_val_subtotal); + $extra_class_query_raw->bindValue(':class', $class_val_tax); + $extra_class_query_raw->bindValue(':class', $class_val_shiphndl); + $extra_class_query_raw->bindValue(':class', $class_val_loworder); + $extra_class_query_raw->bindValue(':class', $class_val_total); + $extra_class_query_raw->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + $extra_class_query_raw->execute(); + + $extra_class = false; + + if ($extra_class_query_raw->numberOfRows() > 0) { + $extra_class_query = $extra_class_query_raw->toArray(); + $extra_class = true; + } + /*******************************/ + + $this->_resultset = $lC_Database->query('select sum(ot.value) as gross_sales, MONTHNAME(o.date_purchased) as row_month, YEAR(o.date_purchased) as row_year, MONTH(o.date_purchased) as i_month, DAYOFMONTH(o.date_purchased) row_day from :table_orders o left join :table_orders_total ot on (o.orders_id = ot.orders_id) where ot.class = :class'); + + $orders_status_ids = ''; if (isset($_GET['statusID'])) { - - switch($_GET['statusID']) { - - case 'Pending': - case 'Approved': - case 'Rejected': - $query = $lC_Database->query('select orders_status_id, orders_status_name from :table_orders_status where orders_status_type = "'.$_GET['statusID'].'"' ); - $query->bindTable(':table_orders_status', TABLE_ORDERS_STATUS); - $query->bindInt(':language_id', $lC_Language->getID()); - $query->execute(); - - $ids = ''; - while($query->next()) { - $ids .= $query->value('orders_status_id').","; - } - $ids = substr($ids, 0, -1); - $this->_resultset->appendQuery(' and o.orders_status IN ( :orders_status )'); - $this->_resultset->bindValue(':orders_status', $ids); - - break; - - default: - if((int)$_GET['statusID'] > 0) { - $this->_resultset->appendQuery(' and o.orders_status = :orders_status '); - $this->_resultset->bindInt(':orders_status', $_GET['statusID']); + switch($_GET['statusID']) { + case 'Pending': + case 'Approved': + case 'Rejected': + $query = $lC_Database->query('select orders_status_id, orders_status_name from :table_orders_status where orders_status_type = "'.$_GET['statusID'].'"' ); + $query->bindTable(':table_orders_status', TABLE_ORDERS_STATUS); + $query->bindInt(':language_id', $lC_Language->getID()); + $query->execute(); + + while($query->next()) { + $orders_status_ids .= $query->value('orders_status_id').","; + } + $orders_status_ids = substr($orders_status_ids, 0, -1); + $this->_resultset->appendQuery(' and o.orders_status IN ('. $orders_status_ids .')'); + break; + default: + if((int)$_GET['statusID'] > 0) { + $orders_status_ids = $_GET['statusID']; + $this->_resultset->appendQuery(' and o.orders_status = :orders_status '); + $this->_resultset->bindInt(':orders_status', $_GET['statusID']); } } } - $this->_resultset->appendQuery('order by o.date_purchased Desc'); - $this->_resultset->bindTable(':table_orders', TABLE_ORDERS); - $this->_resultset->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); - $this->_resultset->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); - $this->_resultset->bindValue(':class', 'total'); - $this->_resultset->execute(); - - while($this->_resultset->next()) { - // get order tax,shipping and coupon - $orderTotal = $lC_Database->query('select o.orders_id ,ot.* from :table_orders o, :table_orders_total ot where ot.orders_id = o.orders_id and o.orders_id = :orders_id'); - $orderTotal->bindTable(':table_orders', TABLE_ORDERS); - $orderTotal->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); - $orderTotal->bindInt(':orders_id', $this->_resultset->value('orders_id')); - $orderTotal->execute(); + if ($sel_month <> 0) { + $this->_resultset->appendQuery(' and month(o.date_purchased) = :month_purchased '); + $this->_resultset->bindInt(':month_purchased', $sel_month); + } + + $this->_resultset->appendQuery('group by YEAR(o.date_purchased), MONTH(o.date_purchased)'); + if ($sel_month <> 0) { + $this->_resultset->appendQuery(', DAYOFMONTH(o.date_purchased)'); + } - $tax = 0; - $shipping = 0; - $coupon = 0; - $taxed_sale = 0; - $non_taxed_sale = $this->_resultset->valueInt('products_price'); - - while($orderTotal->next()) { - if($orderTotal->value('class') == "tax") { - $taxed_sale = $this->_resultset->valueInt('products_price'); - $non_taxed_sale = 0; - $tax = $orderTotal->value('value'); - } elseif($orderTotal->value('class') == "shipping") { - $shipping = $orderTotal->value('value'); - } elseif($orderTotal->value('class') == "coupon") { - $coupon = $orderTotal->value('value'); + $this->_resultset->appendQuery('order by o.date_purchased Desc'); + $this->_resultset->bindTable(':table_orders', TABLE_ORDERS); + $this->_resultset->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + $this->_resultset->bindValue(':class', $class_val_total); + $this->_resultset->execute(); + + $num_rows = $this->_resultset->numberOfRows(); + $srno = 0; + while($this->_resultset->next()) { + $row_month = $this->_resultset->value('row_month'); + $month = $this->_resultset->value('i_month'); + $year = $this->_resultset->value('row_year'); + $day = $this->_resultset->value('row_day'); + $gross_sales = $this->_resultset->value('gross_sales'); + + if ($sel_month==0){ + $content = $year; + $year_txt = $lC_Language->get('statistics_sales_tax_table_heading_year'); + } else { + $content = $day; + $head_year = $lC_Language->get('statistics_sales_tax_table_heading_year'); + $head_day = $lC_Language->get('statistics_sales_tax_table_heading_day'); + $this->_header = str_replace($head_year,$head_day,$this->_header ); + $year_txt = $row_month; } - } + + $rows++; + $srno++; - $this->_data[] = array($this->_resultset->value('month'), - '-', - $lC_Currencies->format($this->_resultset->valueInt('value')), - $lC_Currencies->format($this->_resultset->valueInt('products_price')), - $lC_Currencies->format($non_taxed_sale), - $lC_Currencies->format($taxed_sale), - $lC_Currencies->format($tax), - $lC_Currencies->format($shipping), - $lC_Currencies->format($this->_resultset->valueInt('-')), - $lC_Currencies->format($coupon) - ); - } + if ( $rows>1 && $year<>$last_row_year) { + $this->_data[] = array("".$srno."",//SrNo + "".$year_txt."",//YEAR + "".$last_row_year."",//YEAR + "".$lC_Currencies->format($footer_gross)."",//GROSS INCOME + "".$lC_Currencies->format($footer_sales)."",//TOTAL OF PRODUCT PRICE + "".$lC_Currencies->format($footer_sales_nontaxed)."",//WITHOUT TAX PRODUCT PRICE + "".$lC_Currencies->format($footer_sales_taxed)."",//WITH TAX PRODUCT PRICE + "".$lC_Currencies->format($footer_tax_coll)."",// TAX ON PRODUCT + "".$lC_Currencies->format($footer_shiphndl)."",//SHIPPING VALUE + "".$lC_Currencies->format($footer_shipping_tax)."",//TAX ON SHIPPING + "".$lC_Currencies->format($footer_other).""//COUPON + ); + // clear footer totals + $footer_gross = 0; + $footer_sales = 0; + $footer_sales_nontaxed = 0; + $footer_sales_taxed = 0; + $footer_tax_coll = 0; + $footer_shiphndl = 0; + $footer_shipping_tax = 0; + $footer_loworder = 0; + $footer_other = 0; + $srno++; + } + + // determine net sales for row + // Retrieve totals for products that are zero VAT rated + $net_sales_query_raw = $lC_Database->query('select sum(op.products_price * op.products_quantity) as net_sales from :table_orders o left join :table_orders_products op on (o.orders_id = op.orders_id) where op.products_tax = 0 and month(o.date_purchased) = :month_purchased and year(o.date_purchased) = :year_purchased'); + if ($orders_status_ids <> '') { + $net_sales_query_raw->appendQuery('and o.orders_status IN ('. $orders_status_ids .')'); + } + if ($sel_month<>0) { + $net_sales_query_raw->appendQuery('and dayofmonth(o.date_purchased) = :row_day'); $net_sales_query_raw->bindInt(':row_day',$day); + } + $net_sales_query_raw->bindInt(':month_purchased', $month); + $net_sales_query_raw->bindInt(':year_purchased', $year); + $net_sales_query_raw->bindTable(':table_orders', TABLE_ORDERS); + $net_sales_query_raw->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); + $net_sales_query_raw->execute(); + $net_sales_this_row = 0; + if ($net_sales_query_raw->numberOfRows() > 0) { + $zero_rated_sales_this_row = $net_sales_query_raw->toArray(); + } + + // Retrieve totals for products that are NOT zero VAT rated + $net_sales_query_raw1 = $lC_Database->query('select sum(op.products_price * op.products_quantity) as net_sales, sum(op.products_price * op.products_quantity * (1 + (op.products_tax / 100.0))) as gross_sales, sum((op.products_price * op.products_quantity * (1 + (op.products_tax / 100.0))) - (op.products_price * op.products_quantity)) as tax from :table_orders o left join :table_orders_products op on (o.orders_id = op.orders_id) where op.products_tax <> 0 and month(o.date_purchased) = :month_purchased and year(o.date_purchased) = :year_purchased '); + if ($orders_status_ids <> '') { + $net_sales_query_raw1->appendQuery('and o.orders_status IN ('. $orders_status_ids .')'); + } + if ($sel_month<>0) { + $net_sales_query_raw1->appendQuery('and dayofmonth(o.date_purchased) = :row_day'); $net_sales_query_raw1->bindInt(':row_day',$day); + } + $net_sales_query_raw1->bindInt(':month_purchased', $month); + $net_sales_query_raw1->bindInt(':year_purchased', $year); + $net_sales_query_raw1->bindTable(':table_orders', TABLE_ORDERS); + $net_sales_query_raw1->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); + $net_sales_query_raw1->execute(); + $net_sales_this_row = 0; + if ($net_sales_query_raw1->numberOfRows() > 0) { + $net_sales_this_row = $net_sales_query_raw1->toArray(); + } + + // Total tax. This is needed so we can calculate any tax that has been added to the postage + $tax_coll_query_raw = $lC_Database->query('select sum(ot.value) as tax_coll from :table_orders o left join :table_orders_total ot on (o.orders_id = ot.orders_id) where ot.class=:class and month(o.date_purchased) = :month_purchased and year(o.date_purchased) = :year_purchased '); + if ($orders_status_ids <> '') { + $tax_coll_query_raw->appendQuery('and o.orders_status IN ('. $orders_status_ids .')'); + } + if ($sel_month<>0) { + $tax_coll_query_raw->appendQuery('and dayofmonth(o.date_purchased) = :row_day'); $tax_coll_query_raw->bindInt(':row_day',$day); + } + $tax_coll_query_raw->bindValue(':class', $class_val_tax); + $tax_coll_query_raw->bindInt(':month_purchased', $month); + $tax_coll_query_raw->bindInt(':year_purchased', $year); + $tax_coll_query_raw->bindTable(':table_orders', TABLE_ORDERS); + $tax_coll_query_raw->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + $tax_coll_query_raw->execute(); + $tax_this_row = 0; + if ($tax_coll_query_raw->numberOfRows() > 0) { + $tax_this_row = $tax_coll_query_raw->toArray(); + } + + // shipping and handling charges for row + $shiphndl_query_raw = $lC_Database->query('select sum(ot.value) as shiphndl from :table_orders o left join :table_orders_total ot on (o.orders_id = ot.orders_id) where ot.class=:class and month(o.date_purchased) = :month_purchased and year(o.date_purchased) = :year_purchased '); + if ($orders_status_ids <> '') { + $shiphndl_query_raw->appendQuery('and o.orders_status IN ('. $orders_status_ids .')'); + } + if ($sel_month<>0) { + $shiphndl_query_raw->appendQuery('and dayofmonth(o.date_purchased) = :row_day'); $shiphndl_query_raw->bindInt(':row_day',$day); + } + $shiphndl_query_raw->bindValue(':class', $class_val_shiphndl); + $shiphndl_query_raw->bindInt(':month_purchased', $month); + $shiphndl_query_raw->bindInt(':year_purchased', $year); + $shiphndl_query_raw->bindTable(':table_orders', TABLE_ORDERS); + $shiphndl_query_raw->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + $shiphndl_query_raw->execute(); + $shiphndl_this_row = 0; + if ($shiphndl_query_raw->numberOfRows() > 0) { + $shiphndl_this_row = $shiphndl_query_raw->toArray(); + } + + // low order fees for row + //if ($loworder) { + if (1) { + $loworder_query_raw = $lC_Database->query('select sum(ot.value) as loworder from :table_orders o left join :table_orders_total ot on (o.orders_id = ot.orders_id) where ot.class=:class and month(o.date_purchased) = :month_purchased and year(o.date_purchased) = :year_purchased '); + if ($orders_status_ids <> '') { + $loworder_query_raw->appendQuery('and o.orders_status IN ('. $orders_status_ids .')'); + } + if ($sel_month<>0) { + $loworder_query_raw->appendQuery('and dayofmonth(o.date_purchased) = :row_day'); $loworder_query_raw->bindInt(':row_day',$day); + } + $loworder_query_raw->bindValue(':class', $class_val_loworder); + $loworder_query_raw->bindInt(':month_purchased', $month); + $loworder_query_raw->bindInt(':year_purchased', $year); + $loworder_query_raw->bindTable(':table_orders', TABLE_ORDERS); + $loworder_query_raw->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + $loworder_query_raw->execute(); + $loworder_this_row = 0; + if ($loworder_query_raw->numberOfRows() > 0) { + $loworder_this_row = $loworder_query_raw->toArray(); + } + } + + // additional column if extra class value in orders_total table + if ($extra_class) { + $other_query_raw = $lC_Database->query('select sum(ot.value) as other from :table_orders o left join :table_orders_total ot on (o.orders_id = ot.orders_id) where ot.class<>:class and ot.class<>:class and ot.class<>:class and ot.class<>:class and ot.class<>:class and month(o.date_purchased) = :month_purchased and year(o.date_purchased) = :year_purchased '); + if ($orders_status_ids <> '') { + $other_query_raw->appendQuery('and o.orders_status IN ('. $orders_status_ids .')'); + } + if ($sel_month<>0) { + $other_query_raw->appendQuery('and dayofmonth(o.date_purchased) = :row_day'); $other_query_raw->bindInt(':row_day',$day); + } + $other_query_raw->bindValue(':class', $class_val_subtotal); + $other_query_raw->bindValue(':class', $class_val_tax); + $other_query_raw->bindValue(':class', $class_val_shiphndl); + $other_query_raw->bindValue(':class', $class_val_loworder); + $other_query_raw->bindValue(':class', $class_val_total); + $other_query_raw->bindInt(':month_purchased', $month); + $other_query_raw->bindInt(':year_purchased', $year); + $other_query_raw->bindTable(':table_orders', TABLE_ORDERS); + $other_query_raw->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + $other_query_raw->execute(); + $other_this_row = 0; + if ($other_query_raw->numberOfRows() > 0) { + $other_this_row = $other_query_raw->toArray(); + } + } + + // Correct any rounding errors + $net_sales_this_row['net_sales'] = (floor(($net_sales_this_row['net_sales'] * 100) + 0.5)) / 100; + $net_sales_this_row['tax'] = (floor(($net_sales_this_row['tax'] * 100) + 0.5)) / 100; + $zero_rated_sales_this_row['net_sales'] = (floor(($zero_rated_sales_this_row['net_sales'] * 100) + 0.5)) / 100; + $tax_this_row['tax_coll'] = (floor(($tax_this_row['tax_coll'] * 100) + 0.5)) / 100; + $total_of_product_price = ($net_sales_this_row['net_sales'] + $zero_rated_sales_this_row['net_sales']); + $tax_on_shipping = ($tax_this_row['tax_coll'] - $net_sales_this_row['tax']); + + // accumulate row results in footer + $footer_gross += $gross_sales; // Gross Income + $footer_sales += $total_of_product_price; // Product Sales + $footer_sales_nontaxed += $zero_rated_sales_this_row['net_sales']; // Nontaxed Sales + $footer_sales_taxed += $net_sales_this_row['net_sales']; // Taxed Sales + $footer_tax_coll += $net_sales_this_row['tax']; // Taxes Collected + $footer_shiphndl += $shiphndl_this_row['shiphndl']; // Shipping & handling + $footer_shipping_tax += $tax_on_shipping; // Shipping Tax + $footer_loworder += $loworder_this_row['loworder']; + if ($extra_class) $footer_other += $other_this_row['other']; + + $this->_data[] = array($srno,//Serial No for proper Sorting + ''.$row_month.'',//Month + $content,//YEAR + $lC_Currencies->format($gross_sales),//GROSS INCOME + $lC_Currencies->format($total_of_product_price),//TOTAL OF PRODUCT PRICE + $lC_Currencies->format($zero_rated_sales_this_row['net_sales']),//WITHOUT TAX PRODUCT PRICE + $lC_Currencies->format($net_sales_this_row['net_sales']),//WITH TAX PRODUCT PRICE + $lC_Currencies->format($net_sales_this_row['tax']),// TAX ON PRODUCT + $lC_Currencies->format($shiphndl_this_row['shiphndl']),//SHIPPING VALUE + $lC_Currencies->format($tax_on_shipping),//TAX ON SHIPPING + $lC_Currencies->format($other_this_row['other'])//COUPON + ); + + + $last_row_year = $year; + if ($rows==$num_rows){ + $srno++; + $this->_data[] = array("".$srno."",//YEAR + "".$year_txt."",//YEAR + "".$last_row_year."",//YEAR + "".$lC_Currencies->format($footer_gross)."",//GROSS INCOME + "".$lC_Currencies->format($footer_sales)."",//TOTAL OF PRODUCT PRICE + "".$lC_Currencies->format($footer_sales_nontaxed)."",//WITHOUT TAX PRODUCT PRICE + "".$lC_Currencies->format($footer_sales_taxed)."",//WITH TAX PRODUCT PRICE + "".$lC_Currencies->format($footer_tax_coll)."",// TAX ON PRODUCT + "".$lC_Currencies->format($footer_shiphndl)."",//SHIPPING VALUE + "".$lC_Currencies->format($footer_shipping_tax)."",//TAX ON SHIPPING + "".$lC_Currencies->format($footer_other).""//COUPON + ); + // clear footer totals + $footer_gross = 0; + $footer_sales = 0; + $footer_sales_nontaxed = 0; + $footer_sales_taxed = 0; + $footer_tax_coll = 0; + $footer_shiphndl = 0; + $footer_shipping_tax = 0; + $footer_loworder = 0; + $footer_other = 0; + } + } } } ?> \ No newline at end of file From e7d976ec238d7e2af0a0075974697236d071d2ca Mon Sep 17 00:00:00 2001 From: gulsarrays Date: Wed, 18 Jun 2014 18:38:30 +0530 Subject: [PATCH 019/168] D1545 Reports Phase 1 --- .../admin/includes/applications/statistics/pages/main.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/catalog/admin/includes/applications/statistics/pages/main.php b/catalog/admin/includes/applications/statistics/pages/main.php index 12e0e6ec9..11071b898 100644 --- a/catalog/admin/includes/applications/statistics/pages/main.php +++ b/catalog/admin/includes/applications/statistics/pages/main.php @@ -78,7 +78,7 @@ function get_dropdown_list_array($type) { return $return_arr; } - $arr_time_span = array( + /* $arr_time_span = array( array('id' => 'daily', 'text' => $lC_Language->get('text_daily')), array('id' => 'monthly', @@ -87,7 +87,7 @@ function get_dropdown_list_array($type) { 'text' => $lC_Language->get('text_quarterly')), array('id' => 'annually', 'text' => $lC_Language->get('text_annually')) - ); + );*/ $arr_summary = array( array('id' => 'summary', 'text' => $lC_Language->get('text_summary')), @@ -105,7 +105,7 @@ function get_dropdown_list_array($type) { $manufacturer_dropdown = lc_draw_pull_down_menu('manufacturer', $manufacturer_arr, null, 'class="input with-small-padding small-margin-bottom"') . ' '; $supplier_dropdown = lc_draw_pull_down_menu('supplier', $supplier_arr, null, 'class="input with-small-padding small-margin-bottom"') . ' '; $order_status_dropdown = lc_draw_pull_down_menu('order_status', $order_status_arr, null, 'class="input with-small-padding small-margin-bottom"') . ' '; - $time_span_dropdown = lc_draw_pull_down_menu('time_span', $arr_time_span, null, 'class="green-gradient select expandable-list small-margin-bottom"') . ' '; + //$time_span_dropdown = lc_draw_pull_down_menu('time_span', $arr_time_span, null, 'class="green-gradient select expandable-list small-margin-bottom"') . ' '; $summary_dropdown = lc_draw_pull_down_menu('summary', $arr_summary, null, 'class="green-gradient select expandable-list"') . ' '; $start_date_input = ' From 603c79f99b13255cf1351c127371a36ebb198e51 Mon Sep 17 00:00:00 2001 From: datazen Date: Fri, 20 Jun 2014 09:12:44 -0400 Subject: [PATCH 020/168] file upload attr work --- catalog/admin/includes/application_top.php | 2 +- .../applications/orders/classes/orders.php | 45 ++- .../applications/orders/pages/tabs/status.php | 2 +- .../orders/pages/tabs/summary.php | 2 +- catalog/admin/includes/classes/order.php | 5 +- .../admin/includes/languages/en_US/orders.php | 5 +- catalog/includes/classes/order.php | 23 ++ catalog/includes/classes/shopping_cart.php | 59 +++- .../{admin => }/includes/classes/upload.php | 274 +++++++++--------- catalog/includes/javascript/general.js.php | 7 +- catalog/includes/languages/en_US.xml | 5 + .../includes/modules/variants/file_upload.php | 17 +- .../includes/modules/variants/text_field.php | 2 +- catalog/pub/.htaccess | 2 - catalog/templates/core/classes/success.php | 44 ++- .../content/checkout/checkout_success.php | 4 +- 16 files changed, 321 insertions(+), 177 deletions(-) rename catalog/{admin => }/includes/classes/upload.php (96%) diff --git a/catalog/admin/includes/application_top.php b/catalog/admin/includes/application_top.php index d0c819aa8..9c75943da 100644 --- a/catalog/admin/includes/application_top.php +++ b/catalog/admin/includes/application_top.php @@ -157,7 +157,7 @@ require($lC_Vqmod->modCheck('../includes/classes/mail.php')); // file uploading class -require($lC_Vqmod->modCheck('includes/classes/upload.php')); +require($lC_Vqmod->modCheck('../includes/classes/upload.php')); // api class require($lC_Vqmod->modCheck('includes/classes/api.php')); diff --git a/catalog/admin/includes/applications/orders/classes/orders.php b/catalog/admin/includes/applications/orders/classes/orders.php index baa0b0380..b6b96ba6d 100644 --- a/catalog/admin/includes/applications/orders/classes/orders.php +++ b/catalog/admin/includes/applications/orders/classes/orders.php @@ -463,16 +463,18 @@ public static function getInfo($id) { $result['orderStatusHistoryData'] = ''; $oshcnt = 0; foreach ( $lC_Order->getStatusHistory() as $status_history ) { + $result['orderStatusHistory'] .= ' ' . lC_DateTime::getShort($status_history['date_added'], true) . ' ' . $status_history['status'] . ' - ' . nl2br($status_history['comment']) . ' + ' . (substr($status_history['comment'], 0, 1) == '<') ? $status_history['comment'] : nl2br($status_history['comment']) . ' '; + // enhanced order admin additions $result['orderStatusHistoryData'][$oshcnt]['date_added'] = lC_DateTime::getShort($status_history['date_added'], false); $result['orderStatusHistoryData'][$oshcnt]['status'] = $status_history['status']; - $result['orderStatusHistoryData'][$oshcnt]['comment'] = nl2br($status_history['comment']); + $result['orderStatusHistoryData'][$oshcnt]['comment'] = (substr($status_history['comment'], 0, 1) == '<') ? $status_history['comment'] : nl2br($status_history['comment']); $result['orderStatusHistoryData'][$oshcnt]['customer_notified'] = $status_history['customer_notified']; $result['orderStatusHistoryData'][$oshcnt]['admin_name'] = $status_history['admin_name']; $result['orderStatusHistoryData'][$oshcnt]['admin_image'] = $status_history['admin_image']; @@ -653,11 +655,14 @@ private static function _updateStatus($id, $data) { // build and return the udpated status history $history = ''; $result = array(); + foreach ( $lC_Order->getStatusHistory() as $status_history ) { + + $history .= ' ' . lC_DateTime::getShort($status_history['date_added'], true) . ' ' . $status_history['status'] . ' - ' . nl2br($status_history['comment']) . ' + ' . (substr($status_history['comment'], 0, 1) == '<') ? $status_history['comment'] : nl2br($status_history['comment']) . ' '; } @@ -705,13 +710,25 @@ public static function getOrderComments($id = null) { if (is_array($data['orderStatusHistoryData'])) { foreach ($data['orderStatusHistoryData'] as $oshData) { if ($oshData['comment'] != '') { + + $tagColor = ' green-bg'; + $tagText = $lC_Language->get('text_order_comment'); + + if ($oshData['admin_id'] != null) { + $tagColor = ($oshData['append_comment'] == 1) ? ' orange-bg' : ' anthracite-bg'; + $tagText = (($oshData['append_comment'] == 1) ? $lC_Language->get('text_customer_message') : $lC_Language->get('text_admin_note')); + } else if (strstr($oshData['comment'], 'icon-newspaper')) { // is a file upload + $tagColor = ' blue-bg'; + $tagText = $lC_Language->get('text_files_uploaded'); + } + $ocData .= '
- ' . (($oshData['admin_id'] == null) ? $lC_Language->get('text_order_comment') : (($oshData['append_comment'] == 1) ? $lC_Language->get('text_customer_message') : $lC_Language->get('text_admin_note'))) . ' + ' . $tagText . ' - ' . (($oshData['admin_image'] != '' && file_exists('images/avatar/' . $oshData['admin_image'])) ? 'Comment by ' . $oshData['admin_name'] . '' : '') . ' + ' . (($oshData['admin_image'] != '' && file_exists('images/avatar/' . $oshData['admin_image'])) ? '' . $lC_Language->get('text_comment_by') . ' ' . $oshData['admin_name'] . '' : '') . ' - ' . (($oshData['admin_id'] != null) ? $oshData['admin_name'] : $lC_Language->get('text_customer_comment')) . '' . $oshData['date_added'] . '(' . $oshData['status'] . ') + ' . (($oshData['admin_id'] != null) ? $oshData['admin_name'] : $lC_Language->get('text_customer_comment')) . '' . $oshData['date_added'] . '' . (($oshData['status'] != null) ? '(' . $oshData['status'] . ')' : '') . '

' . $oshData['comment'] . '

'; @@ -734,13 +751,25 @@ public static function getOrderStatusHistory($id = null) { if (is_array($data['orderStatusHistoryData'])) { foreach ($data['orderStatusHistoryData'] as $oshData) { + + $tagColor = ' green-bg'; + $tagText = $lC_Language->get('text_order_comment'); + + if ($oshData['admin_id'] != null) { + $tagColor = ($oshData['append_comment'] == 1) ? ' orange-bg' : ' anthracite-bg'; + $tagText = (($oshData['append_comment'] == 1) ? $lC_Language->get('text_customer_message') : $lC_Language->get('text_admin_note')); + } else if (strstr($oshData['comment'], 'icon-newspaper')) { // is a file upload + $tagColor = ' blue-bg'; + $tagText = $lC_Language->get('text_files_uploaded'); + } + $osHistory .= '
- ' . (($oshData['admin_id'] == null) ? $lC_Language->get('text_order_comment') : (($oshData['append_comment'] == 1) ? $lC_Language->get('text_customer_message') : $lC_Language->get('text_admin_note'))) . ' + ' . $tagText . ' ' . (($oshData['admin_image'] != '' && file_exists('images/avatar/' . $oshData['admin_image'])) ? 'Comment by ' . $oshData['admin_name'] . '' : '') . ' - ' . $oshData['admin_name'] . '' . $oshData['date_added'] . '(' . $oshData['status'] . ') + ' . $oshData['admin_name'] . '' . $oshData['date_added'] . '' . (($oshData['status'] != null) ? '(' . $oshData['status'] . ')' : '') . '

' . $oshData['comment'] . '

'; diff --git a/catalog/admin/includes/applications/orders/pages/tabs/status.php b/catalog/admin/includes/applications/orders/pages/tabs/status.php index 88a585039..4e3af1aa4 100644 --- a/catalog/admin/includes/applications/orders/pages/tabs/status.php +++ b/catalog/admin/includes/applications/orders/pages/tabs/status.php @@ -12,6 +12,6 @@ \ No newline at end of file diff --git a/catalog/admin/includes/applications/orders/pages/tabs/summary.php b/catalog/admin/includes/applications/orders/pages/tabs/summary.php index fe101cbef..9a1456c0d 100644 --- a/catalog/admin/includes/applications/orders/pages/tabs/summary.php +++ b/catalog/admin/includes/applications/orders/pages/tabs/summary.php @@ -310,7 +310,7 @@ - get('oID')); ?> + get('oID')); ?>
diff --git a/catalog/admin/includes/classes/order.php b/catalog/admin/includes/classes/order.php index 45af08b2c..e700a7a99 100644 --- a/catalog/admin/includes/classes/order.php +++ b/catalog/admin/includes/classes/order.php @@ -124,7 +124,7 @@ protected function _getStatusHistory() { $Qhistory->bindInt(':orders_id', $this->_order_id); $Qhistory->execute(); - + while ($Qhistory->next()) { $QhAdmin = $lC_Database->query('select first_name, last_name, image from :table_administrators where id = :id limit 1'); $QhAdmin->bindTable(':table_administrators', TABLE_ADMINISTRATORS); @@ -134,7 +134,7 @@ protected function _getStatusHistory() { 'status' => $Qhistory->value('orders_status_name'), 'date_added' => $Qhistory->value('date_added'), 'customer_notified' => $Qhistory->valueInt('customer_notified'), - 'comment' => $Qhistory->valueProtected('comments'), + 'comment' => $Qhistory->value('comments'), 'admin_name' => $QhAdmin->value('first_name') . ' ' . $QhAdmin->value('last_name'), 'admin_image' => $QhAdmin->value('image'), 'admin_id' => $Qhistory->valueInt('administrators_id'), @@ -142,6 +142,7 @@ protected function _getStatusHistory() { } $this->_status_history = $history_array; + } protected function _getTransactionHistory() { diff --git a/catalog/admin/includes/languages/en_US/orders.php b/catalog/admin/includes/languages/en_US/orders.php index 5166ff7ff..fe6f771a7 100644 --- a/catalog/admin/includes/languages/en_US/orders.php +++ b/catalog/admin/includes/languages/en_US/orders.php @@ -185,4 +185,7 @@ text_no_coupons_exist = No Coupons Exist text_no_shipping_methods_exist = No Shipping Methods Exist text_order_total_tax = Tax -text_no_tax_rate_exist = No Tax Rates Avilable \ No newline at end of file +text_no_tax_rate_exist = No Tax Rates Avilable +text_files_uploaded = Files Uploaded +text_status_update_by = Status Update by +text_comment_by = Comment by \ No newline at end of file diff --git a/catalog/includes/classes/order.php b/catalog/includes/classes/order.php index 58e8fb78e..8269a33dd 100644 --- a/catalog/includes/classes/order.php +++ b/catalog/includes/classes/order.php @@ -204,6 +204,29 @@ public function insert($status = 1) { $Qstatus->bindInt(':customer_notified', '0'); $Qstatus->bindValue(':comments', ''); $Qstatus->execute(); + + // check for file upload and add to comments + if (isset($_SESSION['file_upload'])) { + + $comments = ''; + if (is_array($_SESSION['file_upload'][0]) && empty($_SESSION['file_upload'][0]) === false) { + foreach($_SESSION['file_upload'] as $file) { + $comments .= '
' . $_SESSION['file_upload']['name'] . '
'; + } + } else { + $comments = '
' . $_SESSION['file_upload']['name'] . '
'; + } + + $Qstatus = $lC_Database->query('insert into :table_orders_status_history (orders_id, orders_status_id, date_added, customer_notified, comments) values (:orders_id, :orders_status_id, now(), :customer_notified, :comments)'); + $Qstatus->bindTable(':table_orders_status_history', TABLE_ORDERS_STATUS_HISTORY); + $Qstatus->bindInt(':orders_id', $insert_id); + $Qstatus->bindInt(':orders_status_id', 98); // file upload + $Qstatus->bindInt(':customer_notified', '0'); + $Qstatus->bindValue(':comments', $comments); + $Qstatus->execute(); + + + } foreach ($lC_ShoppingCart->getProducts() as $products) { $Qproducts = $lC_Database->query('insert into :table_orders_products (orders_id, products_id, products_model, products_sku, products_name, products_price, products_tax, products_quantity, products_simple_options_meta_data) values (:orders_id, :products_id, :products_model, :products_sku, :products_name, :products_price, :products_tax, :products_quantity, :products_simple_options_meta_data)'); diff --git a/catalog/includes/classes/shopping_cart.php b/catalog/includes/classes/shopping_cart.php index 36bc860e6..654853c85 100644 --- a/catalog/includes/classes/shopping_cart.php +++ b/catalog/includes/classes/shopping_cart.php @@ -7,6 +7,10 @@ @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt @version $Id: shopping_cart.php v1.0 2013-08-08 datazen $ */ +global $lC_Vqmod; + +include_once($lC_Vqmod->modCheck('includes/classes/upload.php')); + class lC_ShoppingCart { private $_contents = array(); private $_sub_total = 0; @@ -424,7 +428,10 @@ public function add($product_id, $quantity = null) { foreach($_POST['simple_options'] as $options_id => $values_id) { - if (is_array($values_id)) $values_id = key($values_id); // for text fields + if (is_array($values_id)) { + $text_value = current($values_id); // for text fields + $values_id = key($values_id); + } $QsimpleOptionsValues = $lC_Database->query('select price_modifier from :table_products_simple_options_values where options_id = :options_id and values_id = :values_id and customers_group_id = :customers_group_id'); $QsimpleOptionsValues->bindTable(':table_products_simple_options_values', TABLE_PRODUCTS_SIMPLE_OPTIONS_VALUES); @@ -443,8 +450,23 @@ public function add($product_id, $quantity = null) { $Qvariants->execute(); if ($Qvariants->value('module') == 'file_upload') { - $group_title = 'File'; - $value_title = $_FILES['simple_options']['name'][$options_id]; + $group_title = $lC_Language->get('text_label_file'); + $value_title = $_FILES['simple_options_upload']['name']; + + // upload the file + $image = new upload('simple_options_upload', realpath('pub')); + + if ( $image->exists() ) { + if ( $image->parse() && $image->save() ) { + // success + $_SESSION['file_upload'] = $_FILES['simple_options_upload']; + $value_title = $image->filename; + } + } + + } else if ($Qvariants->value('module') == 'text_field') { + $group_title = $Qvariants->value('group_title'); + $value_title = $text_value; } else { $group_title = $Qvariants->value('group_title'); $value_title = $Qvariants->value('value_title'); @@ -486,6 +508,33 @@ public function add($product_id, $quantity = null) { $group_title = lC_Variants::getGroupTitle($Qvariant->value('module'), $Qvariant->toArray()); $value_title = lC_Variants::getValueTitle($Qvariant->value('module'), $Qvariant->toArray()); $has_custom_value = lC_Variants::hasCustomValue($Qvariant->value('module')); + + if ($Qvariant->value('module') == 'file_upload') { + $group_title = $lC_Language->get('text_label_file'); + $value_title = $_FILES['variants_upload']['name']; + + // upload the file + $image = new upload('variants_upload', realpath('pub')); + + if ( $image->exists() ) { + if ( $image->parse() && $image->save() ) { + // success + $_SESSION['file_upload'] = $_FILES['variants_upload']; + $value_title = $image->filename; + } + } + + } else if ($Qvariant->value('module') == 'text_field') { + $group_title = $Qvariant->value('group_title'); + + if (is_array($_POST['variants'][$Qvariant->valueInt('group_id')])) { + $value_title = current($_POST['variants'][$Qvariant->valueInt('group_id')]); // for text fields + } + + } else { + $group_title = $Qvariant->value('group_title'); + $value_title = $Qvariant->value('value_title'); + } $this->_contents[$item_id]['variants'][] = array('group_id' => $Qvariant->valueInt('group_id'), 'value_id' => $Qvariant->valueInt('value_id'), @@ -505,7 +554,6 @@ public function add($product_id, $quantity = null) { } } } - } $this->_cleanUp(); @@ -565,9 +613,6 @@ public function exists($product_id) { public function update($item_id, $quantity) { global $lC_Database, $lC_Customer, $lC_Services; -echo '[' . $item_id . ']
';; -die('44'); - if ( !is_numeric($quantity) ) { $quantity = $this->getQuantity($item_id); } diff --git a/catalog/admin/includes/classes/upload.php b/catalog/includes/classes/upload.php similarity index 96% rename from catalog/admin/includes/classes/upload.php rename to catalog/includes/classes/upload.php index 228e60f1c..646cfae8f 100644 --- a/catalog/admin/includes/classes/upload.php +++ b/catalog/includes/classes/upload.php @@ -1,138 +1,138 @@ -set_file($file); - $this->set_destination($destination); - $this->set_permissions($permissions); - $this->set_extensions($extensions); - } - - public function exists() { - $file = array(); - - if ( is_array($this->file) ) { - $file = $this->file; - } elseif ( isset($_FILES[$this->file]) ) { - $file = array('name' => $_FILES[$this->file]['name'], - 'type' => $_FILES[$this->file]['type'], - 'size' => $_FILES[$this->file]['size'], - 'tmp_name' => $_FILES[$this->file]['tmp_name']); - } - - if ( isset($file['tmp_name']) && !empty($file['tmp_name']) && ($file['tmp_name'] != 'none') && is_uploaded_file($file['tmp_name']) ) { - return true; - } - - return false; - } - - public function parse() { - global $lC_Language, $lC_MessageStack; - - $file = array(); - - if ( is_array($this->file) ) { - $file = $this->file; - } elseif ( isset($_FILES[$this->file]) ) { - $file = array('name' => $_FILES[$this->file]['name'], - 'type' => $_FILES[$this->file]['type'], - 'size' => $_FILES[$this->file]['size'], - 'tmp_name' => $_FILES[$this->file]['tmp_name']); - } - - if ( isset($file['tmp_name']) && !empty($file['tmp_name']) && ($file['tmp_name'] != 'none') && is_uploaded_file($file['tmp_name']) ) { - if (sizeof($this->extensions) > 0) { - if (!in_array(strtolower(substr($file['name'], strrpos($file['name'], '.')+1)), $this->extensions)) { - $lC_MessageStack->add('header', $lC_Language->get('ms_error_upload_file_type_prohibited'), 'error'); - - return false; - } - } - - $this->set_file($file); - $this->set_filename($file['name']); - $this->set_tmp_filename($file['tmp_name']); - - if (!empty($this->destination)) { - return $this->check_destination(); - } else { - return true; - } - } - } - - public function save() { - global $lC_Language, $lC_MessageStack; - - if (substr($this->destination, -1) != '/') $this->destination .= '/'; - - if (move_uploaded_file($this->file['tmp_name'], $this->destination . $this->filename)) { - chmod($this->destination . $this->filename, $this->permissions); - - return true; - } else { - $lC_MessageStack->add('header', $lC_Language->get('ms_error_upload_file_not_saved'), 'error'); - - return false; - } - } - - public function set_file($file) { - $this->file = $file; - } - - public function set_destination($destination) { - $this->destination = $destination; - } - - public function set_permissions($permissions) { - $this->permissions = octdec($permissions); - } - - public function set_filename($filename) { - $this->filename = $filename; - } - - public function set_tmp_filename($filename) { - $this->tmp_filename = $filename; - } - - public function set_extensions($extensions) { - if (!empty($extensions)) { - if (is_array($extensions)) { - $this->extensions = $extensions; - } else { - $this->extensions = array($extensions); - } - } else { - $this->extensions = array(); - } - } - - public function check_destination() { - global $lC_Language, $lC_MessageStack; - - if (!is_writeable($this->destination)) { - if (is_dir($this->destination)) { - $lC_MessageStack->add('header', sprintf($lC_Language->get('ms_error_upload_destination_not_writable'), $this->destination), 'error'); - } else { - $lC_MessageStack->add('header', sprintf($lC_Language->get('ms_error_upload_destination_non_existant'), $this->destination), 'error'); - } - - return false; - } else { - return true; - } - } -} +set_file($file); + $this->set_destination($destination); + $this->set_permissions($permissions); + $this->set_extensions($extensions); + } + + public function exists() { + $file = array(); + + if ( is_array($this->file) ) { + $file = $this->file; + } elseif ( isset($_FILES[$this->file]) ) { + $file = array('name' => $_FILES[$this->file]['name'], + 'type' => $_FILES[$this->file]['type'], + 'size' => $_FILES[$this->file]['size'], + 'tmp_name' => $_FILES[$this->file]['tmp_name']); + } + + if ( isset($file['tmp_name']) && !empty($file['tmp_name']) && ($file['tmp_name'] != 'none') && is_uploaded_file($file['tmp_name']) ) { + return true; + } + + return false; + } + + public function parse() { + global $lC_Language, $lC_MessageStack; + + $file = array(); + + if ( is_array($this->file) ) { + $file = $this->file; + } elseif ( isset($_FILES[$this->file]) ) { + $file = array('name' => $_FILES[$this->file]['name'], + 'type' => $_FILES[$this->file]['type'], + 'size' => $_FILES[$this->file]['size'], + 'tmp_name' => $_FILES[$this->file]['tmp_name']); + } + + if ( isset($file['tmp_name']) && !empty($file['tmp_name']) && ($file['tmp_name'] != 'none') && is_uploaded_file($file['tmp_name']) ) { + if (sizeof($this->extensions) > 0) { + if (!in_array(strtolower(substr($file['name'], strrpos($file['name'], '.')+1)), $this->extensions)) { + $lC_MessageStack->add('header', $lC_Language->get('ms_error_upload_file_type_prohibited'), 'error'); + + return false; + } + } + + $this->set_file($file); + $this->set_filename($file['name']); + $this->set_tmp_filename($file['tmp_name']); + + if (!empty($this->destination)) { + return $this->check_destination(); + } else { + return true; + } + } + } + + public function save() { + global $lC_Language, $lC_MessageStack; + + if (substr($this->destination, -1) != '/') $this->destination .= '/'; + + if (move_uploaded_file($this->file['tmp_name'], $this->destination . $this->filename)) { + chmod($this->destination . $this->filename, $this->permissions); + + return true; + } else { + $lC_MessageStack->add('header', $lC_Language->get('ms_error_upload_file_not_saved'), 'error'); + + return false; + } + } + + public function set_file($file) { + $this->file = $file; + } + + public function set_destination($destination) { + $this->destination = $destination; + } + + public function set_permissions($permissions) { + $this->permissions = octdec($permissions); + } + + public function set_filename($filename) { + $this->filename = $filename; + } + + public function set_tmp_filename($filename) { + $this->tmp_filename = $filename; + } + + public function set_extensions($extensions) { + if (!empty($extensions)) { + if (is_array($extensions)) { + $this->extensions = $extensions; + } else { + $this->extensions = array($extensions); + } + } else { + $this->extensions = array(); + } + } + + public function check_destination() { + global $lC_Language, $lC_MessageStack; + + if (!is_writeable($this->destination)) { + if (is_dir($this->destination)) { + $lC_MessageStack->add('header', sprintf($lC_Language->get('ms_error_upload_destination_not_writable'), $this->destination), 'error'); + } else { + $lC_MessageStack->add('header', sprintf($lC_Language->get('ms_error_upload_destination_non_existant'), $this->destination), 'error'); + } + + return false; + } else { + return true; + } + } +} ?> \ No newline at end of file diff --git a/catalog/includes/javascript/general.js.php b/catalog/includes/javascript/general.js.php index c446efe85..71ce11ff3 100644 --- a/catalog/includes/javascript/general.js.php +++ b/catalog/includes/javascript/general.js.php @@ -77,11 +77,14 @@ function setMaintenanceMode(s) { $(document).ready( function() { $('.btn-file :file').on('fileselect', function(event, numFiles, label, id) { - if (numFiles > 0) { - icon = id.replace('_options_', '_options_remove_'); + icon = id.replace('_options_upload_', '_options_remove_'); + icon2 = id.replace('variants_upload_', 'variants_remove_'); + if (numFiles > 0) { $('#' + icon).removeClass('hidden'); + $('#' + icon2).removeClass('hidden'); } else { $('#' + icon).addClass('hidden'); + $('#' + icon2).addClass('hidden'); } }); }); diff --git a/catalog/includes/languages/en_US.xml b/catalog/includes/languages/en_US.xml index 4d8779447..d8b5ea799 100644 --- a/catalog/includes/languages/en_US.xml +++ b/catalog/includes/languages/en_US.xml @@ -2955,5 +2955,10 @@ Your friend, %s, thought that you would be interested in %s from %s.]]> general + + text_label_file + + general + \ No newline at end of file diff --git a/catalog/includes/modules/variants/file_upload.php b/catalog/includes/modules/variants/file_upload.php index 82a874a88..ac91c9534 100644 --- a/catalog/includes/modules/variants/file_upload.php +++ b/catalog/includes/modules/variants/file_upload.php @@ -44,11 +44,11 @@ static public function parse($data) { $group_id = $val['group_id']; $group_title = $val['group_title']; - $string .= '
' . + $string .= '
' . ' ' . + ' ' . '
'; $cnt++; } @@ -62,12 +62,15 @@ static public function parse($data) { $string = ''; $i = 0; + foreach ( $data['data'] as $field ) { $i++; - $string .= '
- - -
'; + $string .= '
' . + ' ' . + ' ' . + ' ' . + ' ' . + '
'; } } diff --git a/catalog/includes/modules/variants/text_field.php b/catalog/includes/modules/variants/text_field.php index 9d71c156e..e3e1cf1b3 100644 --- a/catalog/includes/modules/variants/text_field.php +++ b/catalog/includes/modules/variants/text_field.php @@ -53,7 +53,7 @@ static public function parse($data) { $i++; $string .= '
- +
'; } } diff --git a/catalog/pub/.htaccess b/catalog/pub/.htaccess index c9a627dfb..e69de29bb 100644 --- a/catalog/pub/.htaccess +++ b/catalog/pub/.htaccess @@ -1,2 +0,0 @@ -Options +FollowSymLinks -Indexes - diff --git a/catalog/templates/core/classes/success.php b/catalog/templates/core/classes/success.php index f6c135789..9e0b3bc35 100644 --- a/catalog/templates/core/classes/success.php +++ b/catalog/templates/core/classes/success.php @@ -103,7 +103,7 @@ public static function isVariant($_pID) { * @access public * @return array */ - public static function getVariants($_pID) { + public static function getVariants($_pID, $_oID) { global $lC_Database, $lC_Language; $Qvariant = $lC_Database->query('select pvg.id as group_id, pvg.title as group_title, pvg.module, pvv.id as value_id, pvv.title as value_title from :table_products_variants pv, :table_products_variants_values pvv, :table_products_variants_groups pvg where pv.products_id = :products_id and pv.products_variants_values_id = pvv.id and pvv.languages_id = :languages_id and pvv.products_variants_groups_id = pvg.id and pvg.languages_id = :languages_id'); @@ -112,15 +112,49 @@ public static function getVariants($_pID) { $Qvariant->bindTable(':table_products_variants_groups', TABLE_PRODUCTS_VARIANTS_GROUPS); $Qvariant->bindInt(':products_id', $_pID); $Qvariant->bindInt(':languages_id', $lC_Language->getID()); - $Qvariant->bindInt(':languages_id', $lC_Language->getID()); - $Qvariant->execute(); + $Qvariant->bindInt(':languages_id', $lC_Language->getID()); + $Qvariant->execute(); if ( $Qvariant->numberOfRows() > 0 ) { while ( $Qvariant->next() ) { + + if ($Qvariant->value('module') == 'file_upload') { + $Qopv = $lC_Database->query('select opv.value_title from :table_orders_products_variants opv left join :table_orders_products op on (op.orders_products_id = opv.orders_products_id) where opv.orders_id = :orders_id and op.products_id = :products_id and opv.group_title like :group_title limit 1'); + $Qopv->bindTable(':table_orders_products_variants', TABLE_ORDERS_PRODUCTS_VARIANTS); + $Qopv->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); + $Qopv->bindInt(':orders_id', $_oID); + $Qopv->bindInt(':products_id', $_pID); + $Qopv->bindValue(':group_title', '%' . $lC_Language->get('text_label_file') . '%'); + $Qopv->execute(); + + $group_title = $lC_Language->get('text_label_file'); + $value_title = $Qopv->value('value_title'); + + $Qopv->freeResult(); + + } else if ($Qvariant->value('module') == 'text_field') { + $Qopv = $lC_Database->query('select opv.value_title from :table_orders_products_variants opv left join :table_orders_products op on (op.orders_products_id = opv.orders_products_id) where opv.orders_id = :orders_id and op.products_id = :products_id and opv.group_title like :group_title limit 1'); + $Qopv->bindTable(':table_orders_products_variants', TABLE_ORDERS_PRODUCTS_VARIANTS); + $Qopv->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); + $Qopv->bindInt(':orders_id', $_oID); + $Qopv->bindInt(':products_id', $_pID); + $Qopv->bindValue(':group_title', '%' . $Qvariant->value('group_title') . '%'); + $Qopv->execute(); + + $group_title = $Qvariant->value('group_title'); + $value_title = $Qopv->value('value_title'); + + $Qopv->freeResult(); + + } else { + $group_title = $Qvariant->value('group_title'); + $value_title = $Qvariant->value('value_title'); + } + $variants_array[] = array('group_id' => $Qvariant->valueInt('group_id'), 'value_id' => $Qvariant->valueInt('value_id'), - 'group_title' => $Qvariant->value('group_title'), - 'value_title' => $Qvariant->value('value_title')); + 'group_title' => $group_title, + 'value_title' => $value_title); } } diff --git a/catalog/templates/core/content/checkout/checkout_success.php b/catalog/templates/core/content/checkout/checkout_success.php index c0854a906..54c821e4d 100644 --- a/catalog/templates/core/content/checkout/checkout_success.php +++ b/catalog/templates/core/content/checkout/checkout_success.php @@ -90,12 +90,12 @@ echo '
- ' . $lC_Language->get('listing_sku_heading') . ': ' . $products['sku'] . '
' . "\n"; } if ( lC_Success::isVariant($products['id']) === true ) { - foreach ( lC_Success::getVariants($products['id']) as $variant) { + foreach ( lC_Success::getVariants($products['id'], $oID) as $variant) { echo '
- ' . $variant['group_title'] . ': ' . $variant['value_title'] . '
' . "\n"; } } if ( is_array($products['options']) && empty($products['options']) === false ) { - foreach ( $products['options'] as $key => $val) { + foreach ( $products['options'] as $key => $option) { echo '
- ' . $option['group_title'] . ': ' . $option['value_title'] . '
' . "\n"; } } From e6d9417105b09cfddbf638165720cde8b954d921 Mon Sep 17 00:00:00 2001 From: datazen Date: Tue, 24 Jun 2014 09:30:28 -0400 Subject: [PATCH 021/168] file upload work --- catalog/includes/classes/order.php | 10 +- catalog/includes/classes/shopping_cart.php | 116 +++++++++++------- catalog/includes/javascript/general.js.php | 77 +++++++++--- catalog/includes/languages/en_US.xml | 7 +- .../includes/modules/variants/file_upload.php | 34 ++--- .../modules/variants/multiple_file_upload.php | 88 +++++++++++++ catalog/templates/core/classes/success.php | 2 +- 7 files changed, 247 insertions(+), 87 deletions(-) create mode 100644 catalog/includes/modules/variants/multiple_file_upload.php diff --git a/catalog/includes/classes/order.php b/catalog/includes/classes/order.php index 8269a33dd..9da493a48 100644 --- a/catalog/includes/classes/order.php +++ b/catalog/includes/classes/order.php @@ -207,11 +207,11 @@ public function insert($status = 1) { // check for file upload and add to comments if (isset($_SESSION['file_upload'])) { - $comments = ''; - if (is_array($_SESSION['file_upload'][0]) && empty($_SESSION['file_upload'][0]) === false) { - foreach($_SESSION['file_upload'] as $file) { - $comments .= '
' . $_SESSION['file_upload']['name'] . '
'; + if (is_array($_SESSION['file_upload']['name']) && empty($_SESSION['file_upload']['name']) === false) { + foreach($_SESSION['file_upload']['name'] as $file) { + if ($file == '') continue; + $comments .= '
' . $file . '
'; } } else { $comments = '
' . $_SESSION['file_upload']['name'] . '
'; @@ -224,8 +224,6 @@ public function insert($status = 1) { $Qstatus->bindInt(':customer_notified', '0'); $Qstatus->bindValue(':comments', $comments); $Qstatus->execute(); - - } foreach ($lC_ShoppingCart->getProducts() as $products) { diff --git a/catalog/includes/classes/shopping_cart.php b/catalog/includes/classes/shopping_cart.php index 654853c85..6c2f1c775 100644 --- a/catalog/includes/classes/shopping_cart.php +++ b/catalog/includes/classes/shopping_cart.php @@ -79,7 +79,7 @@ public function synchronizeWithDatabase() { if ( !$lC_Customer->isLoggedOn() ) { return false; - } + } foreach ( $this->_contents as $item_id => $data ) { $db_action = 'check'; @@ -88,12 +88,11 @@ public function synchronizeWithDatabase() { foreach ( $data['variants'] as $variant ) { if ( $variant['has_custom_value'] === true ) { $db_action = 'insert'; - break; } } } - + if ( $db_action == 'check' ) { $Qproduct = $lC_Database->query('select item_id, meta_data, quantity from :table_shopping_carts where customers_id = :customers_id and products_id = :products_id'); $Qproduct->bindTable(':table_shopping_carts', TABLE_SHOPPING_CARTS); @@ -149,7 +148,17 @@ public function synchronizeWithDatabase() { } } } - + + // store simple options + foreach ( $this->_contents as $item_id => $data ) { + $simple_options = array(); + if ( isset($data['simple_options']) ) { + foreach ( $data['simple_options'] as $key => $option ) { + $simple_options[$item_id][] = $option; + } + } + } + // reset per-session cart contents, but not the database contents $this->reset(); @@ -163,7 +172,7 @@ public function synchronizeWithDatabase() { while ( $Qproducts->next() ) { if ( $Qproducts->valueInt('products_status') === 1 ) { - $Qdesc = $lC_Database->query('select products_name, products_keyword, products_description from :table_products_description where products_id = :products_id and language_id = :language_id'); + $Qdesc = $lC_Database->query('select products_name, products_keyword, products_tags, products_url, products_description from :table_products_description where products_id = :products_id and language_id = :language_id'); $Qdesc->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION); $Qdesc->bindInt(':products_id', ($Qproducts->valueInt('parent_id') > 0) ? $Qproducts->valueInt('parent_id') : $Qproducts->valueInt('products_id')); $Qdesc->bindInt(':language_id', $lC_Language->getID()); @@ -181,15 +190,17 @@ public function synchronizeWithDatabase() { if ( $new_price = $lC_Specials->getPrice($Qproducts->valueInt('products_id')) ) { $price = $new_price; } - } + } $this->_contents[$Qproducts->valueInt('item_id')] = array('item_id' => $Qproducts->valueInt('item_id'), 'id' => $Qproducts->valueInt('products_id'), 'parent_id' => $Qproducts->valueInt('parent_id'), + 'name' => $Qdesc->value('products_name'), 'model' => $Qproducts->value('products_model'), 'sku' => $Qproducts->value('products_sku'), - 'name' => $Qdesc->value('products_name'), 'keyword' => $Qdesc->value('products_keyword'), + 'tags' => $Qdesc->value('products_tags'), + 'url' => $Qdesc->value('products_url'), 'description' => $Qdesc->value('products_description'), 'image' => ($Qimage->numberOfRows() === 1) ? $Qimage->value('image') : '', 'price' => $price, @@ -199,8 +210,8 @@ public function synchronizeWithDatabase() { 'date_added' => lC_DateTime::getShort($Qproducts->value('date_added')), 'weight_class_id' => $Qproducts->valueInt('products_weight_class')); - - $this->_contents[$Qproducts->valueInt('item_id')]['simple_options'] = unserialize($Qproducts->value('meta_data')); + // simple options + $this->_contents[$Qproducts->valueInt('item_id')]['simple_options'] = (strlen($Qproducts->value('meta_data')) > 2) ? $Qproducts->value('meta_data') : $simple_options[$Qproducts->valueInt('item_id')]; if ( $Qproducts->valueInt('parent_id') > 0 ) { $Qcheck = $lC_Database->query('select products_status from :table_products where products_id = :products_id'); @@ -238,10 +249,10 @@ public function synchronizeWithDatabase() { } $this->_contents[$Qproducts->valueInt('item_id')]['variants'][] = array('group_id' => $Qvariant->valueInt('group_id'), - 'value_id' => $Qvariant->valueInt('value_id'), - 'group_title' => $group_title, - 'value_title' => $value_title, - 'has_custom_value' => $has_custom_value); + 'value_id' => $Qvariant->valueInt('value_id'), + 'group_title' => $group_title, + 'value_title' => $value_title, + 'has_custom_value' => $has_custom_value); } } else { $_delete_array[] = $Qproducts->valueInt('item_id'); @@ -425,7 +436,6 @@ public function add($product_id, $quantity = null) { // simple options if (isset($_POST['simple_options']) && empty($_POST['simple_options']) === false) { - foreach($_POST['simple_options'] as $options_id => $values_id) { if (is_array($values_id)) { @@ -449,19 +459,29 @@ public function add($product_id, $quantity = null) { $Qvariants->bindInt(':languages_id', $lC_Language->getID()); $Qvariants->execute(); - if ($Qvariants->value('module') == 'file_upload') { - $group_title = $lC_Language->get('text_label_file'); - $value_title = $_FILES['simple_options_upload']['name']; - - // upload the file - $image = new upload('simple_options_upload', realpath('pub')); - - if ( $image->exists() ) { - if ( $image->parse() && $image->save() ) { - // success - $_SESSION['file_upload'] = $_FILES['simple_options_upload']; - $value_title = $image->filename; - } + if (strstr($Qvariants->value('module'), 'file_upload')) { + + $group_title = (is_array($_FILES['simple_options_upload']['name']) && count($_FILES['simple_options_upload']['name']) > 2) ? $lC_Language->get('text_label_files') : $lC_Language->get('text_label_file'); + $value_title = (is_array($_FILES['simple_options_upload']['name'])) ? substr(implode(', ', $_FILES['simple_options_upload']['name']), 0, -2) : $_FILES['simple_options_upload']['name']; + + if (is_array($_FILES['simple_options_upload']['name'])) { + $filesArr = $_FILES; + $_SESSION['file_upload'] = $_FILES['simple_options_upload']; + foreach($filesArr['simple_options_upload']['name'] as $key => $file) { + $_FILES = array('simple_options_upload' => array('name' => $file, + 'type' => $filesArr['simple_options_upload']['type'][$key], + 'tmp_name' => $filesArr['simple_options_upload']['tmp_name'][$key], + 'error' => $filesArr['simple_options_upload']['error'][$key], + 'size' => $filesArr['simple_options_upload']['size'][$key])); + // upload the file + $image = new upload('simple_options_upload', realpath('pub')); + + if ( $image->exists() ) { + if ( $image->parse() && $image->save() ) { + // success + } + } + } } } else if ($Qvariants->value('module') == 'text_field') { @@ -509,32 +529,36 @@ public function add($product_id, $quantity = null) { $value_title = lC_Variants::getValueTitle($Qvariant->value('module'), $Qvariant->toArray()); $has_custom_value = lC_Variants::hasCustomValue($Qvariant->value('module')); - if ($Qvariant->value('module') == 'file_upload') { - $group_title = $lC_Language->get('text_label_file'); - $value_title = $_FILES['variants_upload']['name']; - - // upload the file - $image = new upload('variants_upload', realpath('pub')); - - if ( $image->exists() ) { - if ( $image->parse() && $image->save() ) { - // success - $_SESSION['file_upload'] = $_FILES['variants_upload']; - $value_title = $image->filename; - } + if (strstr($Qvariant->value('module'), 'file_upload')) { + $group_title = (is_array($_FILES['variants_upload']['name']) && count($_FILES['variants_upload']['name']) > 2) ? $lC_Language->get('text_label_files') : $lC_Language->get('text_label_file'); + $value_title = (is_array($_FILES['variants_upload']['name'])) ? substr(implode(', ', $_FILES['variants_upload']['name']), 0, -2) : $_FILES['variants_upload']['name']; + + if (is_array($_FILES['variants_upload']['name'])) { + $filesArr = $_FILES; + $_SESSION['file_upload'] = $_FILES['variants_upload']; + foreach($filesArr['variants_upload']['name'] as $key => $file) { + $_FILES = array('variants_upload' => array('name' => $file, + 'type' => $filesArr['variants_upload']['type'][$key], + 'tmp_name' => $filesArr['variants_upload']['tmp_name'][$key], + 'error' => $filesArr['variants_upload']['error'][$key], + 'size' => $filesArr['variants_upload']['size'][$key])); + // upload the file + $image = new upload('variants_upload', realpath('pub')); + + if ( $image->exists() ) { + if ( $image->parse() && $image->save() ) { + // success + } + } + } } } else if ($Qvariant->value('module') == 'text_field') { $group_title = $Qvariant->value('group_title'); - - if (is_array($_POST['variants'][$Qvariant->valueInt('group_id')])) { - $value_title = current($_POST['variants'][$Qvariant->valueInt('group_id')]); // for text fields - } - } else { $group_title = $Qvariant->value('group_title'); $value_title = $Qvariant->value('value_title'); - } + } $this->_contents[$item_id]['variants'][] = array('group_id' => $Qvariant->valueInt('group_id'), 'value_id' => $Qvariant->valueInt('value_id'), diff --git a/catalog/includes/javascript/general.js.php b/catalog/includes/javascript/general.js.php index 71ce11ff3..a3def95c8 100644 --- a/catalog/includes/javascript/general.js.php +++ b/catalog/includes/javascript/general.js.php @@ -62,37 +62,82 @@ function setMaintenanceMode(s) { } ?> $(":contains('get('out_of_stock')); ?>')").closest('button').removeClass("btn-success").addClass("btn-default"); - - $('.file-inputs').bootstrapFileInput(); - }); +/* FILE UPLOAD VARIANT MODULE */ + $(document).on('change', '.btn-file :file', function() { var input = $(this), numFiles = input.get(0).files ? input.get(0).files.length : 1, - label = input.val().replace(/\\/g, '/').replace(/.*\//, ''); - id = input.attr('id'); - input.trigger('fileselect', [numFiles, label, id]); + label = input.val().replace(/\\/g, '/').replace(/.*\//, ''), + title = input.attr('default').replace(/\\/g, '/').replace(/.*\//, ''), + htitle = input.attr('htitle').replace(/\\/g, '/').replace(/.*\//, ''), + groupID = input.attr('group-id').replace(/\\/g, '/').replace(/.*\//, ''), + valueID = input.attr('value-id').replace(/\\/g, '/').replace(/.*\//, ''), + modifier = input.attr('modifier').replace(/\\/g, '/').replace(/.*\//, ''), + id = input.attr('id').replace(/\\/g, '/').replace(/.*\//, ''); + + newFileRow(numFiles, label, id, title, htitle, groupID, valueID, modifier); +}); + +$(document).ready( function() { + $('.file-inputs').bootstrapFileInput(); + $('.btn-file :file').on('fileselect', function(event, numFiles, label, id, title, htitle, groupID, valueID, modifier) { + newFileRow(numFiles, label, id, title, htitle, groupID, valueID, modifier) + }); }); -$(document).ready( function() { - $('.btn-file :file').on('fileselect', function(event, numFiles, label, id) { +function newFileRow(numFiles, label, id, title, htitle, groupID, valueID, modifier) { + + if (id.indexOf("mupload") != -1) { // multiple file upload + icon = id.replace('_options_mupload_', '_options_remove_'); + icon2 = id.replace('variants_mupload_', 'variants_remove_'); + } else { icon = id.replace('_options_upload_', '_options_remove_'); icon2 = id.replace('variants_upload_', 'variants_remove_'); - if (numFiles > 0) { - $('#' + icon).removeClass('hidden'); - $('#' + icon2).removeClass('hidden'); + } + + if (numFiles > 0) { + $('#' + icon).removeClass('hidden'); + $('#' + icon2).removeClass('hidden'); + $('#' + id).parent('a').removeClass('btn-primary').addClass('btn-success'); + } else { + $('#' + icon).addClass('hidden'); + $('#' + icon2).addClass('hidden'); + $('#' + id).parent('a').removeClass('btn-success').addClass('btn-primary'); + } + + if (id.indexOf("mupload") != -1) { // multiple file upload + var cnt = parseInt(id.split('_').slice(-1)[0]) + 1; + + if (modifier == 'variant') { + var row = '
'+ + ' '+ + ' '+ + ' '+ + ' '+ + '
'; } else { - $('#' + icon).addClass('hidden'); - $('#' + icon2).addClass('hidden'); + var row = '
'+ + ' '+ + '
'; } - }); -}); + $('#file_upload_container').append(row); + $('.file-input-' + cnt).bootstrapFileInput(); + } +}; function removeFileUploadRow(id) { - document.location.href = document.location.href; + var len = $('#file_upload_container div').length; + $('#file_upload_div_' + id).remove(); + if (len == 0) document.location.href = document.location.href; } +/* FILE UPLOAD VARIANT MODULE /EOF */ + $(window).resize(function() { var type = _setMediaType(); diff --git a/catalog/includes/languages/en_US.xml b/catalog/includes/languages/en_US.xml index d8b5ea799..7d222c297 100644 --- a/catalog/includes/languages/en_US.xml +++ b/catalog/includes/languages/en_US.xml @@ -2959,6 +2959,11 @@ Your friend, %s, thought that you would be interested in %s from %s.]]> text_label_file general - + + + text_label_files + + general + \ No newline at end of file diff --git a/catalog/includes/modules/variants/file_upload.php b/catalog/includes/modules/variants/file_upload.php index ac91c9534..464a8b96a 100644 --- a/catalog/includes/modules/variants/file_upload.php +++ b/catalog/includes/modules/variants/file_upload.php @@ -9,7 +9,7 @@ */ class lC_Variants_file_upload extends lC_Variants_Abstract { const ALLOW_MULTIPLE_VALUES = false; - const HAS_CUSTOM_VALUE = false; + const HAS_CUSTOM_VALUE = true; static public function parse($data) { global $lC_Currencies; @@ -33,7 +33,7 @@ static public function parse($data) { ' ' . ' ' . ' ' . - ' ' . + $string .= ' ' . ' ' . '
'; + '
'; reset($data); $cnt = 0; @@ -44,34 +44,34 @@ static public function parse($data) { $group_id = $val['group_id']; $group_title = $val['group_title']; - $string .= '
' . + $string .= '
' . ' ' . + ' ' . + ' ' . + ' ' . '
'; $cnt++; } - $string .= '
' . '
'; } else { - $string = ''; - $i = 0; - + $string = '
'; + $cnt = 0; foreach ( $data['data'] as $field ) { - $i++; - $string .= '
' . - ' ' . - ' ' . - ' ' . - ' ' . + $string .= '
' . + ' ' . + ' ' . + ' ' . + ' ' . '
'; - } + $cnt++; + } + $string .= '
'; } return $string; diff --git a/catalog/includes/modules/variants/multiple_file_upload.php b/catalog/includes/modules/variants/multiple_file_upload.php new file mode 100644 index 000000000..bb4491bbb --- /dev/null +++ b/catalog/includes/modules/variants/multiple_file_upload.php @@ -0,0 +1,88 @@ + $val) { + if (isset($val['group_title']) && empty($val['group_title']) === false) { + $group_title = $val['group_title']; + break; + } + } + + $string = '
' . + ' ' . + ' ' . + ' ' . + ' ' . + ' ' . + '
'; + + reset($data); + $cnt = 0; + foreach($data as $key => $val) { + $price_ind = ((float)$val['price_modifier'] < 0.00) ? '-' : '+'; + $price_formatted = ((float)$val['price_modifier'] != 0.00) ? $price_ind . $lC_Currencies->format(number_format($val['price_modifier'], DECIMAL_PLACES), $lC_Currencies->getCode()) : null; + $options[$val['value_id']] = $val['price_modifier']; + $group_id = $val['group_id']; + $group_title = $val['group_title']; + + $string .= '
' . + ' ' . + '
'; + $cnt++; + } + + $string .= '
' . + '
'; + + } else { + + $string = '
'; + $cnt = 0; + foreach ( $data['data'] as $field ) { + $string .= '
' . + ' ' . + ' ' . + ' ' . + ' ' . + '
'; + $cnt++; + } + $string .= '
'; + } + + return $string; + } + + static public function allowsMultipleValues() { + return self::ALLOW_MULTIPLE_VALUES; + } + + static public function hasCustomValue() { + return self::HAS_CUSTOM_VALUE; + } +} +?> \ No newline at end of file diff --git a/catalog/templates/core/classes/success.php b/catalog/templates/core/classes/success.php index 9e0b3bc35..8081323a1 100644 --- a/catalog/templates/core/classes/success.php +++ b/catalog/templates/core/classes/success.php @@ -118,7 +118,7 @@ public static function getVariants($_pID, $_oID) { if ( $Qvariant->numberOfRows() > 0 ) { while ( $Qvariant->next() ) { - if ($Qvariant->value('module') == 'file_upload') { + if (strstr($Qvariant->value('module'), 'file_upload')) { $Qopv = $lC_Database->query('select opv.value_title from :table_orders_products_variants opv left join :table_orders_products op on (op.orders_products_id = opv.orders_products_id) where opv.orders_id = :orders_id and op.products_id = :products_id and opv.group_title like :group_title limit 1'); $Qopv->bindTable(':table_orders_products_variants', TABLE_ORDERS_PRODUCTS_VARIANTS); $Qopv->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); From 946e58a06610b275dc241766f0abf4a1fa3a625b Mon Sep 17 00:00:00 2001 From: datazen Date: Tue, 24 Jun 2014 09:59:41 -0400 Subject: [PATCH 022/168] merge work --- catalog/includes/classes/shopping_cart.php | 6 ++++-- catalog/includes/javascript/general.js.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/catalog/includes/classes/shopping_cart.php b/catalog/includes/classes/shopping_cart.php index 6c2f1c775..c5ba6597b 100644 --- a/catalog/includes/classes/shopping_cart.php +++ b/catalog/includes/classes/shopping_cart.php @@ -462,7 +462,8 @@ public function add($product_id, $quantity = null) { if (strstr($Qvariants->value('module'), 'file_upload')) { $group_title = (is_array($_FILES['simple_options_upload']['name']) && count($_FILES['simple_options_upload']['name']) > 2) ? $lC_Language->get('text_label_files') : $lC_Language->get('text_label_file'); - $value_title = (is_array($_FILES['simple_options_upload']['name'])) ? substr(implode(', ', $_FILES['simple_options_upload']['name']), 0, -2) : $_FILES['simple_options_upload']['name']; + $value_title = (is_array($_FILES['simple_options_upload']['name'])) ? implode(', ', $_FILES['simple_options_upload']['name']) : $_FILES['simple_options_upload']['name']; + if (substr($value_title, -2) == ', ') $value_title = substr($value_title, 0, -2); if (is_array($_FILES['simple_options_upload']['name'])) { $filesArr = $_FILES; @@ -531,7 +532,8 @@ public function add($product_id, $quantity = null) { if (strstr($Qvariant->value('module'), 'file_upload')) { $group_title = (is_array($_FILES['variants_upload']['name']) && count($_FILES['variants_upload']['name']) > 2) ? $lC_Language->get('text_label_files') : $lC_Language->get('text_label_file'); - $value_title = (is_array($_FILES['variants_upload']['name'])) ? substr(implode(', ', $_FILES['variants_upload']['name']), 0, -2) : $_FILES['variants_upload']['name']; + $value_title = (is_array($_FILES['variants_upload']['name'])) ? implode(', ', $_FILES['variants_upload']['name']) : $_FILES['variants_upload']['name']; + if (substr($value_title, -2) == ', ') $value_title = substr($value_title, 0, -2); if (is_array($_FILES['variants_upload']['name'])) { $filesArr = $_FILES; diff --git a/catalog/includes/javascript/general.js.php b/catalog/includes/javascript/general.js.php index a3def95c8..6a8575177 100644 --- a/catalog/includes/javascript/general.js.php +++ b/catalog/includes/javascript/general.js.php @@ -131,8 +131,8 @@ function newFileRow(numFiles, label, id, title, htitle, groupID, valueID, modifi }; function removeFileUploadRow(id) { - var len = $('#file_upload_container div').length; $('#file_upload_div_' + id).remove(); + var len = $('#file_upload_container div').length; if (len == 0) document.location.href = document.location.href; } From fc6d5d3b204cd51c74093f5bdae44f8930db7055 Mon Sep 17 00:00:00 2001 From: datazen Date: Tue, 24 Jun 2014 10:16:51 -0400 Subject: [PATCH 023/168] updated includes --- .../administrators/administrators.php | 2 +- .../includes/applications/backup/backup.php | 2 +- .../branding_manager/branding_manager.php | 2 +- .../configuration/classes/configuration.php | 2 +- .../configuration/configuration.php | 2 +- .../applications/configuration/pages/main.php | 4 +- .../applications/countries/countries.php | 2 +- .../credit_cards/credit_cards.php | 2 +- .../applications/currencies/currencies.php | 2 +- .../file_manager/file_manager.php | 2 +- .../image_groups/image_groups.php | 2 +- .../applications/languages/languages.php | 4 +- .../applications/orders/classes/orders.php | 45 +++++++++++++++---- .../applications/orders/pages/tabs/status.php | 2 +- .../orders/pages/tabs/summary.php | 2 +- .../orders_status/orders_status.php | 2 +- .../includes/applications/store/store.php | 2 +- .../includes/applications/updates/updates.php | 2 +- 18 files changed, 56 insertions(+), 27 deletions(-) diff --git a/catalog/admin/includes/applications/administrators/administrators.php b/catalog/admin/includes/applications/administrators/administrators.php index f757874e4..578564e21 100644 --- a/catalog/admin/includes/applications/administrators/administrators.php +++ b/catalog/admin/includes/applications/administrators/administrators.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/administrators/classes/administrators.php')); +require_once($lC_Vqmod->modCheck('includes/applications/administrators/classes/administrators.php')); class lC_Application_Administrators extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/backup/backup.php b/catalog/admin/includes/applications/backup/backup.php index 1c85b0d1c..c021ec101 100644 --- a/catalog/admin/includes/applications/backup/backup.php +++ b/catalog/admin/includes/applications/backup/backup.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; - require($lC_Vqmod->modCheck('includes/applications/backup/classes/backup.php')); + require_once($lC_Vqmod->modCheck('includes/applications/backup/classes/backup.php')); class lC_Application_Backup extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/branding_manager/branding_manager.php b/catalog/admin/includes/applications/branding_manager/branding_manager.php index c01e0e043..9a0fc22e1 100644 --- a/catalog/admin/includes/applications/branding_manager/branding_manager.php +++ b/catalog/admin/includes/applications/branding_manager/branding_manager.php @@ -8,7 +8,7 @@ @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt @version $Id: branding_manager.php v1.0 2013-08-08 datazen $ */ -require('includes/applications/branding_manager/classes/branding_manager.php'); +require_once('includes/applications/branding_manager/classes/branding_manager.php'); class lC_Application_Branding_manager extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/configuration/classes/configuration.php b/catalog/admin/includes/applications/configuration/classes/configuration.php index dca51595b..d1490dc7f 100755 --- a/catalog/admin/includes/applications/configuration/classes/configuration.php +++ b/catalog/admin/includes/applications/configuration/classes/configuration.php @@ -243,7 +243,7 @@ public static function drawMenu() { } return $menu; - } + } diff --git a/catalog/admin/includes/applications/configuration/configuration.php b/catalog/admin/includes/applications/configuration/configuration.php index c6ae1d8e7..10d7180ed 100644 --- a/catalog/admin/includes/applications/configuration/configuration.php +++ b/catalog/admin/includes/applications/configuration/configuration.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/configuration/classes/configuration.php')); +require_once($lC_Vqmod->modCheck('includes/applications/configuration/classes/configuration.php')); class lC_Application_Configuration extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/configuration/pages/main.php b/catalog/admin/includes/applications/configuration/pages/main.php index b67a5a9a7..9759d4a12 100644 --- a/catalog/admin/includes/applications/configuration/pages/main.php +++ b/catalog/admin/includes/applications/configuration/pages/main.php @@ -21,8 +21,8 @@ .dataColAction { text-align: right; } .store-type-selected{ color: #ff9f00 !important; font-size: 1.2em; } -
- +
+
diff --git a/catalog/admin/includes/applications/countries/countries.php b/catalog/admin/includes/applications/countries/countries.php index 128b3b4ec..fa77c03c3 100644 --- a/catalog/admin/includes/applications/countries/countries.php +++ b/catalog/admin/includes/applications/countries/countries.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/countries/classes/countries.php')); +require_once($lC_Vqmod->modCheck('includes/applications/countries/classes/countries.php')); class lC_Application_Countries extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/credit_cards/credit_cards.php b/catalog/admin/includes/applications/credit_cards/credit_cards.php index edb24800d..25dbee79a 100644 --- a/catalog/admin/includes/applications/credit_cards/credit_cards.php +++ b/catalog/admin/includes/applications/credit_cards/credit_cards.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/credit_cards/classes/credit_cards.php')); +require_once($lC_Vqmod->modCheck('includes/applications/credit_cards/classes/credit_cards.php')); class lC_Application_Credit_cards extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/currencies/currencies.php b/catalog/admin/includes/applications/currencies/currencies.php index a0112aed4..3fc9c3733 100644 --- a/catalog/admin/includes/applications/currencies/currencies.php +++ b/catalog/admin/includes/applications/currencies/currencies.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/currencies/classes/currencies.php')); +require_once($lC_Vqmod->modCheck('includes/applications/currencies/classes/currencies.php')); class lC_Application_Currencies extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/file_manager/file_manager.php b/catalog/admin/includes/applications/file_manager/file_manager.php index a71bcf386..1494e040c 100644 --- a/catalog/admin/includes/applications/file_manager/file_manager.php +++ b/catalog/admin/includes/applications/file_manager/file_manager.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/file_manager/classes/file_manager.php')); +require_once($lC_Vqmod->modCheck('includes/applications/file_manager/classes/file_manager.php')); define('LC_ADMIN_FILE_MANAGER_ROOT_PATH', realpath('../')); diff --git a/catalog/admin/includes/applications/image_groups/image_groups.php b/catalog/admin/includes/applications/image_groups/image_groups.php index 66abc4755..18b0ff66e 100644 --- a/catalog/admin/includes/applications/image_groups/image_groups.php +++ b/catalog/admin/includes/applications/image_groups/image_groups.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/image_groups/classes/image_groups.php')); +require_once($lC_Vqmod->modCheck('includes/applications/image_groups/classes/image_groups.php')); class lC_Application_Image_groups extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/languages/languages.php b/catalog/admin/includes/applications/languages/languages.php index bcca6f94f..e768f0f20 100644 --- a/catalog/admin/includes/applications/languages/languages.php +++ b/catalog/admin/includes/applications/languages/languages.php @@ -10,8 +10,8 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/languages/classes/languages.php')); -require($lC_Vqmod->modCheck('includes/applications/currencies/classes/currencies.php')); +require_once($lC_Vqmod->modCheck('includes/applications/languages/classes/languages.php')); +require_once($lC_Vqmod->modCheck('includes/applications/currencies/classes/currencies.php')); class lC_Application_Languages extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/orders/classes/orders.php b/catalog/admin/includes/applications/orders/classes/orders.php index baa0b0380..b6b96ba6d 100644 --- a/catalog/admin/includes/applications/orders/classes/orders.php +++ b/catalog/admin/includes/applications/orders/classes/orders.php @@ -463,16 +463,18 @@ public static function getInfo($id) { $result['orderStatusHistoryData'] = ''; $oshcnt = 0; foreach ( $lC_Order->getStatusHistory() as $status_history ) { + $result['orderStatusHistory'] .= ' ' . lC_DateTime::getShort($status_history['date_added'], true) . ' ' . $status_history['status'] . ' - ' . nl2br($status_history['comment']) . ' + ' . (substr($status_history['comment'], 0, 1) == '<') ? $status_history['comment'] : nl2br($status_history['comment']) . ' '; + // enhanced order admin additions $result['orderStatusHistoryData'][$oshcnt]['date_added'] = lC_DateTime::getShort($status_history['date_added'], false); $result['orderStatusHistoryData'][$oshcnt]['status'] = $status_history['status']; - $result['orderStatusHistoryData'][$oshcnt]['comment'] = nl2br($status_history['comment']); + $result['orderStatusHistoryData'][$oshcnt]['comment'] = (substr($status_history['comment'], 0, 1) == '<') ? $status_history['comment'] : nl2br($status_history['comment']); $result['orderStatusHistoryData'][$oshcnt]['customer_notified'] = $status_history['customer_notified']; $result['orderStatusHistoryData'][$oshcnt]['admin_name'] = $status_history['admin_name']; $result['orderStatusHistoryData'][$oshcnt]['admin_image'] = $status_history['admin_image']; @@ -653,11 +655,14 @@ private static function _updateStatus($id, $data) { // build and return the udpated status history $history = ''; $result = array(); + foreach ( $lC_Order->getStatusHistory() as $status_history ) { + + $history .= ' ' . lC_DateTime::getShort($status_history['date_added'], true) . ' ' . $status_history['status'] . ' - ' . nl2br($status_history['comment']) . ' + ' . (substr($status_history['comment'], 0, 1) == '<') ? $status_history['comment'] : nl2br($status_history['comment']) . ' '; } @@ -705,13 +710,25 @@ public static function getOrderComments($id = null) { if (is_array($data['orderStatusHistoryData'])) { foreach ($data['orderStatusHistoryData'] as $oshData) { if ($oshData['comment'] != '') { + + $tagColor = ' green-bg'; + $tagText = $lC_Language->get('text_order_comment'); + + if ($oshData['admin_id'] != null) { + $tagColor = ($oshData['append_comment'] == 1) ? ' orange-bg' : ' anthracite-bg'; + $tagText = (($oshData['append_comment'] == 1) ? $lC_Language->get('text_customer_message') : $lC_Language->get('text_admin_note')); + } else if (strstr($oshData['comment'], 'icon-newspaper')) { // is a file upload + $tagColor = ' blue-bg'; + $tagText = $lC_Language->get('text_files_uploaded'); + } + $ocData .= '
- ' . (($oshData['admin_id'] == null) ? $lC_Language->get('text_order_comment') : (($oshData['append_comment'] == 1) ? $lC_Language->get('text_customer_message') : $lC_Language->get('text_admin_note'))) . ' + ' . $tagText . ' - ' . (($oshData['admin_image'] != '' && file_exists('images/avatar/' . $oshData['admin_image'])) ? 'Comment by ' . $oshData['admin_name'] . '' : '') . ' + ' . (($oshData['admin_image'] != '' && file_exists('images/avatar/' . $oshData['admin_image'])) ? '' . $lC_Language->get('text_comment_by') . ' ' . $oshData['admin_name'] . '' : '') . ' - ' . (($oshData['admin_id'] != null) ? $oshData['admin_name'] : $lC_Language->get('text_customer_comment')) . '' . $oshData['date_added'] . '(' . $oshData['status'] . ') + ' . (($oshData['admin_id'] != null) ? $oshData['admin_name'] : $lC_Language->get('text_customer_comment')) . '' . $oshData['date_added'] . '' . (($oshData['status'] != null) ? '(' . $oshData['status'] . ')' : '') . '

' . $oshData['comment'] . '

'; @@ -734,13 +751,25 @@ public static function getOrderStatusHistory($id = null) { if (is_array($data['orderStatusHistoryData'])) { foreach ($data['orderStatusHistoryData'] as $oshData) { + + $tagColor = ' green-bg'; + $tagText = $lC_Language->get('text_order_comment'); + + if ($oshData['admin_id'] != null) { + $tagColor = ($oshData['append_comment'] == 1) ? ' orange-bg' : ' anthracite-bg'; + $tagText = (($oshData['append_comment'] == 1) ? $lC_Language->get('text_customer_message') : $lC_Language->get('text_admin_note')); + } else if (strstr($oshData['comment'], 'icon-newspaper')) { // is a file upload + $tagColor = ' blue-bg'; + $tagText = $lC_Language->get('text_files_uploaded'); + } + $osHistory .= '
- ' . (($oshData['admin_id'] == null) ? $lC_Language->get('text_order_comment') : (($oshData['append_comment'] == 1) ? $lC_Language->get('text_customer_message') : $lC_Language->get('text_admin_note'))) . ' + ' . $tagText . ' ' . (($oshData['admin_image'] != '' && file_exists('images/avatar/' . $oshData['admin_image'])) ? 'Comment by ' . $oshData['admin_name'] . '' : '') . ' - ' . $oshData['admin_name'] . '' . $oshData['date_added'] . '(' . $oshData['status'] . ') + ' . $oshData['admin_name'] . '' . $oshData['date_added'] . '' . (($oshData['status'] != null) ? '(' . $oshData['status'] . ')' : '') . '

' . $oshData['comment'] . '

'; diff --git a/catalog/admin/includes/applications/orders/pages/tabs/status.php b/catalog/admin/includes/applications/orders/pages/tabs/status.php index 88a585039..4e3af1aa4 100644 --- a/catalog/admin/includes/applications/orders/pages/tabs/status.php +++ b/catalog/admin/includes/applications/orders/pages/tabs/status.php @@ -12,6 +12,6 @@ \ No newline at end of file diff --git a/catalog/admin/includes/applications/orders/pages/tabs/summary.php b/catalog/admin/includes/applications/orders/pages/tabs/summary.php index fe101cbef..9a1456c0d 100644 --- a/catalog/admin/includes/applications/orders/pages/tabs/summary.php +++ b/catalog/admin/includes/applications/orders/pages/tabs/summary.php @@ -310,7 +310,7 @@ - get('oID')); ?> + get('oID')); ?>
diff --git a/catalog/admin/includes/applications/orders_status/orders_status.php b/catalog/admin/includes/applications/orders_status/orders_status.php index 98a2eb3d3..40c5dbce9 100644 --- a/catalog/admin/includes/applications/orders_status/orders_status.php +++ b/catalog/admin/includes/applications/orders_status/orders_status.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/orders_status/classes/orders_status.php')); +require_once($lC_Vqmod->modCheck('includes/applications/orders_status/classes/orders_status.php')); class lC_Application_Orders_status extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/store/store.php b/catalog/admin/includes/applications/store/store.php index 859fd74b9..629f821e8 100644 --- a/catalog/admin/includes/applications/store/store.php +++ b/catalog/admin/includes/applications/store/store.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/store/classes/store.php')); +require_once($lC_Vqmod->modCheck('includes/applications/store/classes/store.php')); class lC_Application_Store extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/updates/updates.php b/catalog/admin/includes/applications/updates/updates.php index 4772c7dc8..875211b58 100644 --- a/catalog/admin/includes/applications/updates/updates.php +++ b/catalog/admin/includes/applications/updates/updates.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/updates/classes/updates.php')); +require_once($lC_Vqmod->modCheck('includes/applications/updates/classes/updates.php')); class lC_Application_Updates extends lC_Template_Admin { /* From 8acb8d9bfd4dd6bb732040f1aea784a07e57c384 Mon Sep 17 00:00:00 2001 From: datazen Date: Tue, 24 Jun 2014 10:17:11 -0400 Subject: [PATCH 024/168] merge work --- .../includes/applications/administrators/administrators.php | 2 +- catalog/admin/includes/applications/backup/backup.php | 2 +- .../applications/branding_manager/branding_manager.php | 2 +- .../includes/applications/configuration/configuration.php | 2 +- catalog/admin/includes/applications/countries/countries.php | 2 +- .../admin/includes/applications/credit_cards/credit_cards.php | 2 +- catalog/admin/includes/applications/currencies/currencies.php | 2 +- .../admin/includes/applications/file_manager/file_manager.php | 2 +- .../admin/includes/applications/image_groups/image_groups.php | 2 +- catalog/admin/includes/applications/languages/languages.php | 4 ++-- .../includes/applications/orders_status/orders_status.php | 2 +- catalog/admin/includes/applications/store/store.php | 2 +- catalog/admin/includes/applications/updates/updates.php | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/catalog/admin/includes/applications/administrators/administrators.php b/catalog/admin/includes/applications/administrators/administrators.php index f757874e4..578564e21 100644 --- a/catalog/admin/includes/applications/administrators/administrators.php +++ b/catalog/admin/includes/applications/administrators/administrators.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/administrators/classes/administrators.php')); +require_once($lC_Vqmod->modCheck('includes/applications/administrators/classes/administrators.php')); class lC_Application_Administrators extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/backup/backup.php b/catalog/admin/includes/applications/backup/backup.php index 1c85b0d1c..c021ec101 100644 --- a/catalog/admin/includes/applications/backup/backup.php +++ b/catalog/admin/includes/applications/backup/backup.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; - require($lC_Vqmod->modCheck('includes/applications/backup/classes/backup.php')); + require_once($lC_Vqmod->modCheck('includes/applications/backup/classes/backup.php')); class lC_Application_Backup extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/branding_manager/branding_manager.php b/catalog/admin/includes/applications/branding_manager/branding_manager.php index c01e0e043..9a0fc22e1 100644 --- a/catalog/admin/includes/applications/branding_manager/branding_manager.php +++ b/catalog/admin/includes/applications/branding_manager/branding_manager.php @@ -8,7 +8,7 @@ @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt @version $Id: branding_manager.php v1.0 2013-08-08 datazen $ */ -require('includes/applications/branding_manager/classes/branding_manager.php'); +require_once('includes/applications/branding_manager/classes/branding_manager.php'); class lC_Application_Branding_manager extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/configuration/configuration.php b/catalog/admin/includes/applications/configuration/configuration.php index c6ae1d8e7..10d7180ed 100644 --- a/catalog/admin/includes/applications/configuration/configuration.php +++ b/catalog/admin/includes/applications/configuration/configuration.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/configuration/classes/configuration.php')); +require_once($lC_Vqmod->modCheck('includes/applications/configuration/classes/configuration.php')); class lC_Application_Configuration extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/countries/countries.php b/catalog/admin/includes/applications/countries/countries.php index 128b3b4ec..fa77c03c3 100644 --- a/catalog/admin/includes/applications/countries/countries.php +++ b/catalog/admin/includes/applications/countries/countries.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/countries/classes/countries.php')); +require_once($lC_Vqmod->modCheck('includes/applications/countries/classes/countries.php')); class lC_Application_Countries extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/credit_cards/credit_cards.php b/catalog/admin/includes/applications/credit_cards/credit_cards.php index edb24800d..25dbee79a 100644 --- a/catalog/admin/includes/applications/credit_cards/credit_cards.php +++ b/catalog/admin/includes/applications/credit_cards/credit_cards.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/credit_cards/classes/credit_cards.php')); +require_once($lC_Vqmod->modCheck('includes/applications/credit_cards/classes/credit_cards.php')); class lC_Application_Credit_cards extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/currencies/currencies.php b/catalog/admin/includes/applications/currencies/currencies.php index a0112aed4..3fc9c3733 100644 --- a/catalog/admin/includes/applications/currencies/currencies.php +++ b/catalog/admin/includes/applications/currencies/currencies.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/currencies/classes/currencies.php')); +require_once($lC_Vqmod->modCheck('includes/applications/currencies/classes/currencies.php')); class lC_Application_Currencies extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/file_manager/file_manager.php b/catalog/admin/includes/applications/file_manager/file_manager.php index a71bcf386..1494e040c 100644 --- a/catalog/admin/includes/applications/file_manager/file_manager.php +++ b/catalog/admin/includes/applications/file_manager/file_manager.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/file_manager/classes/file_manager.php')); +require_once($lC_Vqmod->modCheck('includes/applications/file_manager/classes/file_manager.php')); define('LC_ADMIN_FILE_MANAGER_ROOT_PATH', realpath('../')); diff --git a/catalog/admin/includes/applications/image_groups/image_groups.php b/catalog/admin/includes/applications/image_groups/image_groups.php index 66abc4755..18b0ff66e 100644 --- a/catalog/admin/includes/applications/image_groups/image_groups.php +++ b/catalog/admin/includes/applications/image_groups/image_groups.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/image_groups/classes/image_groups.php')); +require_once($lC_Vqmod->modCheck('includes/applications/image_groups/classes/image_groups.php')); class lC_Application_Image_groups extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/languages/languages.php b/catalog/admin/includes/applications/languages/languages.php index bcca6f94f..e768f0f20 100644 --- a/catalog/admin/includes/applications/languages/languages.php +++ b/catalog/admin/includes/applications/languages/languages.php @@ -10,8 +10,8 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/languages/classes/languages.php')); -require($lC_Vqmod->modCheck('includes/applications/currencies/classes/currencies.php')); +require_once($lC_Vqmod->modCheck('includes/applications/languages/classes/languages.php')); +require_once($lC_Vqmod->modCheck('includes/applications/currencies/classes/currencies.php')); class lC_Application_Languages extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/orders_status/orders_status.php b/catalog/admin/includes/applications/orders_status/orders_status.php index 98a2eb3d3..40c5dbce9 100644 --- a/catalog/admin/includes/applications/orders_status/orders_status.php +++ b/catalog/admin/includes/applications/orders_status/orders_status.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/orders_status/classes/orders_status.php')); +require_once($lC_Vqmod->modCheck('includes/applications/orders_status/classes/orders_status.php')); class lC_Application_Orders_status extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/store/store.php b/catalog/admin/includes/applications/store/store.php index 859fd74b9..629f821e8 100644 --- a/catalog/admin/includes/applications/store/store.php +++ b/catalog/admin/includes/applications/store/store.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/store/classes/store.php')); +require_once($lC_Vqmod->modCheck('includes/applications/store/classes/store.php')); class lC_Application_Store extends lC_Template_Admin { /* diff --git a/catalog/admin/includes/applications/updates/updates.php b/catalog/admin/includes/applications/updates/updates.php index 4772c7dc8..875211b58 100644 --- a/catalog/admin/includes/applications/updates/updates.php +++ b/catalog/admin/includes/applications/updates/updates.php @@ -10,7 +10,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('includes/applications/updates/classes/updates.php')); +require_once($lC_Vqmod->modCheck('includes/applications/updates/classes/updates.php')); class lC_Application_Updates extends lC_Template_Admin { /* From 6dbcad00b7ef2cc31e88db907357feda29171918 Mon Sep 17 00:00:00 2001 From: datazen Date: Tue, 24 Jun 2014 15:54:42 -0400 Subject: [PATCH 025/168] merge work --- .../applications/orders/classes/orders.php | 4 ++-- catalog/includes/classes/shopping_cart.php | 8 +++++-- catalog/includes/javascript/general.js.php | 24 +++++++++---------- .../includes/modules/variants/file_upload.php | 17 ++++++------- .../modules/variants/multiple_file_upload.php | 17 ++++++------- .../checkout/checkout_confirmation.php | 4 ++-- .../content/checkout/checkout_success.php | 4 ++-- .../core/content/checkout/shopping_cart.php | 4 ++-- 8 files changed, 44 insertions(+), 38 deletions(-) diff --git a/catalog/admin/includes/applications/orders/classes/orders.php b/catalog/admin/includes/applications/orders/classes/orders.php index b6b96ba6d..684451cda 100644 --- a/catalog/admin/includes/applications/orders/classes/orders.php +++ b/catalog/admin/includes/applications/orders/classes/orders.php @@ -390,13 +390,13 @@ public static function getInfo($id) { ' . $products['name']; if ( isset($products['attributes']) && is_array($products['attributes']) && ( sizeof($products['attributes']) > 0 ) ) { foreach ( $products['attributes'] as $attributes ) { - $result['orderProducts'] .= '
  - ' . $attributes['option'] . ': ' . $attributes['value'] . ''; + if ($attributes['option'] != '') $result['orderProducts'] .= '
  - ' . $attributes['option'] . ': ' . $attributes['value'] . ''; } } if ( isset($products['options']) && is_array($products['options']) && ( sizeof($products['options']) > 0 ) ) { foreach ( $products['options'] as $key => $val ) { - $result['orderProducts'] .= '
  - ' . $val['group_title'] . ': ' . $val['value_title'] . ''; + if ($val['group_title'] != '') $result['orderProducts'] .= '
  - ' . $val['group_title'] . ': ' . $val['value_title'] . ''; } } diff --git a/catalog/includes/classes/shopping_cart.php b/catalog/includes/classes/shopping_cart.php index c5ba6597b..f6f877d9b 100644 --- a/catalog/includes/classes/shopping_cart.php +++ b/catalog/includes/classes/shopping_cart.php @@ -463,11 +463,15 @@ public function add($product_id, $quantity = null) { $group_title = (is_array($_FILES['simple_options_upload']['name']) && count($_FILES['simple_options_upload']['name']) > 2) ? $lC_Language->get('text_label_files') : $lC_Language->get('text_label_file'); $value_title = (is_array($_FILES['simple_options_upload']['name'])) ? implode(', ', $_FILES['simple_options_upload']['name']) : $_FILES['simple_options_upload']['name']; - if (substr($value_title, -2) == ', ') $value_title = substr($value_title, 0, -2); + if (substr($value_title, -2) == ', ') $value_title = substr($value_title, 0, -2); + $value_title = str_replace(', ,', ', ', $value_title); + + if ($value_title == '') $group_title = ''; if (is_array($_FILES['simple_options_upload']['name'])) { $filesArr = $_FILES; $_SESSION['file_upload'] = $_FILES['simple_options_upload']; + foreach($filesArr['simple_options_upload']['name'] as $key => $file) { $_FILES = array('simple_options_upload' => array('name' => $file, 'type' => $filesArr['simple_options_upload']['type'][$key], @@ -482,7 +486,7 @@ public function add($product_id, $quantity = null) { // success } } - } + } } } else if ($Qvariants->value('module') == 'text_field') { diff --git a/catalog/includes/javascript/general.js.php b/catalog/includes/javascript/general.js.php index 6a8575177..f235ca068 100644 --- a/catalog/includes/javascript/general.js.php +++ b/catalog/includes/javascript/general.js.php @@ -100,39 +100,39 @@ function newFileRow(numFiles, label, id, title, htitle, groupID, valueID, modifi if (numFiles > 0) { $('#' + icon).removeClass('hidden'); $('#' + icon2).removeClass('hidden'); - $('#' + id).parent('a').removeClass('btn-primary').addClass('btn-success'); + $('#' + id).parent('a').removeClass('btn-primary').addClass('btn-success').addClass('disabled').attr('onclick', 'return false;'); } else { $('#' + icon).addClass('hidden'); $('#' + icon2).addClass('hidden'); - $('#' + id).parent('a').removeClass('btn-success').addClass('btn-primary'); + $('#' + id).parent('a').removeClass('btn-success').addClass('btn-primary').removeClass('disabled').removeAttr('onclick'); } if (id.indexOf("mupload") != -1) { // multiple file upload var cnt = parseInt(id.split('_').slice(-1)[0]) + 1; if (modifier == 'variant') { - var row = '
'+ + var row = '
'+ ' '+ - ' '+ + ' '+ ' '+ - ' '+ + ' '+ '
'; } else { - var row = '
'+ + var row = '
'+ ' '+ + ''+ '
'; } - $('#file_upload_container').append(row); - $('.file-input-' + cnt).bootstrapFileInput(); + $('#file_upload_container_' + groupID).append(row); + $('.file-input-' + groupID + '_' + valueID + '_' + cnt).bootstrapFileInput(); } }; function removeFileUploadRow(id) { - $('#file_upload_div_' + id).remove(); - var len = $('#file_upload_container div').length; + $('#' + id).remove(); + var len = $('*').hasClass('file-inputs'); if (len == 0) document.location.href = document.location.href; } diff --git a/catalog/includes/modules/variants/file_upload.php b/catalog/includes/modules/variants/file_upload.php index 464a8b96a..2912ba915 100644 --- a/catalog/includes/modules/variants/file_upload.php +++ b/catalog/includes/modules/variants/file_upload.php @@ -25,6 +25,7 @@ static public function parse($data) { foreach($data as $key => $val) { if (isset($val['group_title']) && empty($val['group_title']) === false) { $group_title = $val['group_title']; + $group_id = $val['group_id']; break; } } @@ -33,7 +34,7 @@ static public function parse($data) { ' ' . ' ' . ' ' . - ' '; + $comment = ''; + $usage = ''; + $action = ''; + + $result['aaData'][] = array("$title", "$comment", "$usage", "$action"); + $result['entries'][] = $Qclasses->toArray(); + } + + $Qclasses->freeResult(); + + return $result; + } + /* + * Return the data used on the dialog forms + * + * @param integer $id The customer groups id + * @param boolean $edit True = called from edit dialog else called from delete dialog + * @access public + * @return array + */ + public static function getFormData($id = null, $edit = false) { + global $lC_Database, $lC_Language; + + $result = array(); + if (isset($id) && $id != null) { + if ($edit === true) { + $Qclasses = $lC_Database->query('select language_id, name, comment from :table_product_classes where id = :id'); + $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qclasses->bindInt(':id', $id); + $Qclasses->execute(); + + $status_name = array(); + $result['editComment'] = ''; + while ( $Qclasses->next() ) { + $status_name[$Qclasses->valueInt('language_id')] = $Qclasses->value('name'); + $result['editComment'] = $Qclasses->value('comment'); + } + $result['editNames'] = ''; + foreach ( $lC_Language->getAll() as $l ) { + $result['editNames'] .= '' . lc_draw_input_field('name[' . $l['id'] . ']', (isset($status_name[$l['id']]) ? $status_name[$l['id']] : null), 'class="input-unstyled"') . '
'; + } + } else { + $Qclasses = $lC_Database->query('select count(*) as total from :table_products where product_class_id = :product_class_id'); + $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qclasses->bindInt(':product_class_id', $id); + $Qclasses->execute(); + + if ( $Qclasses->valueInt('total') > 0 ) { + $result['totalProducts'] = $Qclasses->valueInt('total'); + $result['rpcStatus'] = -2; + } + } + } else { + $result['names'] = ''; + foreach ( $lC_Language->getAll() as $l ) { + $result['names'] .= '' . lc_draw_input_field('name[' . $l['id'] . ']', null, 'class="input-unstyled"') . '
'; + } + } + + return $result; + } + /* + * Get the customer group information + * + * @param integer $id The customer group id + * @access public + * @return array + */ + public static function getData($id) { + global $lC_Database, $lC_Language; + + $Qclasses = $lC_Database->query('select* from :table_product_classes where id = :id and language_id = :language_id order by name'); + $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qclasses->bindInt(':id', $id); + $Qclasses->bindInt(':language_id', $lC_Language->getID()); + + $data = $Qclasses->toArray(); + + $Qclasses->freeResult(); + + return $data; + } + /* + * Save the customer group information + * + * @param integer $id The customer group id used on update, null on insert + * @param array $data An array containing the customer group information + * @param boolean $default True = set the customer group to be the default + * @access public + * @return boolean + */ + public static function save($id = null, $data, $default = false) { + global $lC_Database, $lC_Language; + + $error = false; + + $lC_Database->startTransaction(); + + if ( is_numeric($id) ) { + $product_class_id = $id; + } else { + $Qpc = $lC_Database->query('select max(id) as product_class_id from :table_product_classes'); + $Qpc->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qpc->execute(); + + $product_class_id = $Qpc->valueInt('product_class_id') + 1; + } + + foreach ( $lC_Language->getAll() as $l ) { + if ( is_numeric($id) ) { + $Qpc = $lC_Database->query('update :table_product_classes set name = :name, comment = :comment where id = :id and language_id = :language_id'); + } else { + $Qpc = $lC_Database->query('insert into :table_product_classes (name, comment, language_id) values (:name, :comment, :language_id)'); + } + + $Qpc->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qpc->bindInt(':id', $product_class_id); + $Qpc->bindValue(':name', $data['name'][$l['id']]); + $Qpc->bindValue(':comment', $data['comment']); + $Qpc->bindInt(':language_id', $l['id']); + $Qpc->setLogging($_SESSION['module'], $product_class_id); + $Qpc->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + break; + } + } + + if ( $error === false ) { + if ( $default === true ) { + $Qupdate = $lC_Database->query('update :table_configuration set configuration_value = :configuration_value where configuration_key = :configuration_key'); + $Qupdate->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qupdate->bindInt(':configuration_value', $product_class_id); + $Qupdate->bindValue(':configuration_key', 'DEFAULT_PRODUCT_CLASSES_ID'); + $Qupdate->setLogging($_SESSION['module'], $product_class_id); + $Qupdate->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + } + } + } + + if ( $error === false ) { + $lC_Database->commitTransaction(); + + if ( $default === true ) { + lC_Cache::clear('configuration'); + } + + return true; + } + + $lC_Database->rollbackTransaction(); + + return false; + } + /* + * Delete the customer group record + * + * @param integer $id The customer group id to delete + * @access public + * @return boolean + */ + public static function delete($id) { + global $lC_Database; + + $Qclasses = $lC_Database->query('delete from :table_product_classes where id = :id'); + $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qclasses->bindInt(':id', $id); + $Qclasses->setLogging($_SESSION['module'], $id); + $Qclasses->execute(); + + if ( $lC_Database->isError() ) { + return false; + } + + return true; + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php new file mode 100644 index 000000000..c418dc4ef --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php @@ -0,0 +1,78 @@ + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php new file mode 100644 index 000000000..faf5f69e2 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php @@ -0,0 +1,39 @@ + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php new file mode 100644 index 000000000..6895ceaa9 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php @@ -0,0 +1,94 @@ + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php new file mode 100644 index 000000000..33b2e1160 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php @@ -0,0 +1,117 @@ + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php new file mode 100644 index 000000000..c9f8bede6 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php @@ -0,0 +1,115 @@ + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php new file mode 100644 index 000000000..9836d1d27 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php @@ -0,0 +1,60 @@ + + +
+ +
+

getPageTitle(); ?>

+
+ +
+ +
'; + '
'; reset($data); $cnt = 0; @@ -44,11 +45,11 @@ static public function parse($data) { $group_id = $val['group_id']; $group_title = $val['group_title']; - $string .= '
' . + $string .= '
' . ' ' . + ' ' . '
'; $cnt++; } @@ -60,14 +61,14 @@ static public function parse($data) { } else { - $string = '
'; + $string = '
'; $cnt = 0; foreach ( $data['data'] as $field ) { - $string .= '
' . + $string .= '
' . ' ' . - ' ' . + ' ' . ' ' . - ' ' . + ' ' . '
'; $cnt++; } diff --git a/catalog/includes/modules/variants/multiple_file_upload.php b/catalog/includes/modules/variants/multiple_file_upload.php index bb4491bbb..3411d75d3 100644 --- a/catalog/includes/modules/variants/multiple_file_upload.php +++ b/catalog/includes/modules/variants/multiple_file_upload.php @@ -25,6 +25,7 @@ static public function parse($data) { foreach($data as $key => $val) { if (isset($val['group_title']) && empty($val['group_title']) === false) { $group_title = $val['group_title']; + $group_id = $val['group_id']; break; } } @@ -33,7 +34,7 @@ static public function parse($data) { ' ' . ' ' . ' ' . - ' ' . "\n"; diff --git a/catalog/templates/core/content/checkout/checkout_success.php b/catalog/templates/core/content/checkout/checkout_success.php index 54c821e4d..fab03b6db 100644 --- a/catalog/templates/core/content/checkout/checkout_success.php +++ b/catalog/templates/core/content/checkout/checkout_success.php @@ -91,12 +91,12 @@ } if ( lC_Success::isVariant($products['id']) === true ) { foreach ( lC_Success::getVariants($products['id'], $oID) as $variant) { - echo '
- ' . $variant['group_title'] . ': ' . $variant['value_title'] . '
' . "\n"; + if ($variant['group_title'] != '') echo '
- ' . $variant['group_title'] . ': ' . $variant['value_title'] . '
' . "\n"; } } if ( is_array($products['options']) && empty($products['options']) === false ) { foreach ( $products['options'] as $key => $option) { - echo '
- ' . $option['group_title'] . ': ' . $option['value_title'] . '
' . "\n"; + if ($option['group_title'] != '') echo '
- ' . $option['group_title'] . ': ' . $option['value_title'] . '
' . "\n"; } } echo '' . "\n"; diff --git a/catalog/templates/core/content/checkout/shopping_cart.php b/catalog/templates/core/content/checkout/shopping_cart.php index f1fc329b4..be1526fbc 100644 --- a/catalog/templates/core/content/checkout/shopping_cart.php +++ b/catalog/templates/core/content/checkout/shopping_cart.php @@ -64,13 +64,13 @@ } if ( $lC_ShoppingCart->isVariant($products['item_id']) ) { foreach ( $lC_ShoppingCart->getVariant($products['item_id']) as $variant) { - echo '
- ' . $variant['group_title'] . ': ' . $variant['value_title'] . '
' . "\n"; + if ($variant['group_title'] != '') echo '
- ' . $variant['group_title'] . ': ' . $variant['value_title'] . '
' . "\n"; } } if ( $lC_ShoppingCart->hasSimpleOptions($products['item_id']) ) { foreach ( $lC_ShoppingCart->getSimpleOptions($products['item_id']) as $option) { $mod_price = (($option['price_modifier'] > 0) ? '+' . $option['price_modifier'] : (($option['price_modifier'] == 0) ? null : $option['price_modifier'])); - echo '
- ' . $option['group_title'] . ': ' . $option['value_title'] . ' ' . $mod_price . '
' . "\n"; + if ($option['group_title'] != '') echo '
- ' . $option['group_title'] . ': ' . $option['value_title'] . ' ' . $mod_price . '
' . "\n"; } } echo '' . "\n"; From 33363975f4a3803dd6a68de13dc3b2f37b2889a1 Mon Sep 17 00:00:00 2001 From: datazen Date: Tue, 24 Jun 2014 16:40:13 -0400 Subject: [PATCH 026/168] merge work --- catalog/includes/javascript/general.js.php | 74 --------------- .../includes/modules/variants/file_upload.php | 89 ------------------- .../modules/variants/multiple_file_upload.php | 89 ------------------- 3 files changed, 252 deletions(-) delete mode 100644 catalog/includes/modules/variants/file_upload.php delete mode 100644 catalog/includes/modules/variants/multiple_file_upload.php diff --git a/catalog/includes/javascript/general.js.php b/catalog/includes/javascript/general.js.php index f235ca068..2c7db3cca 100644 --- a/catalog/includes/javascript/general.js.php +++ b/catalog/includes/javascript/general.js.php @@ -64,80 +64,6 @@ function setMaintenanceMode(s) { $(":contains('get('out_of_stock')); ?>')").closest('button').removeClass("btn-success").addClass("btn-default"); }); -/* FILE UPLOAD VARIANT MODULE */ - -$(document).on('change', '.btn-file :file', function() { - var input = $(this), - numFiles = input.get(0).files ? input.get(0).files.length : 1, - label = input.val().replace(/\\/g, '/').replace(/.*\//, ''), - title = input.attr('default').replace(/\\/g, '/').replace(/.*\//, ''), - htitle = input.attr('htitle').replace(/\\/g, '/').replace(/.*\//, ''), - groupID = input.attr('group-id').replace(/\\/g, '/').replace(/.*\//, ''), - valueID = input.attr('value-id').replace(/\\/g, '/').replace(/.*\//, ''), - modifier = input.attr('modifier').replace(/\\/g, '/').replace(/.*\//, ''), - id = input.attr('id').replace(/\\/g, '/').replace(/.*\//, ''); - - newFileRow(numFiles, label, id, title, htitle, groupID, valueID, modifier); -}); - -$(document).ready( function() { - $('.file-inputs').bootstrapFileInput(); - $('.btn-file :file').on('fileselect', function(event, numFiles, label, id, title, htitle, groupID, valueID, modifier) { - newFileRow(numFiles, label, id, title, htitle, groupID, valueID, modifier) - }); -}); - -function newFileRow(numFiles, label, id, title, htitle, groupID, valueID, modifier) { - - if (id.indexOf("mupload") != -1) { // multiple file upload - icon = id.replace('_options_mupload_', '_options_remove_'); - icon2 = id.replace('variants_mupload_', 'variants_remove_'); - } else { - icon = id.replace('_options_upload_', '_options_remove_'); - icon2 = id.replace('variants_upload_', 'variants_remove_'); - } - - if (numFiles > 0) { - $('#' + icon).removeClass('hidden'); - $('#' + icon2).removeClass('hidden'); - $('#' + id).parent('a').removeClass('btn-primary').addClass('btn-success').addClass('disabled').attr('onclick', 'return false;'); - } else { - $('#' + icon).addClass('hidden'); - $('#' + icon2).addClass('hidden'); - $('#' + id).parent('a').removeClass('btn-success').addClass('btn-primary').removeClass('disabled').removeAttr('onclick'); - } - - if (id.indexOf("mupload") != -1) { // multiple file upload - var cnt = parseInt(id.split('_').slice(-1)[0]) + 1; - - if (modifier == 'variant') { - var row = '
'+ - ' '+ - ' '+ - ' '+ - ' '+ - '
'; - } else { - var row = '
'+ - ' '+ - '
'; - } - $('#file_upload_container_' + groupID).append(row); - $('.file-input-' + groupID + '_' + valueID + '_' + cnt).bootstrapFileInput(); - } -}; - -function removeFileUploadRow(id) { - $('#' + id).remove(); - var len = $('*').hasClass('file-inputs'); - if (len == 0) document.location.href = document.location.href; -} - -/* FILE UPLOAD VARIANT MODULE /EOF */ - $(window).resize(function() { var type = _setMediaType(); diff --git a/catalog/includes/modules/variants/file_upload.php b/catalog/includes/modules/variants/file_upload.php deleted file mode 100644 index 2912ba915..000000000 --- a/catalog/includes/modules/variants/file_upload.php +++ /dev/null @@ -1,89 +0,0 @@ - $val) { - if (isset($val['group_title']) && empty($val['group_title']) === false) { - $group_title = $val['group_title']; - $group_id = $val['group_id']; - break; - } - } - - $string = '
' . - '
'; + '
'; reset($data); $cnt = 0; @@ -44,11 +45,11 @@ static public function parse($data) { $group_id = $val['group_id']; $group_title = $val['group_title']; - $string .= '
' . + $string .= '
' . ' ' . + ' ' . '
'; $cnt++; } @@ -60,14 +61,14 @@ static public function parse($data) { } else { - $string = '
'; + $string = '
'; $cnt = 0; foreach ( $data['data'] as $field ) { - $string .= '
' . + $string .= '
' . ' ' . - ' ' . + ' ' . ' ' . - ' ' . + ' ' . '
'; $cnt++; } diff --git a/catalog/templates/core/content/checkout/checkout_confirmation.php b/catalog/templates/core/content/checkout/checkout_confirmation.php index 70b2335c4..a2cbb5319 100644 --- a/catalog/templates/core/content/checkout/checkout_confirmation.php +++ b/catalog/templates/core/content/checkout/checkout_confirmation.php @@ -122,12 +122,12 @@ } if ( $lC_ShoppingCart->isVariant($products['item_id']) ) { foreach ( $lC_ShoppingCart->getVariant($products['item_id']) as $variant) { - echo '
- ' . $variant['group_title'] . ': ' . $variant['value_title'] . '
' . "\n"; + if ($variant['group_title'] != '') echo '
- ' . $variant['group_title'] . ': ' . $variant['value_title'] . '
' . "\n"; } } if ( $lC_ShoppingCart->hasSimpleOptions($products['item_id']) ) { foreach ( $lC_ShoppingCart->getSimpleOptions($products['item_id']) as $option) { - echo '
- ' . $option['group_title'] . ': ' . $option['value_title'] . '
' . "\n"; + if ($option['group_title'] != '') echo '
- ' . $option['group_title'] . ': ' . $option['value_title'] . '
' . "\n"; } } echo '
' . - ' ' . - ' ' . - ' ' . - ' ' . - '
'; - - reset($data); - $cnt = 0; - foreach($data as $key => $val) { - $price_ind = ((float)$val['price_modifier'] < 0.00) ? '-' : '+'; - $price_formatted = ((float)$val['price_modifier'] != 0.00) ? $price_ind . $lC_Currencies->format(number_format($val['price_modifier'], DECIMAL_PLACES), $lC_Currencies->getCode()) : null; - $options[$val['value_id']] = $val['price_modifier']; - $group_id = $val['group_id']; - $group_title = $val['group_title']; - - $string .= '
' . - ' ' . - '
'; - $cnt++; - } - - $string .= '
' . - '
'; - - } else { - - $string = '
'; - $cnt = 0; - foreach ( $data['data'] as $field ) { - $string .= '
' . - ' ' . - ' ' . - ' ' . - ' ' . - '
'; - $cnt++; - } - $string .= '
'; - } - - return $string; - } - - static public function allowsMultipleValues() { - return self::ALLOW_MULTIPLE_VALUES; - } - - static public function hasCustomValue() { - return self::HAS_CUSTOM_VALUE; - } -} -?> \ No newline at end of file diff --git a/catalog/includes/modules/variants/multiple_file_upload.php b/catalog/includes/modules/variants/multiple_file_upload.php deleted file mode 100644 index 3411d75d3..000000000 --- a/catalog/includes/modules/variants/multiple_file_upload.php +++ /dev/null @@ -1,89 +0,0 @@ - $val) { - if (isset($val['group_title']) && empty($val['group_title']) === false) { - $group_title = $val['group_title']; - $group_id = $val['group_id']; - break; - } - } - - $string = '
' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - '
'; - - reset($data); - $cnt = 0; - foreach($data as $key => $val) { - $price_ind = ((float)$val['price_modifier'] < 0.00) ? '-' : '+'; - $price_formatted = ((float)$val['price_modifier'] != 0.00) ? $price_ind . $lC_Currencies->format(number_format($val['price_modifier'], DECIMAL_PLACES), $lC_Currencies->getCode()) : null; - $options[$val['value_id']] = $val['price_modifier']; - $group_id = $val['group_id']; - $group_title = $val['group_title']; - - $string .= '
' . - ' ' . - '
'; - $cnt++; - } - - $string .= '
' . - '
'; - - } else { - - $string = '
'; - $cnt = 0; - foreach ( $data['data'] as $field ) { - $string .= '
' . - ' ' . - ' ' . - ' ' . - ' ' . - '
'; - $cnt++; - } - $string .= '
'; - } - - return $string; - } - - static public function allowsMultipleValues() { - return self::ALLOW_MULTIPLE_VALUES; - } - - static public function hasCustomValue() { - return self::HAS_CUSTOM_VALUE; - } -} -?> \ No newline at end of file From d54c54b8506d07aba995dc03a8e4bd0e21b33df7 Mon Sep 17 00:00:00 2001 From: datazen Date: Tue, 24 Jun 2014 17:17:46 -0400 Subject: [PATCH 027/168] merge work --- .../includes/modules/variants/file_upload.php | 31 +++++++++++++++++++ .../modules/variants/multiple_file_upload.php | 31 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 catalog/includes/modules/variants/file_upload.php create mode 100644 catalog/includes/modules/variants/multiple_file_upload.php diff --git a/catalog/includes/modules/variants/file_upload.php b/catalog/includes/modules/variants/file_upload.php new file mode 100644 index 000000000..ecdff343a --- /dev/null +++ b/catalog/includes/modules/variants/file_upload.php @@ -0,0 +1,31 @@ + \ No newline at end of file diff --git a/catalog/includes/modules/variants/multiple_file_upload.php b/catalog/includes/modules/variants/multiple_file_upload.php new file mode 100644 index 000000000..1b94fa162 --- /dev/null +++ b/catalog/includes/modules/variants/multiple_file_upload.php @@ -0,0 +1,31 @@ + \ No newline at end of file From c15207fcb6554e20524aa333c0c23938f91c0be9 Mon Sep 17 00:00:00 2001 From: datazen Date: Tue, 24 Jun 2014 17:48:11 -0400 Subject: [PATCH 028/168] added file upload upsell --- .../includes/applications/product_variants/modal/new.php | 9 +++++++++ catalog/admin/includes/languages/en_US.php | 4 +++- catalog/admin/includes/languages/en_US/store.php | 2 -- catalog/includes/javascript/general.js.php | 4 +++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/catalog/admin/includes/applications/product_variants/modal/new.php b/catalog/admin/includes/applications/product_variants/modal/new.php index 2cb0848fd..c36aa35a0 100644 --- a/catalog/admin/includes/applications/product_variants/modal/new.php +++ b/catalog/admin/includes/applications/product_variants/modal/new.php @@ -76,6 +76,13 @@ classes: 'blue-gradient glossy', } }).form(); if (bValid) { + var module = $('#module').val(); + var isPro = ''; + if (isPro == false && (module == 'file_upload' || module == 'multiple_file_upload')) { + $.modal.alert('get('text_available_with_pro'); ?>'); + return false; + } + var nvp = $("#pvNew").serialize(); var jsonLink = 'getModule() . '&action=saveGroup&BATCH'); ?>' $.getJSON(jsonLink.replace('BATCH', nvp), @@ -103,10 +110,12 @@ function (rdata) { i = 0; $.each(data.modulesArray, function(val, text) { var text = text.replace(/_/g, " ").replace(/\b./g, function(m){ return m.toUpperCase(); }); + var isPro = ''; if(i == 0) { $("#module").closest("span + *").prevAll("span.select-value:first").text(text); i++; } + if ( isPro == false && (val == 'file_upload' || val == 'multiple_file_upload')) text = text + ' (PRO)'; $("#module").append( $('').val(val).html(text) ); diff --git a/catalog/admin/includes/languages/en_US.php b/catalog/admin/includes/languages/en_US.php index 3fcd8d1f0..af024ff6a 100644 --- a/catalog/admin/includes/languages/en_US.php +++ b/catalog/admin/includes/languages/en_US.php @@ -370,4 +370,6 @@ text_no = No text_featured_product_expired = Featured Product has Expired! text_featured_product_no_expiration = No Expiration -error_specials_date = Error: The specials expire date cannot be before the start date. +text_available_with_pro = Available free with the PRO edition +text_free_with_pro_edition = PRO Free with Pro Edition +error_specials_date = Error: The specials expire date cannot be before the start date. \ No newline at end of file diff --git a/catalog/admin/includes/languages/en_US/store.php b/catalog/admin/includes/languages/en_US/store.php index 3cdd9a823..991d4eaa2 100644 --- a/catalog/admin/includes/languages/en_US/store.php +++ b/catalog/admin/includes/languages/en_US/store.php @@ -13,8 +13,6 @@ text_mobile_enabled = Mobile Enabled text_featured = Featured text_in_cloud = In Cloud -text_available_with_pro = Available free with the PRO edition -text_free_with_pro_edition = PRO Free with Pro Edition rating_from_5_stars = %s of 5 Stars! diff --git a/catalog/includes/javascript/general.js.php b/catalog/includes/javascript/general.js.php index 2c7db3cca..023ccb977 100644 --- a/catalog/includes/javascript/general.js.php +++ b/catalog/includes/javascript/general.js.php @@ -275,5 +275,7 @@ function (data) { $('#qr-message').show('500'); } ); -}) +}); + + \ No newline at end of file From abd23c9a2a6f98d289ec282eb9c7f8521acaa146 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Thu, 26 Jun 2014 15:10:36 -0400 Subject: [PATCH 029/168] added product info page config group and social share icon config values --- catalog/install/loadedcommerce.sql | 7 +++++++ catalog/install/loadedcommerce_innodb.sql | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql index 5384957eb..cf4d4104b 100644 --- a/catalog/install/loadedcommerce.sql +++ b/catalog/install/loadedcommerce.sql @@ -1192,6 +1192,12 @@ INSERT INTO lc_configuration (configuration_id, configuration_title, configurati INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(180, 'Session Lifetime', 'SESSION_LIFETIME', 3600, 'The amount of time a user is logged in for after the last action.', 10, 0, now(), now(), NULL, NULL); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(181, 'Force Cookie Use', 'SESSION_FORCE_COOKIES', -1, 'Force the use cookies to handle sessions.', 10, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(182, 'Maximum New Products Per Page', 'NEW_PRODUCTS_PER_PAGE_DISPLAY', '9', 'Maximum number of new products to display in listing', 3, 20, now(), now(), NULL, NULL); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(183, 'Enable Facebook Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_FACEBOOK', -1, 'Allow people to share with Facebook', 22, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(184, 'Enable Twitter Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_TWITTER', -1, 'Allow people to share with Twitter', 22, 1, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(185, 'Enable Google+ Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_GOOGLE', -1, 'Allow people to share with Google+', 22, 2, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(186, 'Enable Pinterest Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_PIN', -1, 'Allow people to share with Pinterest', 22, 3, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(187, 'Enable LinkedIn Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_LINKED', -1, 'Allow people to share with LinkedIn', 22, 4, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(189, 'Enable Tumblr Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_TUMBLR', -1, 'Allow people to share with Tumblr', 22, 5, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(1, 'My Store', 'General information about my store', 1, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(2, 'Minimum Values', 'The minimum values for functions / data', 2, 1); @@ -1211,6 +1217,7 @@ INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_ INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(19, 'Checkout', 'Checkout settings', 19, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(20, 'Editor', 'Editor settings', 20, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(21, 'cURL Proxy', 'cURL proxy configuration setttings.', 21, 1); +INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(22, 'Product Info Page', 'Settings specific to the product information page.', 22, 1); INSERT INTO lc_countries VALUES (1,'Afghanistan','AF','AFG',''); diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql index 60c6748bd..4cd95062a 100644 --- a/catalog/install/loadedcommerce_innodb.sql +++ b/catalog/install/loadedcommerce_innodb.sql @@ -1192,6 +1192,12 @@ INSERT INTO lc_configuration (configuration_id, configuration_title, configurati INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(180, 'Session Lifetime', 'SESSION_LIFETIME', 3600, 'The amount of time a user is logged in for after the last action.', 10, 0, now(), now(), NULL, NULL); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(181, 'Force Cookie Use', 'SESSION_FORCE_COOKIES', -1, 'Force the use cookies to handle sessions.', 10, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(182, 'Maximum New Products Per Page', 'NEW_PRODUCTS_PER_PAGE_DISPLAY', '9', 'Maximum number of new products to display in listing', 3, 20, now(), now(), NULL, NULL); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(183, 'Enable Facebook Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_FACEBOOK', -1, 'Allow people to share with Facebook', 22, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(184, 'Enable Twitter Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_TWITTER', -1, 'Allow people to share with Twitter', 22, 1, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(185, 'Enable Google+ Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_GOOGLE', -1, 'Allow people to share with Google+', 22, 2, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(186, 'Enable Pinterest Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_PIN', -1, 'Allow people to share with Pinterest', 22, 3, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(187, 'Enable LinkedIn Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_LINKED', -1, 'Allow people to share with LinkedIn', 22, 4, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(189, 'Enable Tumblr Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_TUMBLR', -1, 'Allow people to share with Tumblr', 22, 5, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(1, 'My Store', 'General information about my store', 1, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(2, 'Minimum Values', 'The minimum values for functions / data', 2, 1); @@ -1211,6 +1217,7 @@ INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_ INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(19, 'Checkout', 'Checkout settings', 19, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(20, 'Editor', 'Editor settings', 20, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(21, 'cURL Proxy', 'cURL proxy configuration setttings.', 21, 1); +INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(22, 'Product Info Page', 'Settings specific to the product information page.', 22, 1); INSERT INTO lc_countries VALUES (1,'Afghanistan','AF','AFG',''); From 80fbf1d7a1a6230fb4abd63deab6f93f1254c0ed Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Thu, 26 Jun 2014 17:19:18 -0400 Subject: [PATCH 030/168] adding social icons to product info page --- .../templates/core/content/products/info.php | 57 ++++++++- catalog/templates/core/css/template.css | 121 ++++++++++++++++++ 2 files changed, 171 insertions(+), 7 deletions(-) diff --git a/catalog/templates/core/content/products/info.php b/catalog/templates/core/content/products/info.php index 99616ff7d..174427953 100644 --- a/catalog/templates/core/content/products/info.php +++ b/catalog/templates/core/content/products/info.php @@ -54,14 +54,57 @@

getPageTitle(); ?>

isInStock($lC_Product->getID()) === false) ) ? '' . STOCK_MARK_PRODUCT_OUT_OF_STOCK . '' : $lC_Product->getAttribute('shipping_availability'); - if ($lC_Product->getAttribute('manufacturers') != null || $lC_Product->hasModel()) { - echo '
' . "\n" . - (($lC_Product->getAttribute('manufacturers') != null) ? '' . $lC_Product->getAttribute('manufacturers') . ':' . "\n" : null) . - ' ' . $lC_Product->getModel() . '' . "\n" . - '
' . "\n"; - } + $availability = ( (STOCK_CHECK == '1') && ($lC_ShoppingCart->isInStock($lC_Product->getID()) === false) ) ? '' . STOCK_MARK_PRODUCT_OUT_OF_STOCK . '' : $lC_Product->getAttribute('shipping_availability'); + if ($lC_Product->getAttribute('manufacturers') != null || $lC_Product->hasModel()) { + echo '
' . "\n" . + (($lC_Product->getAttribute('manufacturers') != null) ? '' . $lC_Product->getAttribute('manufacturers') . ':' . "\n" : null) . + ' ' . $lC_Product->getModel() . '' . "\n" . + '
' . "\n"; + } + + if ( PRODUCT_INFO_SOCIAL_SHARE_FACEBOOK == 1 || PRODUCT_INFO_SOCIAL_SHARE_TWITTER == 1 || PRODUCT_INFO_SOCIAL_SHARE_GOOGLE == 1 || PRODUCT_INFO_SOCIAL_SHARE_LINKED == 1 || PRODUCT_INFO_SOCIAL_SHARE_PIN == 1 || PRODUCT_INFO_SOCIAL_SHARE_TUMBLR == 1 ) { ?> + +

getDescription() != null) ? $lC_Product->getDescription() : $lC_Language->get('no_description_available'); ?>

.text { + bottom: 5px; + font-size: 25px; + padding: 0px 0px 0px 0px; + -webkit-transition: all 0.5s ease-in-out; + -moz-transition: all 0.5s ease-in-out; + -ms-transition: all 0.5s ease-in-out; + -o-transition: all 0.5s ease-in-out; + transition: all 0.5s ease-in-out; + text-align: center; + border-top: #09F thin dotted; + border-top-width: 0px; +} + +#loaded7 .social-container .menu-wrap .menu-item .icon { + width: 32px; + height: 32px; + padding: 15px 9px 5px 4px; + font-size: 25px; + text-align: center; +} + +#loaded7 .social-container .menu-wrap .menu-item i.fa-facebook { + background: #3B5998; + color: #FFF; +} + +#loaded7 .social-container .menu-wrap .menu-item i.fa-twitter { + background: #44CCF6; + color: #FFF; +} + +#loaded7 .social-container .menu-wrap .menu-item i.fa-google-plus { + background: #D13F2D; + color: #FFF; +} + +#loaded7 .social-container .menu-wrap .menu-item i.fa-pinterest { + background: #CB2027; + color: #FFF; +} + +#loaded7 .social-container .menu-wrap .menu-item i.fa-linkedin { + background: #0275B6; + color: #FFF; +} + +#loaded7 .social-container .menu-wrap .menu-item i.fa-tumblr { + background: #274152; + color: #FFF; +} /********************************************************/ /* 7. Error classes */ From aadb467243e4b6b2010c1c1d3672397977f60a22 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Fri, 27 Jun 2014 13:09:38 -0400 Subject: [PATCH 031/168] more work --- catalog/includes/languages/en_US.xml | 32 +++++++++++ catalog/info.php | 48 ++++++++-------- .../templates/core/content/products/info.php | 55 ++++++++++++++----- 3 files changed, 98 insertions(+), 37 deletions(-) diff --git a/catalog/includes/languages/en_US.xml b/catalog/includes/languages/en_US.xml index 4d8779447..e9fba32b5 100644 --- a/catalog/includes/languages/en_US.xml +++ b/catalog/includes/languages/en_US.xml @@ -2955,5 +2955,37 @@ Your friend, %s, thought that you would be interested in %s from %s.]]> general + + + text_social_share_facebook + + general + + + text_social_share_twitter + + general + + + text_social_share_google_plus + + general + + + text_social_share_linkedin + + general + + + text_social_share_pinterest + + general + + + text_social_share_tumblr + + general + + \ No newline at end of file diff --git a/catalog/info.php b/catalog/info.php index a4c9554e3..f07d2212f 100644 --- a/catalog/info.php +++ b/catalog/info.php @@ -1,25 +1,25 @@ -load('info'); - -if ($lC_Services->isStarted('breadcrumb')) { - $lC_Breadcrumb->add($lC_Language->get('breadcrumb_information'), lc_href_link(FILENAME_INFO)); -} - -$lC_Template = lC_Template::setup('info'); - -require($lC_Vqmod->modCheck('templates/' . $lC_Template->getCode() . '.php')); - -require($lC_Vqmod->modCheck('includes/application_bottom.php')); +load('info'); + +if ($lC_Services->isStarted('breadcrumb')) { + $lC_Breadcrumb->add($lC_Language->get('breadcrumb_information'), lc_href_link(FILENAME_INFO)); +} + +$lC_Template = lC_Template::setup('info'); + +require($lC_Vqmod->modCheck('templates/' . $lC_Template->getCode() . '.php')); + +require($lC_Vqmod->modCheck('includes/application_bottom.php')); ?> \ No newline at end of file diff --git a/catalog/templates/core/content/products/info.php b/catalog/templates/core/content/products/info.php index 174427953..56ab470fe 100644 --- a/catalog/templates/core/content/products/info.php +++ b/catalog/templates/core/content/products/info.php @@ -64,47 +64,76 @@ if ( PRODUCT_INFO_SOCIAL_SHARE_FACEBOOK == 1 || PRODUCT_INFO_SOCIAL_SHARE_TWITTER == 1 || PRODUCT_INFO_SOCIAL_SHARE_GOOGLE == 1 || PRODUCT_INFO_SOCIAL_SHARE_LINKED == 1 || PRODUCT_INFO_SOCIAL_SHARE_PIN == 1 || PRODUCT_INFO_SOCIAL_SHARE_TUMBLR == 1 ) { ?> + - +

getDescription() != null) ? $lC_Product->getDescription() : $lC_Language->get('no_description_available'); ?>

Date: Fri, 27 Jun 2014 15:03:52 -0400 Subject: [PATCH 032/168] added sql for runafter --- .../work/updates/runAfter/controller.php | 329 +++++++++--------- 1 file changed, 172 insertions(+), 157 deletions(-) diff --git a/catalog/includes/work/updates/runAfter/controller.php b/catalog/includes/work/updates/runAfter/controller.php index 0b1790ce4..1d0451bf8 100644 --- a/catalog/includes/work/updates/runAfter/controller.php +++ b/catalog/includes/work/updates/runAfter/controller.php @@ -25,162 +25,162 @@ public static function updateDB() { $pf = (defined('DB_TABLE_PREFIX')) ? DB_TABLE_PREFIX : 'lc_'; $engine = (defined('DB_DATABASE_CLASS') && DB_DATABASE_CLASS == 'mysqli_innodb') ? 'InnoDB' : 'MyISAM'; - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "banners` ADD `banners_target` INT( 1 ) NOT NULL DEFAULT '1' AFTER `banners_url`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "banners` ADD `banners_target` INT( 1 ) NOT NULL DEFAULT '1' AFTER `banners_url`"); - - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "products` ADD `products_cost` DECIMAL( 15, 4 ) NOT NULL DEFAULT '0' AFTER `products_quantity`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "products` ADD `products_cost` DECIMAL( 15, 4 ) NOT NULL DEFAULT '0' AFTER `products_quantity`"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "products` ADD `products_msrp` DECIMAL( 15, 4 ) NOT NULL DEFAULT '0' AFTER `products_price`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "products` ADD `products_msrp` DECIMAL( 15, 4 ) NOT NULL DEFAULT '0' AFTER `products_price`"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "products` ADD `products_sku` VARCHAR( 255 ) NOT NULL AFTER `products_model`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "products` ADD `products_sku` VARCHAR( 255 ) NOT NULL AFTER `products_model`"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "banners` ADD `banners_target` INT( 1 ) NOT NULL DEFAULT '1' AFTER `banners_url`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "banners` ADD `banners_target` INT( 1 ) NOT NULL DEFAULT '1' AFTER `banners_url`;"); + + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "products` ADD `products_cost` DECIMAL( 15, 4 ) NOT NULL DEFAULT '0' AFTER `products_quantity`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "products` ADD `products_cost` DECIMAL( 15, 4 ) NOT NULL DEFAULT '0' AFTER `products_quantity`;"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "products` ADD `products_msrp` DECIMAL( 15, 4 ) NOT NULL DEFAULT '0' AFTER `products_price`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "products` ADD `products_msrp` DECIMAL( 15, 4 ) NOT NULL DEFAULT '0' AFTER `products_price`;"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "products` ADD `products_sku` VARCHAR( 255 ) NOT NULL AFTER `products_model`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "products` ADD `products_sku` VARCHAR( 255 ) NOT NULL AFTER `products_model`;"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "products_simple_options_values` ADD `products_id` INT( 11 ) NOT NULL AFTER `id`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "products_simple_options_values` ADD `products_id` INT( 11 ) NOT NULL AFTER `id`"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "products_simple_options_values` ADD `sort_order` INT( 11 ) NOT NULL DEFAULT '0' AFTER `price_modifier`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "products_simple_options_values` ADD `sort_order` INT( 11 ) NOT NULL DEFAULT '0' AFTER `price_modifier`"); - - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "orders_products` ADD `products_simple_options_meta_data` VARCHAR( 1024 ) NOT NULL AFTER `products_quantity`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "orders_products` ADD `products_simple_options_meta_data` VARCHAR( 1024 ) NOT NULL AFTER `products_quantity`"); - - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "shopping_carts` ADD `meta_data` VARCHAR( 1024 ) NOT NULL AFTER `quantity`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "shopping_carts` ADD `meta_data` VARCHAR( 1024 ) NOT NULL AFTER `quantity`"); - - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_mode` VARCHAR( 128 ) DEFAULT NULL AFTER `sort_order`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_mode` VARCHAR( 128 ) DEFAULT NULL AFTER `sort_order`"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_link_target` TINYINT( 1 ) DEFAULT '0' AFTER `categories_mode`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_link_target` TINYINT( 1 ) DEFAULT '0' AFTER `categories_mode`"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_custom_url` VARCHAR( 255 ) DEFAULT NULL AFTER `categories_link_target`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_custom_url` VARCHAR( 255 ) DEFAULT NULL AFTER `categories_link_target`"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_status` TINYINT( 1 ) DEFAULT NULL AFTER `categories_show_in_listings`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_status` TINYINT( 1 ) DEFAULT NULL AFTER `categories_show_in_listings`"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_visibility_nav` TINYINT( 1 ) DEFAULT '0' AFTER `categories_status`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_visibility_nav` TINYINT( 1 ) DEFAULT '0' AFTER `categories_status`"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_visibility_box` TINYINT( 1 ) DEFAULT '1' AFTER `categories_visibility_nav`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_visibility_box` TINYINT( 1 ) DEFAULT '1' AFTER `categories_visibility_nav`"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "products_simple_options_values` ADD `products_id` INT( 11 ) NOT NULL AFTER `id`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "products_simple_options_values` ADD `products_id` INT( 11 ) NOT NULL AFTER `id`;"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "products_simple_options_values` ADD `sort_order` INT( 11 ) NOT NULL DEFAULT '0' AFTER `price_modifier`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "products_simple_options_values` ADD `sort_order` INT( 11 ) NOT NULL DEFAULT '0' AFTER `price_modifier`;"); + + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "orders_products` ADD `products_simple_options_meta_data` VARCHAR( 1024 ) NOT NULL AFTER `products_quantity`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "orders_products` ADD `products_simple_options_meta_data` VARCHAR( 1024 ) NOT NULL AFTER `products_quantity`;"); + + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "shopping_carts` ADD `meta_data` VARCHAR( 1024 ) NOT NULL AFTER `quantity`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "shopping_carts` ADD `meta_data` VARCHAR( 1024 ) NOT NULL AFTER `quantity`;"); + + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_mode` VARCHAR( 128 ) DEFAULT NULL AFTER `sort_order`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_mode` VARCHAR( 128 ) DEFAULT NULL AFTER `sort_order`;"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_link_target` TINYINT( 1 ) DEFAULT '0' AFTER `categories_mode`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_link_target` TINYINT( 1 ) DEFAULT '0' AFTER `categories_mode`;"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_custom_url` VARCHAR( 255 ) DEFAULT NULL AFTER `categories_link_target`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_custom_url` VARCHAR( 255 ) DEFAULT NULL AFTER `categories_link_target`;"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_status` TINYINT( 1 ) DEFAULT NULL AFTER `categories_show_in_listings`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_status` TINYINT( 1 ) DEFAULT NULL AFTER `categories_show_in_listings`;"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_visibility_nav` TINYINT( 1 ) DEFAULT '0' AFTER `categories_status`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_visibility_nav` TINYINT( 1 ) DEFAULT '0' AFTER `categories_status`;"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_visibility_box` TINYINT( 1 ) DEFAULT '1' AFTER `categories_visibility_nav`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories` ADD `categories_visibility_box` TINYINT( 1 ) DEFAULT '1' AFTER `categories_visibility_nav`;"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_menu_name` VARCHAR( 255 ) DEFAULT NULL AFTER `categories_name`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_menu_name` VARCHAR( 255 ) DEFAULT NULL AFTER `categories_name`"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_blurb ` VARCHAR( 1024 ) DEFAULT NULL AFTER `categories_menu_name`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_blurb ` VARCHAR( 1024 ) DEFAULT NULL AFTER `categories_menu_name`"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_description` TEXT AFTER `categories_blurb`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_description` TEXT AFTER `categories_blurb`"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_keyword` VARCHAR( 255 ) DEFAULT NULL AFTER `categories_description`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_keyword` VARCHAR( 255 ) DEFAULT NULL AFTER `categories_description`"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_tags` VARCHAR( 255 ) DEFAULT NULL AFTER `categories_keyword`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_tags` VARCHAR( 255 ) DEFAULT NULL AFTER `categories_keyword`"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_menu_name` VARCHAR( 255 ) DEFAULT NULL AFTER `categories_name`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_menu_name` VARCHAR( 255 ) DEFAULT NULL AFTER `categories_name`;"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_blurb ` VARCHAR( 1024 ) DEFAULT NULL AFTER `categories_menu_name`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_blurb ` VARCHAR( 1024 ) DEFAULT NULL AFTER `categories_menu_name`;"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_description` TEXT AFTER `categories_blurb`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_description` TEXT AFTER `categories_blurb`;"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_keyword` VARCHAR( 255 ) DEFAULT NULL AFTER `categories_description`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_keyword` VARCHAR( 255 ) DEFAULT NULL AFTER `categories_description`;"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_tags` VARCHAR( 255 ) DEFAULT NULL AFTER `categories_keyword`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "categories_description` ADD `categories_tags` VARCHAR( 255 ) DEFAULT NULL AFTER `categories_keyword`;"); - $lC_Database->simpleQuery("UPDATE IGNORE `" . $pf . "configuration_group` SET `configuration_group_title` = 'Checkout', `configuration_group_description` = 'Checkout settings' where `configuration_group_id` = '19'"); - parent::log("Database Update: UPDATE IGNORE `" . $pf . "configuration_group` SET `configuration_group_title` = 'Checkout', `configuration_group_description` = 'Checkout settings' where `configuration_group_id` = '19'"); + $lC_Database->simpleQuery("UPDATE IGNORE `" . $pf . "configuration_group` SET `configuration_group_title` = 'Checkout', `configuration_group_description` = 'Checkout settings' where `configuration_group_id` = '19';"); + parent::log("Database Update: UPDATE IGNORE `" . $pf . "configuration_group` SET `configuration_group_title` = 'Checkout', `configuration_group_description` = 'Checkout settings' where `configuration_group_id` = '19';"); if (!defined('CHECKOUT_SUPPRESS_NON_MOBILE_PAYMENT_MODULES')) { - $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Suppress Non-Mobile Payment Modules', 'CHECKOUT_SUPPRESS_NON_MOBILE_PAYMENT_MODULES', '-1', 'Suppress non-mobile payment modules in catalog when being viewed in mobile format.', 19, 0, NULL, '2012-10-09 18:17:08', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); - parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Suppress Non-Mobile Payment Modules', 'CHECKOUT_SUPPRESS_NON_MOBILE_PAYMENT_MODULES', '-1', 'Suppress non-mobile payment modules in catalog when being viewed in mobile format.', 19, 0, NULL, '2012-10-09 18:17:08', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); + $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Suppress Non-Mobile Payment Modules', 'CHECKOUT_SUPPRESS_NON_MOBILE_PAYMENT_MODULES', '-1', 'Suppress non-mobile payment modules in catalog when being viewed in mobile format.', 19, 0, NULL, '2012-10-09 18:17:08', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Suppress Non-Mobile Payment Modules', 'CHECKOUT_SUPPRESS_NON_MOBILE_PAYMENT_MODULES', '-1', 'Suppress non-mobile payment modules in catalog when being viewed in mobile format.', 19, 0, NULL, '2012-10-09 18:17:08', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); } - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "customers` CHANGE `customers_password` `customers_password` VARCHAR( 128 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "customers` CHANGE `customers_password` `customers_password` VARCHAR( 128 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "administrators` CHANGE `user_password` `user_password` VARCHAR( 128 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "administrators` CHANGE `user_password` `user_password` VARCHAR( 128 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL"); - - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "administrators` ADD `verify_key` VARCHAR( 64 ) DEFAULT NULL AFTER `access_group_id`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "administrators` ADD `verify_key` VARCHAR( 64 ) DEFAULT NULL AFTER `access_group_id`"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "administrators` ADD `language_id` INT( 11 ) NOT NULL DEFAULT '1' AFTER `verify_key`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "administrators` ADD `language_id` INT( 11 ) NOT NULL DEFAULT '1' AFTER `verify_key`"); - - $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . $pf . "coupons` (coupons_id int(11) NOT NULL AUTO_INCREMENT, `type` enum('R','T','S','P') NOT NULL DEFAULT 'R', mode varchar(32) NOT NULL DEFAULT 'coupon', code varchar(32) NOT NULL, reward decimal(8,4) NOT NULL DEFAULT '0.0000', purchase_over decimal(8,4) NOT NULL DEFAULT '0.0000', start_date datetime DEFAULT NULL, expires_date datetime DEFAULT NULL, uses_per_coupon int(11) NOT NULL DEFAULT '0', uses_per_customer int(11) NOT NULL DEFAULT '0', restrict_to_products varchar(1024) DEFAULT NULL, restrict_to_categories varchar(1024) DEFAULT NULL, restrict_to_customers varchar(1024) DEFAULT NULL, `status` tinyint(1) NOT NULL DEFAULT '1', date_created datetime NOT NULL DEFAULT '0000-00-00 00:00:00', date_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00', sale_exclude tinyint(1) NOT NULL DEFAULT '0', notes varchar(255) NOT NULL, PRIMARY KEY (coupons_id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci"); - parent::log("Database Update: CREATE TABLE IF NOT EXISTS `" . $pf . "coupons` (coupons_id int(11) NOT NULL AUTO_INCREMENT, `type` enum('R','T','S','P') NOT NULL DEFAULT 'R', mode varchar(32) NOT NULL DEFAULT 'coupon', code varchar(32) NOT NULL, reward decimal(8,4) NOT NULL DEFAULT '0.0000', purchase_over decimal(8,4) NOT NULL DEFAULT '0.0000', start_date datetime DEFAULT NULL, expires_date datetime DEFAULT NULL, uses_per_coupon int(11) NOT NULL DEFAULT '0', uses_per_customer int(11) NOT NULL DEFAULT '0', restrict_to_products varchar(1024) DEFAULT NULL, restrict_to_categories varchar(1024) DEFAULT NULL, restrict_to_customers varchar(1024) DEFAULT NULL, `status` tinyint(1) NOT NULL DEFAULT '1', date_created datetime NOT NULL DEFAULT '0000-00-00 00:00:00', date_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00', sale_exclude tinyint(1) NOT NULL DEFAULT '0', notes varchar(255) NOT NULL, PRIMARY KEY (coupons_id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci"); - $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . $pf . "coupons_description` (coupons_id int(11) NOT NULL DEFAULT '0', language_id int(11) NOT NULL DEFAULT '1', name varchar(1024) NOT NULL DEFAULT '', PRIMARY KEY (coupons_id,language_id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci"); - parent::log("Database Update: CREATE TABLE IF NOT EXISTS `" . $pf . "coupons_description` (coupons_id int(11) NOT NULL DEFAULT '0', language_id int(11) NOT NULL DEFAULT '1', name varchar(1024) NOT NULL DEFAULT '', PRIMARY KEY (coupons_id,language_id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci"); - $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . $pf . "coupons_redeemed` ( id int(11) NOT NULL AUTO_INCREMENT, coupons_id int(11) NOT NULL DEFAULT '0', customers_id int(11) NOT NULL DEFAULT '0', redeem_date datetime NOT NULL DEFAULT '0000-00-00 00:00:00', redeem_ip varchar(32) NOT NULL DEFAULT '', order_id int(11) NOT NULL DEFAULT '0', PRIMARY KEY (id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci"); - parent::log("Database Update: CREATE TABLE IF NOT EXISTS `" . $pf . "coupons_redeemed` ( id int(11) NOT NULL AUTO_INCREMENT, coupons_id int(11) NOT NULL DEFAULT '0', customers_id int(11) NOT NULL DEFAULT '0', redeem_date datetime NOT NULL DEFAULT '0000-00-00 00:00:00', redeem_ip varchar(32) NOT NULL DEFAULT '', order_id int(11) NOT NULL DEFAULT '0', PRIMARY KEY (id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "customers` CHANGE `customers_password` `customers_password` VARCHAR( 128 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "customers` CHANGE `customers_password` `customers_password` VARCHAR( 128 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL;"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "administrators` CHANGE `user_password` `user_password` VARCHAR( 128 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "administrators` CHANGE `user_password` `user_password` VARCHAR( 128 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;"); + + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "administrators` ADD `verify_key` VARCHAR( 64 ) DEFAULT NULL AFTER `access_group_id`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "administrators` ADD `verify_key` VARCHAR( 64 ) DEFAULT NULL AFTER `access_group_id`;"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "administrators` ADD `language_id` INT( 11 ) NOT NULL DEFAULT '1' AFTER `verify_key`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "administrators` ADD `language_id` INT( 11 ) NOT NULL DEFAULT '1' AFTER `verify_key`;"); + + $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . $pf . "coupons` (coupons_id int(11) NOT NULL AUTO_INCREMENT, `type` enum('R','T','S','P') NOT NULL DEFAULT 'R', mode varchar(32) NOT NULL DEFAULT 'coupon', code varchar(32) NOT NULL, reward decimal(8,4) NOT NULL DEFAULT '0.0000', purchase_over decimal(8,4) NOT NULL DEFAULT '0.0000', start_date datetime DEFAULT NULL, expires_date datetime DEFAULT NULL, uses_per_coupon int(11) NOT NULL DEFAULT '0', uses_per_customer int(11) NOT NULL DEFAULT '0', restrict_to_products varchar(1024) DEFAULT NULL, restrict_to_categories varchar(1024) DEFAULT NULL, restrict_to_customers varchar(1024) DEFAULT NULL, `status` tinyint(1) NOT NULL DEFAULT '1', date_created datetime NOT NULL DEFAULT '0000-00-00 00:00:00', date_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00', sale_exclude tinyint(1) NOT NULL DEFAULT '0', notes varchar(255) NOT NULL, PRIMARY KEY (coupons_id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); + parent::log("Database Update: CREATE TABLE IF NOT EXISTS `" . $pf . "coupons` (coupons_id int(11) NOT NULL AUTO_INCREMENT, `type` enum('R','T','S','P') NOT NULL DEFAULT 'R', mode varchar(32) NOT NULL DEFAULT 'coupon', code varchar(32) NOT NULL, reward decimal(8,4) NOT NULL DEFAULT '0.0000', purchase_over decimal(8,4) NOT NULL DEFAULT '0.0000', start_date datetime DEFAULT NULL, expires_date datetime DEFAULT NULL, uses_per_coupon int(11) NOT NULL DEFAULT '0', uses_per_customer int(11) NOT NULL DEFAULT '0', restrict_to_products varchar(1024) DEFAULT NULL, restrict_to_categories varchar(1024) DEFAULT NULL, restrict_to_customers varchar(1024) DEFAULT NULL, `status` tinyint(1) NOT NULL DEFAULT '1', date_created datetime NOT NULL DEFAULT '0000-00-00 00:00:00', date_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00', sale_exclude tinyint(1) NOT NULL DEFAULT '0', notes varchar(255) NOT NULL, PRIMARY KEY (coupons_id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); + $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . $pf . "coupons_description` (coupons_id int(11) NOT NULL DEFAULT '0', language_id int(11) NOT NULL DEFAULT '1', name varchar(1024) NOT NULL DEFAULT '', PRIMARY KEY (coupons_id,language_id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); + parent::log("Database Update: CREATE TABLE IF NOT EXISTS `" . $pf . "coupons_description` (coupons_id int(11) NOT NULL DEFAULT '0', language_id int(11) NOT NULL DEFAULT '1', name varchar(1024) NOT NULL DEFAULT '', PRIMARY KEY (coupons_id,language_id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); + $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . $pf . "coupons_redeemed` ( id int(11) NOT NULL AUTO_INCREMENT, coupons_id int(11) NOT NULL DEFAULT '0', customers_id int(11) NOT NULL DEFAULT '0', redeem_date datetime NOT NULL DEFAULT '0000-00-00 00:00:00', redeem_ip varchar(32) NOT NULL DEFAULT '', order_id int(11) NOT NULL DEFAULT '0', PRIMARY KEY (id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); + parent::log("Database Update: CREATE TABLE IF NOT EXISTS `" . $pf . "coupons_redeemed` ( id int(11) NOT NULL AUTO_INCREMENT, coupons_id int(11) NOT NULL DEFAULT '0', customers_id int(11) NOT NULL DEFAULT '0', redeem_date datetime NOT NULL DEFAULT '0000-00-00 00:00:00', redeem_ip varchar(32) NOT NULL DEFAULT '', order_id int(11) NOT NULL DEFAULT '0', PRIMARY KEY (id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); if (!defined('MODULE_ORDER_TOTAL_COUPON_STATUS')) { - $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Display Coupon', 'MODULE_ORDER_TOTAL_COUPON_STATUS', 'true', 'Do you want to dusplay the coupon discount total on the checkout pages?', 6, 0, NULL, '2013-07-30 14:10:55', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(''true'', ''false''))')"); - parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Display Coupon', 'MODULE_ORDER_TOTAL_COUPON_STATUS', 'true', 'Do you want to dusplay the coupon discount total on the checkout pages?', 6, 0, NULL, '2013-07-30 14:10:55', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(''true'', ''false''))')"); + $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Display Coupon', 'MODULE_ORDER_TOTAL_COUPON_STATUS', 'true', 'Do you want to dusplay the coupon discount total on the checkout pages?', 6, 0, NULL, '2013-07-30 14:10:55', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(''true'', ''false''))');"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Display Coupon', 'MODULE_ORDER_TOTAL_COUPON_STATUS', 'true', 'Do you want to dusplay the coupon discount total on the checkout pages?', 6, 0, NULL, '2013-07-30 14:10:55', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(''true'', ''false''))');"); } if (!defined('MODULE_ORDER_TOTAL_COUPON_SORT_ORDER')) { - $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Sort Order', 'MODULE_ORDER_TOTAL_COUPON_SORT_ORDER', '300', 'Sort order of the display.', 6, 0, NULL, '2013-07-30 14:10:55', NULL, NULL)"); - parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Sort Order', 'MODULE_ORDER_TOTAL_COUPON_SORT_ORDER', '300', 'Sort order of the display.', 6, 0, NULL, '2013-07-30 14:10:55', NULL, NULL)"); + $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Sort Order', 'MODULE_ORDER_TOTAL_COUPON_SORT_ORDER', '300', 'Sort order of the display.', 6, 0, NULL, '2013-07-30 14:10:55', NULL, NULL);"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Sort Order', 'MODULE_ORDER_TOTAL_COUPON_SORT_ORDER', '300', 'Sort order of the display.', 6, 0, NULL, '2013-07-30 14:10:55', NULL, NULL);"); } if (!defined('SERVICE_COUPONS_DISPLAY_ON_CART_PAGE')) { - $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Redeem On Cart Page?', 'SERVICE_COUPONS_DISPLAY_ON_CART_PAGE', '1', 'Display the coupons redemption form on the shopping cart page?', 6, 0, NULL, '2013-07-31 19:05:14', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); - parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Redeem On Cart Page?', 'SERVICE_COUPONS_DISPLAY_ON_CART_PAGE', '1', 'Display the coupons redemption form on the shopping cart page?', 6, 0, NULL, '2013-07-31 19:05:14', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); + $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Redeem On Cart Page?', 'SERVICE_COUPONS_DISPLAY_ON_CART_PAGE', '1', 'Display the coupons redemption form on the shopping cart page?', 6, 0, NULL, '2013-07-31 19:05:14', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Redeem On Cart Page?', 'SERVICE_COUPONS_DISPLAY_ON_CART_PAGE', '1', 'Display the coupons redemption form on the shopping cart page?', 6, 0, NULL, '2013-07-31 19:05:14', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); } if (!defined('SERVICE_COUPONS_DISPLAY_ON_SHIPPING_PAGE')) { - $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Redeem On Shipping Page?', 'SERVICE_COUPONS_DISPLAY_ON_SHIPPING_PAGE', '1', 'Display the coupons redemption form on the checkout shipping page?', 6, 0, NULL, '2013-07-31 19:05:14', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); - parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Redeem On Shipping Page?', 'SERVICE_COUPONS_DISPLAY_ON_SHIPPING_PAGE', '1', 'Display the coupons redemption form on the checkout shipping page?', 6, 0, NULL, '2013-07-31 19:05:14', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); + $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Redeem On Shipping Page?', 'SERVICE_COUPONS_DISPLAY_ON_SHIPPING_PAGE', '1', 'Display the coupons redemption form on the checkout shipping page?', 6, 0, NULL, '2013-07-31 19:05:14', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Redeem On Shipping Page?', 'SERVICE_COUPONS_DISPLAY_ON_SHIPPING_PAGE', '1', 'Display the coupons redemption form on the checkout shipping page?', 6, 0, NULL, '2013-07-31 19:05:14', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); } if (!defined('SERVICE_COUPONS_DISPLAY_ON_PAYMENT_PAGE')) { - $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Redeem On Payment Page?', 'SERVICE_COUPONS_DISPLAY_ON_PAYMENT_PAGE', '1', 'Display the coupons redemption form on the checkout payment page?', 6, 0, NULL, '2013-07-31 19:05:14', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); - parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Redeem On Payment Page?', 'SERVICE_COUPONS_DISPLAY_ON_PAYMENT_PAGE', '1', 'Display the coupons redemption form on the checkout payment page?', 6, 0, NULL, '2013-07-31 19:05:14', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); + $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Redeem On Payment Page?', 'SERVICE_COUPONS_DISPLAY_ON_PAYMENT_PAGE', '1', 'Display the coupons redemption form on the checkout payment page?', 6, 0, NULL, '2013-07-31 19:05:14', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Redeem On Payment Page?', 'SERVICE_COUPONS_DISPLAY_ON_PAYMENT_PAGE', '1', 'Display the coupons redemption form on the checkout payment page?', 6, 0, NULL, '2013-07-31 19:05:14', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); } if (!defined('SERVICE_COUPONS_DISPLAY_ON_CONFIRMATION_PAGE')) { - $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Redeem On Confirmation Page?', 'SERVICE_COUPONS_DISPLAY_ON_CONFIRMATION_PAGE', '1', 'Display the coupons redemption form on the checkout confirmation page?', 6, 0, NULL, '2013-07-31 19:05:14', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); - parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Redeem On Confirmation Page?', 'SERVICE_COUPONS_DISPLAY_ON_CONFIRMATION_PAGE', '1', 'Display the coupons redemption form on the checkout confirmation page?', 6, 0, NULL, '2013-07-31 19:05:14', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); + $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Redeem On Confirmation Page?', 'SERVICE_COUPONS_DISPLAY_ON_CONFIRMATION_PAGE', '1', 'Display the coupons redemption form on the checkout confirmation page?', 6, 0, NULL, '2013-07-31 19:05:14', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Redeem On Confirmation Page?', 'SERVICE_COUPONS_DISPLAY_ON_CONFIRMATION_PAGE', '1', 'Display the coupons redemption form on the checkout confirmation page?', 6, 0, NULL, '2013-07-31 19:05:14', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); } - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "orders_status` ADD `orders_status_type` ENUM( 'Pending', 'Rejected', 'Approved' ) NOT NULL DEFAULT 'Pending' AFTER `orders_status_name`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "orders_status` ADD `orders_status_type` ENUM( 'Pending', 'Rejected', 'Approved' ) NOT NULL DEFAULT 'Pending' AFTER `orders_status_name`"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "orders_status` ADD `orders_status_type` ENUM( 'Pending', 'Rejected', 'Approved' ) NOT NULL DEFAULT 'Pending' AFTER `orders_status_name`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "orders_status` ADD `orders_status_type` ENUM( 'Pending', 'Rejected', 'Approved' ) NOT NULL DEFAULT 'Pending' AFTER `orders_status_name`;"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "orders_status_history` ADD `administrators_id` INT( 11 ) NOT NULL DEFAULT '0' AFTER `comments`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "orders_status_history` ADD `administrators_id` INT( 11 ) NOT NULL DEFAULT '0' AFTER `comments`"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "orders_status_history` ADD `append_comment` INT( 11 ) NOT NULL DEFAULT '1' AFTER `administrators_id`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "orders_status_history` ADD `append_comment` INT( 11 ) NOT NULL DEFAULT '1' AFTER `administrators_id`"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "orders_status_history` ADD `administrators_id` INT( 11 ) NOT NULL DEFAULT '0' AFTER `comments`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "orders_status_history` ADD `administrators_id` INT( 11 ) NOT NULL DEFAULT '0' AFTER `comments`;"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "orders_status_history` ADD `append_comment` INT( 11 ) NOT NULL DEFAULT '1' AFTER `administrators_id`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "orders_status_history` ADD `append_comment` INT( 11 ) NOT NULL DEFAULT '1' AFTER `administrators_id`;"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "products` ADD `is_subproduct` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `has_children`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "products` ADD `is_subproduct` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `has_children`"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "products` ADD `is_subproduct` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `has_children`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "products` ADD `is_subproduct` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `has_children`;"); - $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . $pf . "permalinks` (permalink_id int(11) NOT NULL AUTO_INCREMENT, item_id int(11) NOT NULL, language_id int(11) NOT NULL DEFAULT '1', `type` int(11) NOT NULL, query varchar(255) NOT NULL, permalink varchar(255) NOT NULL, PRIMARY KEY (permalink_id,permalink)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci"); - parent::log("Database Update: CREATE TABLE IF NOT EXISTS `" . $pf . "permalinks` (permalink_id int(11) NOT NULL AUTO_INCREMENT, item_id int(11) NOT NULL, language_id int(11) NOT NULL DEFAULT '1', `type` int(11) NOT NULL, query varchar(255) NOT NULL, permalink varchar(255) NOT NULL, PRIMARY KEY (permalink_id,permalink)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci"); + $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . $pf . "permalinks` (permalink_id int(11) NOT NULL AUTO_INCREMENT, item_id int(11) NOT NULL, language_id int(11) NOT NULL DEFAULT '1', `type` int(11) NOT NULL, query varchar(255) NOT NULL, permalink varchar(255) NOT NULL, PRIMARY KEY (permalink_id,permalink)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); + parent::log("Database Update: CREATE TABLE IF NOT EXISTS `" . $pf . "permalinks` (permalink_id int(11) NOT NULL AUTO_INCREMENT, item_id int(11) NOT NULL, language_id int(11) NOT NULL DEFAULT '1', `type` int(11) NOT NULL, query varchar(255) NOT NULL, permalink varchar(255) NOT NULL, PRIMARY KEY (permalink_id,permalink)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); - $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "configuration_group` (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES (20, 'Editor', 'Editor settings', 20, 1)"); - parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "configuration_group` (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES (20, 'Editor', 'Editor settings', 20, 1)"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "configuration_group` (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES (20, 'Editor', 'Editor settings', 20, 1);"); + parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "configuration_group` (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES (20, 'Editor', 'Editor settings', 20, 1);"); if (!defined('ENABLE_EDITOR')) { - $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES ('Enable/Disable Editor (Global)', 'ENABLE_EDITOR', '1', 'Enable or Disable Editor Globally', 20, 1, NULL, '2013-07-03 15:58:32', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); - parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES ('Enable/Disable Editor (Global)', 'ENABLE_EDITOR', '1', 'Enable or Disable Editor Globally', 20, 1, NULL, '2013-07-03 15:58:32', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); + $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES ('Enable/Disable Editor (Global)', 'ENABLE_EDITOR', '1', 'Enable or Disable Editor Globally', 20, 1, NULL, '2013-07-03 15:58:32', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES ('Enable/Disable Editor (Global)', 'ENABLE_EDITOR', '1', 'Enable or Disable Editor Globally', 20, 1, NULL, '2013-07-03 15:58:32', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); } if (!defined('USE_DEFAULT_TEMPLATE_STYLESHEET')) { - $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES ('Use Default Template Stylesheet', 'USE_DEFAULT_TEMPLATE_STYLESHEET', '-1', 'Use Default Template Stylesheet', 20, 2, NULL, '2013-07-03 15:58:32', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); - parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES ('Use Default Template Stylesheet', 'USE_DEFAULT_TEMPLATE_STYLESHEET', '-1', 'Use Default Template Stylesheet', 20, 2, NULL, '2013-07-03 15:58:32', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); + $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES ('Use Default Template Stylesheet', 'USE_DEFAULT_TEMPLATE_STYLESHEET', '-1', 'Use Default Template Stylesheet', 20, 2, NULL, '2013-07-03 15:58:32', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES ('Use Default Template Stylesheet', 'USE_DEFAULT_TEMPLATE_STYLESHEET', '-1', 'Use Default Template Stylesheet', 20, 2, NULL, '2013-07-03 15:58:32', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); } - $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . $pf . "branding` (language_id INT(11) NOT NULL DEFAULT 1, slogan VARCHAR(256) NOT NULL DEFAULT '', meta_description VARCHAR(250) NOT NULL DEFAULT '', meta_keywords VARCHAR(128) NOT NULL DEFAULT '', meta_title VARCHAR(128) NOT NULL DEFAULT '', meta_title_prefix VARCHAR(128) NOT NULL, meta_title_suffix VARCHAR(128) NOT NULL, footer_text VARCHAR(256) NOT NULL DEFAULT '', PRIMARY KEY (language_id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci"); - parent::log("Database Update: CREATE TABLE IF NOT EXISTS `" . $pf . "branding` (language_id INT(11) NOT NULL DEFAULT 1, slogan VARCHAR(256) NOT NULL DEFAULT '', meta_description VARCHAR(250) NOT NULL DEFAULT '', meta_keywords VARCHAR(128) NOT NULL DEFAULT '', meta_title VARCHAR(128) NOT NULL DEFAULT '', meta_title_prefix VARCHAR(128) NOT NULL, meta_title_suffix VARCHAR(128) NOT NULL, footer_text VARCHAR(256) NOT NULL DEFAULT '', PRIMARY KEY (language_id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci"); - $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . $pf . "branding_data` (site_image VARCHAR(128) NOT NULL DEFAULT '', chat_code VARCHAR(8192) NOT NULL DEFAULT '', support_phone VARCHAR(16) NOT NULL DEFAULT '', support_email VARCHAR(128) NOT NULL DEFAULT '', sales_phone VARCHAR(16) NOT NULL DEFAULT '', sales_email VARCHAR(128) NOT NULL DEFAULT '', og_image VARCHAR(128) NOT NULL DEFAULT '', meta_delimeter VARCHAR(128) NOT NULL DEFAULT '', social_facebook_page VARCHAR(128) NOT NULL, social_twitter VARCHAR(128) NOT NULL, social_pinterest VARCHAR(128) NOT NULL, social_google_plus VARCHAR(128) NOT NULL, social_youtube VARCHAR(128) NOT NULL, social_linkedin VARCHAR(128) NOT NULL) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci"); - parent::log("Database Update: CREATE TABLE IF NOT EXISTS `" . $pf . "branding_data` (site_image VARCHAR(128) NOT NULL DEFAULT '', chat_code VARCHAR(8192) NOT NULL DEFAULT '', support_phone VARCHAR(16) NOT NULL DEFAULT '', support_email VARCHAR(128) NOT NULL DEFAULT '', sales_phone VARCHAR(16) NOT NULL DEFAULT '', sales_email VARCHAR(128) NOT NULL DEFAULT '', og_image VARCHAR(128) NOT NULL DEFAULT '', meta_delimeter VARCHAR(128) NOT NULL DEFAULT '', social_facebook_page VARCHAR(128) NOT NULL, social_twitter VARCHAR(128) NOT NULL, social_pinterest VARCHAR(128) NOT NULL, social_google_plus VARCHAR(128) NOT NULL, social_youtube VARCHAR(128) NOT NULL, social_linkedin VARCHAR(128) NOT NULL) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci"); + $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . $pf . "branding` (language_id INT(11) NOT NULL DEFAULT 1, slogan VARCHAR(256) NOT NULL DEFAULT '', meta_description VARCHAR(250) NOT NULL DEFAULT '', meta_keywords VARCHAR(128) NOT NULL DEFAULT '', meta_title VARCHAR(128) NOT NULL DEFAULT '', meta_title_prefix VARCHAR(128) NOT NULL, meta_title_suffix VARCHAR(128) NOT NULL, footer_text VARCHAR(256) NOT NULL DEFAULT '', PRIMARY KEY (language_id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); + parent::log("Database Update: CREATE TABLE IF NOT EXISTS `" . $pf . "branding` (language_id INT(11) NOT NULL DEFAULT 1, slogan VARCHAR(256) NOT NULL DEFAULT '', meta_description VARCHAR(250) NOT NULL DEFAULT '', meta_keywords VARCHAR(128) NOT NULL DEFAULT '', meta_title VARCHAR(128) NOT NULL DEFAULT '', meta_title_prefix VARCHAR(128) NOT NULL, meta_title_suffix VARCHAR(128) NOT NULL, footer_text VARCHAR(256) NOT NULL DEFAULT '', PRIMARY KEY (language_id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); + $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . $pf . "branding_data` (site_image VARCHAR(128) NOT NULL DEFAULT '', chat_code VARCHAR(8192) NOT NULL DEFAULT '', support_phone VARCHAR(16) NOT NULL DEFAULT '', support_email VARCHAR(128) NOT NULL DEFAULT '', sales_phone VARCHAR(16) NOT NULL DEFAULT '', sales_email VARCHAR(128) NOT NULL DEFAULT '', og_image VARCHAR(128) NOT NULL DEFAULT '', meta_delimeter VARCHAR(128) NOT NULL DEFAULT '', social_facebook_page VARCHAR(128) NOT NULL, social_twitter VARCHAR(128) NOT NULL, social_pinterest VARCHAR(128) NOT NULL, social_google_plus VARCHAR(128) NOT NULL, social_youtube VARCHAR(128) NOT NULL, social_linkedin VARCHAR(128) NOT NULL) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); + parent::log("Database Update: CREATE TABLE IF NOT EXISTS `" . $pf . "branding_data` (site_image VARCHAR(128) NOT NULL DEFAULT '', chat_code VARCHAR(8192) NOT NULL DEFAULT '', support_phone VARCHAR(16) NOT NULL DEFAULT '', support_email VARCHAR(128) NOT NULL DEFAULT '', sales_phone VARCHAR(16) NOT NULL DEFAULT '', sales_email VARCHAR(128) NOT NULL DEFAULT '', og_image VARCHAR(128) NOT NULL DEFAULT '', meta_delimeter VARCHAR(128) NOT NULL DEFAULT '', social_facebook_page VARCHAR(128) NOT NULL, social_twitter VARCHAR(128) NOT NULL, social_pinterest VARCHAR(128) NOT NULL, social_google_plus VARCHAR(128) NOT NULL, social_youtube VARCHAR(128) NOT NULL, social_linkedin VARCHAR(128) NOT NULL) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); if (defined('DEFAULT_TEMPLATE') && DEFAULT_TEMPLATE == 'default') { - $lC_Database->simpleQuery("UPDATE `" . $pf . "configuration` SET `configuration_value` = 'core' where `configuration_key` = 'DEFAULT_TEMPLATE'"); - parent::log("Database Update: UPDATE `" . $pf . "configuration` SET `configuration_value` = 'core' where `configuration_key` = 'DEFAULT_TEMPLATE'"); + $lC_Database->simpleQuery("UPDATE `" . $pf . "configuration` SET `configuration_value` = 'core' where `configuration_key` = 'DEFAULT_TEMPLATE';"); + parent::log("Database Update: UPDATE `" . $pf . "configuration` SET `configuration_value` = 'core' where `configuration_key` = 'DEFAULT_TEMPLATE';"); } - $lC_Database->simpleQuery("UPDATE `" . $pf . "configuration` SET `configuration_value` = '100' where `configuration_key` = 'MODULE_ORDER_TOTAL_SUBTOTAL_SORT_ORDER'"); - parent::log("Database Update: UPDATE `" . $pf . "configuration` SET `configuration_value` = '100' where `configuration_key` = 'MODULE_ORDER_TOTAL_SUBTOTAL_SORT_ORDER'"); + $lC_Database->simpleQuery("UPDATE `" . $pf . "configuration` SET `configuration_value` = '100' where `configuration_key` = 'MODULE_ORDER_TOTAL_SUBTOTAL_SORT_ORDER';"); + parent::log("Database Update: UPDATE `" . $pf . "configuration` SET `configuration_value` = '100' where `configuration_key` = 'MODULE_ORDER_TOTAL_SUBTOTAL_SORT_ORDER';"); - $lC_Database->simpleQuery("UPDATE `" . $pf . "configuration` SET `configuration_value` = '200' where `configuration_key` = 'MODULE_ORDER_TOTAL_SHIPPING_SORT_ORDER'"); - parent::log("Database Update: UPDATE `" . $pf . "configuration` SET `configuration_value` = '200' where `configuration_key` = 'MODULE_ORDER_TOTAL_SHIPPING_SORT_ORDER'"); + $lC_Database->simpleQuery("UPDATE `" . $pf . "configuration` SET `configuration_value` = '200' where `configuration_key` = 'MODULE_ORDER_TOTAL_SHIPPING_SORT_ORDER';"); + parent::log("Database Update: UPDATE `" . $pf . "configuration` SET `configuration_value` = '200' where `configuration_key` = 'MODULE_ORDER_TOTAL_SHIPPING_SORT_ORDER';"); - $lC_Database->simpleQuery("UPDATE `" . $pf . "configuration` SET `configuration_value` = '300' where `configuration_key` = 'MODULE_ORDER_TOTAL_COUPON_SORT_ORDER'"); - parent::log("Database Update: UPDATE `" . $pf . "configuration` SET `configuration_value` = '300' where `configuration_key` = 'MODULE_ORDER_TOTAL_COUPON_SORT_ORDER'"); + $lC_Database->simpleQuery("UPDATE `" . $pf . "configuration` SET `configuration_value` = '300' where `configuration_key` = 'MODULE_ORDER_TOTAL_COUPON_SORT_ORDER';"); + parent::log("Database Update: UPDATE `" . $pf . "configuration` SET `configuration_value` = '300' where `configuration_key` = 'MODULE_ORDER_TOTAL_COUPON_SORT_ORDER';"); - $lC_Database->simpleQuery("UPDATE `" . $pf . "configuration` SET `configuration_value` = '500' where `configuration_key` = 'MODULE_ORDER_TOTAL_TAX_SORT_ORDER'"); - parent::log("Database Update: UPDATE `" . $pf . "configuration` SET `configuration_value` = '500' where `configuration_key` = 'MODULE_ORDER_TOTAL_TAX_SORT_ORDER'"); + $lC_Database->simpleQuery("UPDATE `" . $pf . "configuration` SET `configuration_value` = '500' where `configuration_key` = 'MODULE_ORDER_TOTAL_TAX_SORT_ORDER';"); + parent::log("Database Update: UPDATE `" . $pf . "configuration` SET `configuration_value` = '500' where `configuration_key` = 'MODULE_ORDER_TOTAL_TAX_SORT_ORDER';"); - $lC_Database->simpleQuery("UPDATE `" . $pf . "configuration` SET `configuration_value` = '600' where `configuration_key` = 'MODULE_ORDER_TOTAL_TOTAL_SORT_ORDER'"); - parent::log("Database Update: UPDATE `" . $pf . "configuration` SET `configuration_value` = '600' where `configuration_key` = 'MODULE_ORDER_TOTAL_TOTAL_SORT_ORDER'"); + $lC_Database->simpleQuery("UPDATE `" . $pf . "configuration` SET `configuration_value` = '600' where `configuration_key` = 'MODULE_ORDER_TOTAL_TOTAL_SORT_ORDER';"); + parent::log("Database Update: UPDATE `" . $pf . "configuration` SET `configuration_value` = '600' where `configuration_key` = 'MODULE_ORDER_TOTAL_TOTAL_SORT_ORDER';"); - $lC_Database->simpleQuery("UPDATE `" . $pf . "configuration` SET `configuration_value` = '-1' where `configuration_key` = 'USE_DEFAULT_TEMPLATE_STYLESHEET'"); - parent::log("Database Update: UPDATE `" . $pf . "configuration` SET `configuration_value` = '-1' where `configuration_key` = 'USE_DEFAULT_TEMPLATE_STYLESHEET'"); + $lC_Database->simpleQuery("UPDATE `" . $pf . "configuration` SET `configuration_value` = '-1' where `configuration_key` = 'USE_DEFAULT_TEMPLATE_STYLESHEET';"); + parent::log("Database Update: UPDATE `" . $pf . "configuration` SET `configuration_value` = '-1' where `configuration_key` = 'USE_DEFAULT_TEMPLATE_STYLESHEET';"); - $lC_Database->simpleQuery("UPDATE `" . $pf . "configuration` SET `configuration_title` = 'Tag Cloud Maximum Listings' where `configuration_key` = 'TAG_CLOUD_MAX_LIST'"); - parent::log("Database Update: UPDATE `" . $pf . "configuration` SET `configuration_title` = 'Tag Cloud Maximum Listings' where `configuration_key` = 'TAG_CLOUD_MAX_LIST'"); - $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . $pf . "featured_products` (id int(11) NOT NULL AUTO_INCREMENT, products_id int(11) NOT NULL DEFAULT '0', date_added datetime NOT NULL DEFAULT '0000-00-00 00:00:00', last_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00', expires_date datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `status` int(1) DEFAULT '1', PRIMARY KEY (id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci"); - parent::log("Database Update: CREATE TABLE IF NOT EXISTS `" . $pf . "featured_products` (id int(11) NOT NULL AUTO_INCREMENT, products_id int(11) NOT NULL DEFAULT '0', date_added datetime NOT NULL DEFAULT '0000-00-00 00:00:00', last_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00', expires_date datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `status` int(1) DEFAULT '1', PRIMARY KEY (id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci"); + $lC_Database->simpleQuery("UPDATE `" . $pf . "configuration` SET `configuration_title` = 'Tag Cloud Maximum Listings' where `configuration_key` = 'TAG_CLOUD_MAX_LIST';"); + parent::log("Database Update: UPDATE `" . $pf . "configuration` SET `configuration_title` = 'Tag Cloud Maximum Listings' where `configuration_key` = 'TAG_CLOUD_MAX_LIST';"); + $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . $pf . "featured_products` (id int(11) NOT NULL AUTO_INCREMENT, products_id int(11) NOT NULL DEFAULT '0', date_added datetime NOT NULL DEFAULT '0000-00-00 00:00:00', last_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00', expires_date datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `status` int(1) DEFAULT '1', PRIMARY KEY (id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); + parent::log("Database Update: CREATE TABLE IF NOT EXISTS `" . $pf . "featured_products` (id int(11) NOT NULL AUTO_INCREMENT, products_id int(11) NOT NULL DEFAULT '0', date_added datetime NOT NULL DEFAULT '0000-00-00 00:00:00', last_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00', expires_date datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `status` int(1) DEFAULT '1', PRIMARY KEY (id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); - $lC_Database->simpleQuery("UPDATE `" . $pf . "configuration` SET `configuration_key` = 'AUTODISABLE_OUT_OF_STOCK_PRODUCT',`configuration_title` = 'Autodisable out of stock product',`configuration_description` = 'Set product as IN-ACTIVE if there is insufficient stock that is 0 or below' WHERE `configuration_id` = 61"); - parent::log("Database Update: UPDATE `" . $pf . "configuration` SET `configuration_key` = 'AUTODISABLE_OUT_OF_STOCK_PRODUCT',`configuration_title` = 'Autodisable out of stock product',`configuration_description` = 'Set product as IN-ACTIVE if there is insufficient stock that is 0 or below' WHERE `configuration_id` = 61"); + $lC_Database->simpleQuery("UPDATE `" . $pf . "configuration` SET `configuration_key` = 'AUTODISABLE_OUT_OF_STOCK_PRODUCT',`configuration_title` = 'Autodisable out of stock product',`configuration_description` = 'Set product as IN-ACTIVE if there is insufficient stock that is 0 or below' WHERE `configuration_id` = 61;"); + parent::log("Database Update: UPDATE `" . $pf . "configuration` SET `configuration_key` = 'AUTODISABLE_OUT_OF_STOCK_PRODUCT',`configuration_title` = 'Autodisable out of stock product',`configuration_description` = 'Set product as IN-ACTIVE if there is insufficient stock that is 0 or below' WHERE `configuration_id` = 61;"); if (!defined('DISABLE_ADD_TO_CART')) { $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Disable Add to Cart for out of stock products', 'DISABLE_ADD_TO_CART', '1', 'Disabled the add to cart button on the product page displays text that product is out of stock', 9, 3, NULL, '2009-11-26 15:58:32', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); @@ -206,15 +206,15 @@ public static function updateDB() { $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "branding` ADD `homepage_text` VARCHAR(20000) NOT NULL DEFAULT '' AFTER `language_id`;"); parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "branding` ADD `homepage_text` VARCHAR(20000) NOT NULL DEFAULT '' AFTER `language_id`;"); - $lC_Database->simpleQuery("UPDATE `" . $pf . "currencies` SET `symbol_left` = '€' where `code` = 'EUR'"); - parent::log("Database Update: UPDATE `" . $pf . "currencies` SET `symbol_left` = '€' where `code` = 'EUR'"); + $lC_Database->simpleQuery("UPDATE `" . $pf . "currencies` SET `symbol_left` = '€' where `code` = 'EUR';"); + parent::log("Database Update: UPDATE `" . $pf . "currencies` SET `symbol_left` = '€' where `code` = 'EUR';"); - $lC_Database->simpleQuery("UPDATE `" . $pf . "currencies` SET `symbol_left` = '£' where `code` = 'GBP'"); - parent::log("Database Update: UPDATE `" . $pf . "currencies` SET `symbol_left` = '£' where `code` = 'GBP'"); + $lC_Database->simpleQuery("UPDATE `" . $pf . "currencies` SET `symbol_left` = '£' where `code` = 'GBP';"); + parent::log("Database Update: UPDATE `" . $pf . "currencies` SET `symbol_left` = '£' where `code` = 'GBP';"); // default values update - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "orders_status_history` ADD `administrators_id` INT( 11 ) NOT NULL DEFAULT '0' AFTER `comments`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "orders_status_history` ADD `administrators_id` INT( 11 ) NOT NULL DEFAULT '0' AFTER `comments`"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "orders_status_history` ADD `administrators_id` INT( 11 ) NOT NULL DEFAULT '0' AFTER `comments`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "orders_status_history` ADD `administrators_id` INT( 11 ) NOT NULL DEFAULT '0' AFTER `comments`;"); $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "administrators` CHANGE `first_name` `first_name` VARCHAR(64) NOT NULL DEFAULT '', CHANGE `last_name` `last_name` VARCHAR(64) NOT NULL DEFAULT '', CHANGE `image` `image` VARCHAR(255) NOT NULL DEFAULT '', CHANGE `access_group_id` `access_group_id` INT(11) NOT NULL DEFAULT '0', CHANGE `verify_key` `verify_key` VARCHAR(64) NOT NULL DEFAULT '';"); parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "administrators` CHANGE `first_name` `first_name` VARCHAR(64) NOT NULL DEFAULT '', CHANGE `last_name` `last_name` VARCHAR(64) NOT NULL DEFAULT '', CHANGE `image` `image` VARCHAR(255) NOT NULL DEFAULT '', CHANGE `access_group_id` `access_group_id` INT(11) NOT NULL DEFAULT '0', CHANGE `verify_key` `verify_key` VARCHAR(64) NOT NULL DEFAULT '';"); @@ -273,56 +273,56 @@ public static function updateDB() { $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "branding_data` ADD COLUMN `custom_css` text NOT NULL;"); parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "branding_data` ADD COLUMN `custom_css` text NOT NULL;"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "products_variants` ADD `default_visual` INT( 11 ) DEFAULT '0' AFTER `default_combo`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "products_variants` ADD `default_visual` INT( 11 ) DEFAULT '0' AFTER `default_combo`"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "products_variants` ADD `default_visual` INT( 11 ) DEFAULT '0' AFTER `default_combo`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "products_variants` ADD `default_visual` INT( 11 ) DEFAULT '0' AFTER `default_combo`;"); - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "products_variants_values` ADD `visual` VARCHAR( 1024 ) DEFAULT NULL AFTER `title`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "products_variants_values` ADD `visual` VARCHAR( 1024 ) DEFAULT NULL AFTER `title`"); + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "products_variants_values` ADD `visual` VARCHAR( 1024 ) DEFAULT NULL AFTER `title`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "products_variants_values` ADD `visual` VARCHAR( 1024 ) DEFAULT NULL AFTER `title`;"); // missing weight class rules - $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (1, 2, 0.0010)"); - parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (1, 2, 0.0010)"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (1, 2, 0.0010);"); + parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (1, 2, 0.0010);"); - $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (1, 3, 0.0352)"); - parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (1, 3, 0.0352)"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (1, 3, 0.0352);"); + parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (1, 3, 0.0352);"); - $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (1, 4, 0.0022)"); - parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (1, 4, 0.0022)"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (1, 4, 0.0022);"); + parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (1, 4, 0.0022);"); - $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (2, 1, 1000.0000)"); - parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (2, 1, 1000.0000)"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (2, 1, 1000.0000);"); + parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (2, 1, 1000.0000);"); - $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (2, 3, 35.2739)"); - parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (2, 3, 35.2739)"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (2, 3, 35.2739);"); + parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (2, 3, 35.2739);"); - $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (2, 4, 2.2046)"); - parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (2, 4, 2.2046)"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (2, 4, 2.2046);"); + parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (2, 4, 2.2046);"); - $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (3, 1, 28.3495)"); - parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (3, 1, 28.3495)"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (3, 1, 28.3495);"); + parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (3, 1, 28.3495);"); - $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (3, 2, 0.0283)"); - parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (3, 2, 0.0283)"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (3, 2, 0.0283);"); + parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (3, 2, 0.0283);"); - $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (3, 4, 0.0625)"); - parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (3, 4, 0.0625)"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (3, 4, 0.0625);"); + parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (3, 4, 0.0625);"); - $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (4, 1, 453.5923)"); - parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (4, 1, 453.5923)"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (4, 1, 453.5923);"); + parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (4, 1, 453.5923);"); - $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (4, 2, 0.4535)"); - parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (4, 2, 0.4535)"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (4, 2, 0.4535);"); + parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (4, 2, 0.4535);"); - $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (4, 3, 16.0000)"); - parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (4, 3, 16.0000)"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (4, 3, 16.0000);"); + parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "weight_classes_rules` (weight_class_from_id, weight_class_to_id, weight_class_rule) VALUES (4, 3, 16.0000);"); - $lC_Database->simpleQuery("UPDATE `" . $pf . "currencies` SET `symbol_left` = '€' where `code` = 'EUR'"); - parent::log("Database Update: UPDATE `" . $pf . "currencies` SET `symbol_left` = '€' where `code` = 'EUR'"); + $lC_Database->simpleQuery("UPDATE `" . $pf . "currencies` SET `symbol_left` = '€' where `code` = 'EUR';"); + parent::log("Database Update: UPDATE `" . $pf . "currencies` SET `symbol_left` = '€' where `code` = 'EUR';"); - $lC_Database->simpleQuery("UPDATE `" . $pf . "currencies` SET `symbol_left` = '£' where `code` = 'GBP'"); - parent::log("Database Update: UPDATE `" . $pf . "currencies` SET `symbol_left` = '£' where `code` = 'GBP'"); - $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "configuration_group` (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES (10, 'Sessions', 'Session settings', 10, 1)"); - parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "configuration_group` (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES (10, 'Sessions', 'Session settings', 10, 1)"); + $lC_Database->simpleQuery("UPDATE `" . $pf . "currencies` SET `symbol_left` = '£' where `code` = 'GBP';"); + parent::log("Database Update: UPDATE `" . $pf . "currencies` SET `symbol_left` = '£' where `code` = 'GBP';"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "configuration_group` (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES (10, 'Sessions', 'Session settings', 10, 1);"); + parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "configuration_group` (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES (10, 'Sessions', 'Session settings', 10, 1);"); if (!defined('SESSION_LIFETIME')) { $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Session Lifetime', 'SESSION_LIFETIME', 3600, 'The amount of time a user is logged in for after the last action in seconds.', 10, 0, now(), now(), NULL, NULL);"); @@ -334,9 +334,24 @@ public static function updateDB() { parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Force Cookie Use', 'SESSION_FORCE_COOKIES', -1, 'Force the use cookies to handle sessions.', 10, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); } - $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "orders_products` ADD COLUMN `products_sku` VARCHAR(255) DEFAULT NULL AFTER `products_model`"); - parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "orders_products` ADD COLUMN `products_sku` VARCHAR(255) DEFAULT NULL AFTER `products_model`"); - + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "orders_products` ADD COLUMN `products_sku` VARCHAR(255) DEFAULT NULL AFTER `products_model`;"); + parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "orders_products` ADD COLUMN `products_sku` VARCHAR(255) DEFAULT NULL AFTER `products_model`;"); + + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "configuration_group` (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES (22, 'Product Info Page', 'Settings specific to the product information page.', 22, 1);"); + parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "configuration_group` (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES (22, 'Product Info Page', 'Settings specific to the product information page.', 22, 1);"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Enable Facebook Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_FACEBOOK', -1, 'Allow people to share with Facebook', 22, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Enable Facebook Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_FACEBOOK', -1, 'Allow people to share with Facebook', 22, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Enable Twitter Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_TWITTER', -1, 'Allow people to share with Twitter', 22, 1, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Enable Twitter Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_TWITTER', -1, 'Allow people to share with Twitter', 22, 1, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Enable Google+ Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_GOOGLE', -1, 'Allow people to share with Google+', 22, 2, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Enable Google+ Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_GOOGLE', -1, 'Allow people to share with Google+', 22, 2, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Enable Pinterest Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_PIN', -1, 'Allow people to share with Pinterest', 22, 3, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Enable Pinterest Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_PIN', -1, 'Allow people to share with Pinterest', 22, 3, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Enable LinkedIn Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_LINKED', -1, 'Allow people to share with LinkedIn', 22, 4, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Enable LinkedIn Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_LINKED', -1, 'Allow people to share with LinkedIn', 22, 4, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Enable Tumblr Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_TUMBLR', -1, 'Allow people to share with Tumblr', 22, 5, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Enable Tumblr Share Icon', 'PRODUCT_INFO_SOCIAL_SHARE_TUMBLR', -1, 'Allow people to share with Tumblr', 22, 5, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); + } } ?> \ No newline at end of file From 5c97a97bacd657cb810a31e68087bad2524f34bf Mon Sep 17 00:00:00 2001 From: datazen Date: Fri, 27 Jun 2014 19:05:16 -0400 Subject: [PATCH 033/168] adjusted text and added pro button --- .../applications/product_variants/modal/edit.php | 11 ++++++++++- .../applications/product_variants/modal/new.php | 2 +- catalog/admin/includes/languages/en_US.php | 3 ++- catalog/admin/includes/languages/en_US/login.php | 1 - 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/catalog/admin/includes/applications/product_variants/modal/edit.php b/catalog/admin/includes/applications/product_variants/modal/edit.php index 6904d46b1..942518dfa 100644 --- a/catalog/admin/includes/applications/product_variants/modal/edit.php +++ b/catalog/admin/includes/applications/product_variants/modal/edit.php @@ -76,6 +76,13 @@ classes: 'blue-gradient glossy', } }).form(); if (bValid) { + var module = $('#editModule').val(); + var isPro = ''; + if (isPro == false && (module == 'file_upload' || module == 'multiple_file_upload')) { + $.modal.alert('

get('text_available_with_pro'); ?>

get('button_buy_pro'); ?>

'); + return false; + } + var nvp = $("#pvEdit").serialize(); var jsonLink = 'getModule() . '&action=saveGroup&pvid=PVID&BATCH'); ?>' $.getJSON(jsonLink.replace('PVID', parseInt(id)).replace('BATCH', nvp), @@ -103,10 +110,12 @@ function (data) { $.each(data.modulesArray, function(val, text) { var selected = (data.pvData.module == val) ? 'selected="selected"' : ''; var text = text.replace(/_/g, " ").replace(/\b./g, function(m){ return m.toUpperCase(); }); + var isPro = ''; if(data.pvData.module == val) { $("#editModule").closest("span + *").prevAll("span.select-value:first").text(text); } - $("#editModule").append( + if ( isPro == false && (val == 'file_upload' || val == 'multiple_file_upload')) text = text + ' (PRO)'; + $("#editModule").append( $("").val(val).html(text) ); }); diff --git a/catalog/admin/includes/applications/product_variants/modal/new.php b/catalog/admin/includes/applications/product_variants/modal/new.php index c36aa35a0..39bb3e6c9 100644 --- a/catalog/admin/includes/applications/product_variants/modal/new.php +++ b/catalog/admin/includes/applications/product_variants/modal/new.php @@ -79,7 +79,7 @@ classes: 'blue-gradient glossy', var module = $('#module').val(); var isPro = ''; if (isPro == false && (module == 'file_upload' || module == 'multiple_file_upload')) { - $.modal.alert('get('text_available_with_pro'); ?>'); + $.modal.alert('

get('text_available_with_pro'); ?>

get('button_buy_pro'); ?>

'); return false; } diff --git a/catalog/admin/includes/languages/en_US.php b/catalog/admin/includes/languages/en_US.php index af024ff6a..087be604a 100644 --- a/catalog/admin/includes/languages/en_US.php +++ b/catalog/admin/includes/languages/en_US.php @@ -17,6 +17,7 @@ button_back = Back button_back_to_list = Back to List button_backup = Backup +button_buy_pro = Get the Pro Version button_cancel = Cancel button_clear_all = Clear All button_close = Close @@ -370,6 +371,6 @@ text_no = No text_featured_product_expired = Featured Product has Expired! text_featured_product_no_expiration = No Expiration -text_available_with_pro = Available free with the PRO edition +text_available_with_pro = This feature available with the PRO edition text_free_with_pro_edition = PRO Free with Pro Edition error_specials_date = Error: The specials expire date cannot be before the start date. \ No newline at end of file diff --git a/catalog/admin/includes/languages/en_US/login.php b/catalog/admin/includes/languages/en_US/login.php index 07f9b9f80..4746ac6f7 100644 --- a/catalog/admin/includes/languages/en_US/login.php +++ b/catalog/admin/includes/languages/en_US/login.php @@ -13,7 +13,6 @@ button_activate_free = Activate Free Features button_activate_pro = Activate Pro Features -button_buy_pro = Get the Pro Version button_login = Login button_lost_password = Lost password button_register = Register From a75bc81115e9194a51c55d463a8d5a57299d739c Mon Sep 17 00:00:00 2001 From: datazen Date: Tue, 1 Jul 2014 16:19:02 -0400 Subject: [PATCH 034/168] updated version.txt --- catalog/includes/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/includes/version.txt b/catalog/includes/version.txt index ff32b2d1a..46a12f0ea 100644 --- a/catalog/includes/version.txt +++ b/catalog/includes/version.txt @@ -1 +1 @@ -7.002.4.1|06/27/2014 +7.002.4.2|07/01/2014 From c757c9c37b1b5a48f0eb98eae06f09056acda478 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Wed, 2 Jul 2014 13:20:54 -0400 Subject: [PATCH 035/168] much work on new categories features --- catalog/includes/classes/category_tree.php | 8 ++++---- catalog/includes/content/index/index.php | 2 +- catalog/includes/modules/boxes/categories.php | 5 +++-- catalog/templates/core/css/template.css | 4 ++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/catalog/includes/classes/category_tree.php b/catalog/includes/classes/category_tree.php index 361baa95f..2954bed1a 100644 --- a/catalog/includes/classes/category_tree.php +++ b/catalog/includes/classes/category_tree.php @@ -195,9 +195,9 @@ protected function _buildBranch($parent_id, $level = 0) { if ( isset($this->_data[$category_id]) && (($this->max_level == '0') || ($this->max_level > $level+1)) ) { if ( $this->follow_cpath === true ) { // commented out below due to hindering the loading of the full category tree store side - //if ( in_array($category_id, $this->cpath_array) ) { - $result .= $this->_buildBranch($category_id, $level+1); - //} + if ( in_array($category_id, explode("_", $_GET['cPath'])) ) { + $result .= $this->_buildBranch($category_id, $level+1); + } } else { $result .= $this->_buildBranch($category_id, $level+1); } @@ -274,7 +274,7 @@ function buildBreadcrumb($category_id, $level = 0) { * @return string */ - public function getTree($aria = 1) { + public function getTree($aria = 1) { return $this->_start_string . $this->_buildBranch($this->root_category_id, null, $aria) . $this->_end_string; } diff --git a/catalog/includes/content/index/index.php b/catalog/includes/content/index/index.php index c4fa248c2..cfd831d6e 100644 --- a/catalog/includes/content/index/index.php +++ b/catalog/includes/content/index/index.php @@ -58,7 +58,7 @@ public function lC_Index_Index() { $cPath = end(explode("_", $cData['query'])); $current_category_id = $cData['item_id']; } else { - $cPath = end(explode("_", $_GET['cPath'])); + $cPath = $_GET['cPath']; } if (isset($cPath) && (empty($cPath) === false)) { diff --git a/catalog/includes/modules/boxes/categories.php b/catalog/includes/modules/boxes/categories.php index 1af1a0cc7..b804a919e 100644 --- a/catalog/includes/modules/boxes/categories.php +++ b/catalog/includes/modules/boxes/categories.php @@ -24,18 +24,19 @@ function lC_Boxes_categories() { function initialize() { global $lC_CategoryTree, $cPath; - + $lC_CategoryTree->reset(); // added to control maximum level of categories infobox if desired if (isset($_SESSION['setCategoriesMaximumLevel']) && $_SESSION['setCategoriesMaximumLevel'] != '') { $lC_CategoryTree->setMaximumLevel($_SESSION['setCategoriesMaximumLevel']); } - $lC_CategoryTree->setCategoryPath($cPath, '', ''); + $lC_CategoryTree->setCategoryPath($cPath, '', ''); $lC_CategoryTree->setParentGroupStringTop('
    ', '
'); $lC_CategoryTree->setParentGroupString('
    ', '
'); $lC_CategoryTree->setChildStringWithChildren('
  • ', '
    • '); $lC_CategoryTree->setUseAria(true); $lC_CategoryTree->setShowCategoryProductCount((BOX_CATEGORIES_SHOW_PRODUCT_COUNT == '1') ? true : false); + //$lC_CategoryTree->setRootCategoryID(BOX_CATEGORIES_ROOT_CATEGORY); $this->_content = $lC_CategoryTree->getTree(); diff --git a/catalog/templates/core/css/template.css b/catalog/templates/core/css/template.css index 025b1afe0..8cae2e815 100644 --- a/catalog/templates/core/css/template.css +++ b/catalog/templates/core/css/template.css @@ -707,6 +707,10 @@ #loaded7 .pr_gallery li:hover { border:1px solid #f0ad4e; } + +#loaded7 span.active-cpath { + font-weight: bold; +} /********************************************************/ /* 7. Error classes */ From e33edbb97219977187f32e6aa726a6e619eb784e Mon Sep 17 00:00:00 2001 From: datazen Date: Tue, 8 Jul 2014 09:42:39 -0400 Subject: [PATCH 036/168] working on 2.5 changes --- .../includes/applications/index/classes/rpc.php | 15 ++++++++++++++- .../includes/applications/index/js/index.js.php | 8 +------- .../includes/applications/login/classes/rpc.php | 14 -------------- .../includes/applications/login/js/login.js.php | 12 ------------ catalog/admin/templates/default/general.js.php | 12 ++++++++++++ catalog/includes/version.txt | 2 +- 6 files changed, 28 insertions(+), 35 deletions(-) diff --git a/catalog/admin/includes/applications/index/classes/rpc.php b/catalog/admin/includes/applications/index/classes/rpc.php index 59d380e92..712aeaf2b 100644 --- a/catalog/admin/includes/applications/index/classes/rpc.php +++ b/catalog/admin/includes/applications/index/classes/rpc.php @@ -15,6 +15,7 @@ require_once($lC_Vqmod->modCheck('includes/applications/products/classes/products.php')); require_once($lC_Vqmod->modCheck('includes/classes/category_tree.php')); require_once($lC_Vqmod->modCheck('includes/applications/administrators_log/classes/administrators_log.php')); +require_once($lC_Vqmod->modCheck('includes/applications/login/classes/login.php')); class lC_Index_Admin_rpc { @@ -273,6 +274,18 @@ public static function noRemindResize() { echo json_encode($result); } - + /* + * perform an API health check + * + * @access public + * @return json + */ + public static function apiHealthCheck() { + lC_Login_Admin::apiCheck(); + + $result['rpcStatus'] = RPC_STATUS_SUCCESS; + + echo json_encode($result); + } } ?> \ No newline at end of file diff --git a/catalog/admin/includes/applications/index/js/index.js.php b/catalog/admin/includes/applications/index/js/index.js.php index c48ceaab7..184c871c0 100644 --- a/catalog/admin/includes/applications/index/js/index.js.php +++ b/catalog/admin/includes/applications/index/js/index.js.php @@ -8,14 +8,8 @@ @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt @version $Id: index.js.php v1.0 2013-08-08 datazen $ */ -?> - -modCheck('includes/applications/index/classes/index.php')); ?> diff --git a/catalog/admin/includes/applications/login/classes/rpc.php b/catalog/admin/includes/applications/login/classes/rpc.php index e2fdf96a8..d6a8a8411 100644 --- a/catalog/admin/includes/applications/login/classes/rpc.php +++ b/catalog/admin/includes/applications/login/classes/rpc.php @@ -98,20 +98,6 @@ public static function validateSerial() { $result = lC_Login_Admin::validateSerial($_GET['activation_serial']); - echo json_encode($result); - } - - /* - * ping the API server and make sure we get a response - * - * @access public - * @return json - */ - public static function apiHealthCheck() { - lC_Login_Admin::apiCheck(); - - $result['rpcStatus'] = RPC_STATUS_SUCCESS; - echo json_encode($result); } } diff --git a/catalog/admin/includes/applications/login/js/login.js.php b/catalog/admin/includes/applications/login/js/login.js.php index 76e59b994..a7f30cca7 100644 --- a/catalog/admin/includes/applications/login/js/login.js.php +++ b/catalog/admin/includes/applications/login/js/login.js.php @@ -13,17 +13,5 @@ $(document).ready(function() { $('body').removeClass('clearfix with-menu with-shortcuts'); $('html').addClass('linen'); - - // added for api communication health check - apiHealthCheck(); }); - -function apiHealthCheck() { - var jsonLink = ''; - $.getJSON(jsonLink, - function (data) { - return true; - } - ); -} \ No newline at end of file diff --git a/catalog/admin/templates/default/general.js.php b/catalog/admin/templates/default/general.js.php index 309cbe3e4..cb72d1dc9 100644 --- a/catalog/admin/templates/default/general.js.php +++ b/catalog/admin/templates/default/general.js.php @@ -129,6 +129,18 @@ // check for updates and show notification if necessary only on login var referer = ''; if (referer.indexOf('index.php?login') != -1) { + // do an api health check first + function apiHealthCheck(callback) { + var jsonLink = ''; + $.getJSON(jsonLink, + function (data) { + callback(data.rpcStatus); + } + ); + } + + var ok = apiHealthCheck(); + var title = 'get('update_message_title'), 'style="color:white;"'); ?>'; var uData = ; if (uData.hasUpdates) { diff --git a/catalog/includes/version.txt b/catalog/includes/version.txt index 46a12f0ea..6f3ac2bfa 100644 --- a/catalog/includes/version.txt +++ b/catalog/includes/version.txt @@ -1 +1 @@ -7.002.4.2|07/01/2014 +7.002.5.0|07/15/2014 From af61c76a9d86f44482d36a407664055512be22de Mon Sep 17 00:00:00 2001 From: datazen Date: Tue, 8 Jul 2014 09:56:57 -0400 Subject: [PATCH 037/168] moved api health check --- .../applications/index/classes/rpc.php | 16 +----- .../applications/login/classes/login.php | 9 ++-- .../admin/templates/default/general.js.php | 50 +++++++------------ 3 files changed, 25 insertions(+), 50 deletions(-) diff --git a/catalog/admin/includes/applications/index/classes/rpc.php b/catalog/admin/includes/applications/index/classes/rpc.php index 712aeaf2b..46a8e4040 100644 --- a/catalog/admin/includes/applications/index/classes/rpc.php +++ b/catalog/admin/includes/applications/index/classes/rpc.php @@ -239,18 +239,6 @@ public static function getAll() { echo json_encode($result); } /* - * Removes the api check status tmp file - * - * @access public - * @return json - */ - public static function removeApiTmp() { - @unlink(DIR_FS_WORK . 'apinocom.tmp'); - $result['rpcStatus'] = RPC_STATUS_SUCCESS; - - echo json_encode($result); - } - /* * Removes the image resize check status tmp file * * @access public @@ -281,9 +269,7 @@ public static function noRemindResize() { * @return json */ public static function apiHealthCheck() { - lC_Login_Admin::apiCheck(); - - $result['rpcStatus'] = RPC_STATUS_SUCCESS; + $result['rpcStatus'] = lC_Login_Admin::apiCheck(); echo json_encode($result); } diff --git a/catalog/admin/includes/applications/login/classes/login.php b/catalog/admin/includes/applications/login/classes/login.php index cd32d9626..44fb532c0 100644 --- a/catalog/admin/includes/applications/login/classes/login.php +++ b/catalog/admin/includes/applications/login/classes/login.php @@ -270,10 +270,13 @@ public static function apiCheck() { } if ($versions == null || $error) { // set the error flag - if ( is_writable(DIR_FS_WORK) ) { - file_put_contents(DIR_FS_WORK . 'apinocom.tmp', '[' . lC_DateTime::getNow('d-M-Y H:i:s') . '] ' . $errorMsg . "\n", FILE_APPEND); - } + return false; + // if ( is_writable(DIR_FS_WORK) ) { + // file_put_contents(DIR_FS_WORK . 'apinocom.tmp', '[' . lC_DateTime::getNow('d-M-Y H:i:s') . '] ' . $errorMsg . "\n", FILE_APPEND); + // } } + + return true; } /* * Download the product PHARs diff --git a/catalog/admin/templates/default/general.js.php b/catalog/admin/templates/default/general.js.php index cb72d1dc9..090eb0068 100644 --- a/catalog/admin/templates/default/general.js.php +++ b/catalog/admin/templates/default/general.js.php @@ -130,16 +130,30 @@ var referer = ''; if (referer.indexOf('index.php?login') != -1) { // do an api health check first - function apiHealthCheck(callback) { + function apiHealthCheck() { var jsonLink = ''; $.getJSON(jsonLink, function (data) { - callback(data.rpcStatus); + if (data.rpcStatus != 1) { + + var text = 'get('text_api_health_check'); ?>'; + api = $.modal({ + title: 'get('text_api_com_issue'); ?>', + content: 'get('text_api_com_issue_warnings'); ?>', + buttons: { + 'get('button_understood'); ?>': { + classes: 'glossy big full-width', + click: function(win) { win.closeModal(); } + } + } + }); + $(api); + + } } ); } - - var ok = apiHealthCheck(); + apiHealthCheck(); var title = 'get('update_message_title'), 'style="color:white;"'); ?>'; var uData = ; @@ -459,19 +473,6 @@ classes: 'blue-gradient glossy', }); } - // added for api communication health check - if (module == 'index') { - var apiNoCom = ''; - if (apiNoCom == '1' && isLoggedIn == '1' && module != 'login') { - _apiHealthCheckAlert(); - var jsonLink = ''; - $.getJSON(jsonLink, - function (data) { - return true; - } - ); - } - } setTimeout(function() { $("#dataTable_length").find('select').addClass("input with-small-padding"); }, 700); @@ -481,21 +482,6 @@ function (data) { }); }); -function _apiHealthCheckAlert() { - var text = 'get('text_api_health_check'); ?>'; - api = $.modal({ - title: 'get('text_api_com_issue'); ?>', - content: 'get('text_api_com_issue_warnings'); ?>', - buttons: { - 'get('button_understood'); ?>': { - classes: 'glossy big full-width', - click: function(win) { win.closeModal(); } - } - } - }); - $(api); -} - function _resizeImages() { var text = 'get('text_resize_images'); ?>'; mm = $.modal({ From 3c688be5ec548128359af2e0ffbc816d36c18465 Mon Sep 17 00:00:00 2001 From: datazen Date: Tue, 8 Jul 2014 09:59:39 -0400 Subject: [PATCH 038/168] moved api check to after login process --- .../admin/includes/applications/login/classes/login.php | 7 ++----- catalog/admin/templates/default/general.js.php | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/catalog/admin/includes/applications/login/classes/login.php b/catalog/admin/includes/applications/login/classes/login.php index 44fb532c0..64b5fda5c 100644 --- a/catalog/admin/includes/applications/login/classes/login.php +++ b/catalog/admin/includes/applications/login/classes/login.php @@ -270,13 +270,10 @@ public static function apiCheck() { } if ($versions == null || $error) { // set the error flag - return false; - // if ( is_writable(DIR_FS_WORK) ) { - // file_put_contents(DIR_FS_WORK . 'apinocom.tmp', '[' . lC_DateTime::getNow('d-M-Y H:i:s') . '] ' . $errorMsg . "\n", FILE_APPEND); - // } + return -1; } - return true; + return 1; } /* * Download the product PHARs diff --git a/catalog/admin/templates/default/general.js.php b/catalog/admin/templates/default/general.js.php index 090eb0068..ea6038d51 100644 --- a/catalog/admin/templates/default/general.js.php +++ b/catalog/admin/templates/default/general.js.php @@ -135,7 +135,6 @@ function apiHealthCheck() { $.getJSON(jsonLink, function (data) { if (data.rpcStatus != 1) { - var text = 'get('text_api_health_check'); ?>'; api = $.modal({ title: 'get('text_api_com_issue'); ?>', @@ -148,7 +147,6 @@ classes: 'glossy big full-width', } }); $(api); - } } ); From 49f851b30a305cbe97f45ae3527dc73b9ff469e5 Mon Sep 17 00:00:00 2001 From: datazen Date: Wed, 9 Jul 2014 15:45:39 -0400 Subject: [PATCH 039/168] repaired addon array --- .../includes/applications/login/classes/login.php | 2 +- catalog/admin/includes/classes/addons.php | 7 ++----- catalog/includes/classes/addons.php | 13 +++++-------- catalog/includes/classes/utility.php | 4 ++++ 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/catalog/admin/includes/applications/login/classes/login.php b/catalog/admin/includes/applications/login/classes/login.php index 64b5fda5c..8e079773c 100644 --- a/catalog/admin/includes/applications/login/classes/login.php +++ b/catalog/admin/includes/applications/login/classes/login.php @@ -321,7 +321,7 @@ public static function getProVersionTag() { if (utility::isB2B()) { return 'B2B' . $lC_Language->get('text_version') . ' ' . utility::getB2BVersion(); - } else { + } else if (utility::isPro()) { return 'PRO' . $lC_Language->get('text_version') . ' ' . utility::getProVersion(); } } diff --git a/catalog/admin/includes/classes/addons.php b/catalog/admin/includes/classes/addons.php index 91b85e1b1..7958dabf2 100644 --- a/catalog/admin/includes/classes/addons.php +++ b/catalog/admin/includes/classes/addons.php @@ -549,11 +549,8 @@ private static function _init() { $class = $nameArr[count($nameArr)-2]; if (file_exists($ao['path'])) { - // if (isset($aoData)) { - // } else { - include_once($lC_Vqmod->modCheck($ao['path'])); - $aoData = new $class(); - // } + include_once($lC_Vqmod->modCheck($ao['path'])); + $aoData = new $class(); if ($aoData->isAutoInstall()) { if (defined('ADDONS_' . strtoupper($aoData->getAddonType()) . '_' . strtoupper($class) . '_STATUS')) { diff --git a/catalog/includes/classes/addons.php b/catalog/includes/classes/addons.php index 1b20d5cf7..0c9f699a1 100644 --- a/catalog/includes/classes/addons.php +++ b/catalog/includes/classes/addons.php @@ -34,7 +34,7 @@ public function getAddons($flag = '') { } if ($flag == 'enabled') { - $dArr = array(); + $dArr = array(); foreach($this->_data as $ao => $aoData) { if ($aoData['enabled'] == true) $dArr[$ao] = $aoData; } @@ -62,16 +62,13 @@ protected function _initialize() { $ao = utility::cleanArr($addon); if ($ao['name'] != 'controller.php') continue; - + $nameArr = explode('/', $ao['path']); $class = $nameArr[count($nameArr)-2]; if (file_exists($ao['path'])) { - if (isset($aoData)) { - } else { - include_once($lC_Vqmod->modCheck($ao['path'])); - $aoData = new $class(); - } + include_once($lC_Vqmod->modCheck($ao['path'])); + $aoData = new $class(); $_SESSION['lC_Addons_data'][$class] = array('type' => $aoData->getAddonType(), 'title' => $aoData->getAddonTitle(), @@ -89,7 +86,7 @@ protected function _initialize() { if ($aoData->isEnabled()) $enabled .= $addon['path'] . ';'; } } - + if ($enabled != '') $enabled = substr($enabled, 0, -1); if (!file_exists(DIR_FS_WORK . 'cache/addons.cache')) { file_put_contents(DIR_FS_WORK . 'cache/addons.cache', serialize($enabled)); diff --git a/catalog/includes/classes/utility.php b/catalog/includes/classes/utility.php index c32d0cd44..6b1f279ce 100644 --- a/catalog/includes/classes/utility.php +++ b/catalog/includes/classes/utility.php @@ -488,6 +488,10 @@ public static function getProVersion() { if (!isset($lC_Addons)) $lC_Addons = new lC_Addons; $aoArr = $lC_Addons->getAddons('enabled'); +echo "
    ";
+print_r($aoArr);
+echo "
    "; +die('44'); return $aoArr['Loaded_7_Pro']['version']; } /** From 11197786324aca54553da0a97fd6ff05f22a1ad2 Mon Sep 17 00:00:00 2001 From: datazen Date: Wed, 9 Jul 2014 15:46:12 -0400 Subject: [PATCH 040/168] remove debug --- catalog/includes/classes/utility.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/catalog/includes/classes/utility.php b/catalog/includes/classes/utility.php index 6b1f279ce..c32d0cd44 100644 --- a/catalog/includes/classes/utility.php +++ b/catalog/includes/classes/utility.php @@ -488,10 +488,6 @@ public static function getProVersion() { if (!isset($lC_Addons)) $lC_Addons = new lC_Addons; $aoArr = $lC_Addons->getAddons('enabled'); -echo "
    ";
-print_r($aoArr);
-echo "
    "; -die('44'); return $aoArr['Loaded_7_Pro']['version']; } /** From 7181fe1411044ff79aa61003723f523bb0e9bee9 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Wed, 9 Jul 2014 15:49:46 -0400 Subject: [PATCH 041/168] updated categories listing for deepest category showing last categories tree branch in listing --- catalog/templates/core/classes/output.php | 42 ++++++++++++----------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/catalog/templates/core/classes/output.php b/catalog/templates/core/classes/output.php index 24989801b..070c70532 100644 --- a/catalog/templates/core/classes/output.php +++ b/catalog/templates/core/classes/output.php @@ -108,15 +108,16 @@ public static function getCategoryListing() { if (isset($cPath) && strpos($cPath, '_')) { // check to see if there are deeper categories within the current category $category_links = array_reverse($cPath_array); - for($i=0, $n=sizeof($category_links); $i<$n; $i++) { - $Qcategories = $lC_Database->query('select count(*) as total from :table_categories c, :table_categories_description cd where c.parent_id = :parent_id and c.categories_id = cd.categories_id and cd.language_id = :language_id and c.categories_status = 1'); - $Qcategories->bindTable(':table_categories', TABLE_CATEGORIES); - $Qcategories->bindTable(':table_categories_description', TABLE_CATEGORIES_DESCRIPTION); - $Qcategories->bindInt(':parent_id', $category_links[$i]); - $Qcategories->bindInt(':language_id', $lC_Language->getID()); - $Qcategories->execute(); - - if ($Qcategories->valueInt('total') < 1) { + + for($i=0, $n=sizeof(end($category_links)); $i<$n; $i++) { + $Qcategoriescount = $lC_Database->query('select count(*) as total from :table_categories c, :table_categories_description cd where c.parent_id = :parent_id and c.categories_id = cd.categories_id and cd.language_id = :language_id and c.categories_status = 1'); + $Qcategoriescount->bindTable(':table_categories', TABLE_CATEGORIES); + $Qcategoriescount->bindTable(':table_categories_description', TABLE_CATEGORIES_DESCRIPTION); + $Qcategoriescount->bindInt(':parent_id', $category_links[$i]); + $Qcategoriescount->bindInt(':language_id', $lC_Language->getID()); + $Qcategoriescount->execute(); + + if ($Qcategoriescount->valueInt('total') < 1) { // do nothing, go through the loop } else { $Qcategories = $lC_Database->query('select c.categories_id, cd.categories_name, c.categories_image, c.parent_id from :table_categories c, :table_categories_description cd where c.parent_id = :parent_id and c.categories_id = cd.categories_id and cd.language_id = :language_id and c.categories_status = 1 order by sort_order, cd.categories_name'); @@ -136,20 +137,21 @@ public static function getCategoryListing() { $Qcategories->bindInt(':language_id', $lC_Language->getID()); $Qcategories->execute(); } - $number_of_categories = $Qcategories->numberOfRows(); - $rows = 0; $output = ''; - while ($Qcategories->next()) { + if ($Qcategories != null) { + $number_of_categories = $Qcategories->numberOfRows(); + while ($Qcategories->next()) { + + $url = ($Qcategories->value('categories_custom_url') != null) ? $Qcategories->value('categories_custom_url') : FILENAME_DEFAULT . '?cPath=' . $lC_CategoryTree->buildBreadcrumb($Qcategories->valueInt('categories_id')); + $image = ($Qcategories->value('categories_image') != null) ? $Qcategories->value('categories_image') : 'no_image.png'; - $url = ($Qcategories->value('categories_custom_url') != null) ? $Qcategories->value('categories_custom_url') : FILENAME_DEFAULT . '?cPath=' . $lC_CategoryTree->buildBreadcrumb($Qcategories->valueInt('categories_id')); - $image = ($Qcategories->value('categories_image') != null) ? $Qcategories->value('categories_image') : 'no_image.png'; - - $output .= '
    ' . "\n"; - if (file_exists(DIR_WS_IMAGES . 'categories/' . $image)) { - $output .= '
    ' . lc_link_object(lc_href_link($url), lc_image(DIR_WS_IMAGES . 'categories/' . $image, $Qcategories->value('categories_name'), null, null, 'class="content-categories-image-src padding-top"')) . '
    ' . "\n"; + $output .= '
    ' . "\n"; + if (file_exists(DIR_WS_IMAGES . 'categories/' . $image)) { + $output .= '
    ' . lc_link_object(lc_href_link($url), lc_image(DIR_WS_IMAGES . 'categories/' . $image, $Qcategories->value('categories_name'), null, null, 'class="content-categories-image-src padding-top"')) . '
    ' . "\n"; + } + $output .= '
    ' . lc_link_object(lc_href_link($url), $Qcategories->value('categories_name')) . '
    ' . "\n" . + '
    ' . "\n"; } - $output .= '
    ' . lc_link_object(lc_href_link($url), $Qcategories->value('categories_name')) . '
    ' . "\n" . - '
    ' . "\n"; } return $output; From 180c8d3818303c24997c51555fb5b04c1464f835 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Wed, 9 Jul 2014 16:04:31 -0400 Subject: [PATCH 042/168] added config value for top category for categories infobox --- .../lc_cfg_set_categories_top_category.php | 42 +++++++++++++++++++ catalog/includes/modules/boxes/categories.php | 8 ++-- 2 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 catalog/admin/includes/functions/cfg_parameters/lc_cfg_set_categories_top_category.php diff --git a/catalog/admin/includes/functions/cfg_parameters/lc_cfg_set_categories_top_category.php b/catalog/admin/includes/functions/cfg_parameters/lc_cfg_set_categories_top_category.php new file mode 100644 index 000000000..003de8f1a --- /dev/null +++ b/catalog/admin/includes/functions/cfg_parameters/lc_cfg_set_categories_top_category.php @@ -0,0 +1,42 @@ +modCheck(DIR_FS_ADMIN . 'includes/classes/category_tree.php')); + include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/applications/categories/classes/categories.php')); + + $lC_Language->loadIniFile('categories.php'); + $lC_CategoryTree = new lC_CategoryTree_Admin(); + + $categories = array('0' => $lC_Language->get('top_category')); + foreach ( $lC_CategoryTree->getArray() as $value ) { + $cid = explode('_', $value['id']); + $count = count($cid); + $cid = end($cid); + $acArr = lC_Categories_Admin::getAllChildren($id); + $categories[$cid] = str_repeat("    ", $count-1) . ' ' . $value['title']; + } + + $css_class = 'class="input with-small-padding mid-margin-top"'; + + $name = (empty($key)) ? 'configuration_value' : 'configuration[' . $key . ']'; + + $array = array(); + $array[] = array('id' => '', + 'text' => $lC_Language->get('text_select_category')); + foreach ( $categories as $key => $value ) { + $array[] = array('id' => $key, + 'text' => $value); + } + + return lc_draw_pull_down_menu($name, $array, $default, $css_class); +} +?> \ No newline at end of file diff --git a/catalog/includes/modules/boxes/categories.php b/catalog/includes/modules/boxes/categories.php index b804a919e..50dd02fd9 100644 --- a/catalog/includes/modules/boxes/categories.php +++ b/catalog/includes/modules/boxes/categories.php @@ -36,7 +36,7 @@ function initialize() { $lC_CategoryTree->setChildStringWithChildren('
  • ', '
    • '); $lC_CategoryTree->setUseAria(true); $lC_CategoryTree->setShowCategoryProductCount((BOX_CATEGORIES_SHOW_PRODUCT_COUNT == '1') ? true : false); - //$lC_CategoryTree->setRootCategoryID(BOX_CATEGORIES_ROOT_CATEGORY); + $lC_CategoryTree->setRootCategoryID(BOX_CATEGORIES_ROOT_CATEGORY); $this->_content = $lC_CategoryTree->getTree(); @@ -47,12 +47,14 @@ function install() { parent::install(); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Show Product Count', 'BOX_CATEGORIES_SHOW_PRODUCT_COUNT', '1', 'Show the amount of products each category has', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Show Product Count', 'BOX_CATEGORIES_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('Top Category', 'BOX_CATEGORIES_ROOT_CATEGORY', 0, 'Select the Top Category of the Categories Infobox', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category')"); } function getKeys() { if (!isset($this->_keys)) { - $this->_keys = array('BOX_CATEGORIES_SHOW_PRODUCT_COUNT'); + $this->_keys = array('BOX_CATEGORIES_SHOW_PRODUCT_COUNT', + 'BOX_CATEGORIES_ROOT_CATEGORY'); } return $this->_keys; From ae534805e811f194ff322276f281e87c9612d365 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Thu, 10 Jul 2014 11:29:09 -0400 Subject: [PATCH 043/168] more code for tree expansion --- catalog/includes/modules/boxes/categories.php | 20 ++++++++++++++----- .../modules/boxes/information_pages.php | 2 +- catalog/install/loadedcommerce.sql | 3 +++ catalog/install/loadedcommerce_innodb.sql | 2 ++ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/catalog/includes/modules/boxes/categories.php b/catalog/includes/modules/boxes/categories.php index 50dd02fd9..e54e165b0 100644 --- a/catalog/includes/modules/boxes/categories.php +++ b/catalog/includes/modules/boxes/categories.php @@ -26,10 +26,18 @@ function initialize() { global $lC_CategoryTree, $cPath; $lC_CategoryTree->reset(); - // added to control maximum level of categories infobox if desired - if (isset($_SESSION['setCategoriesMaximumLevel']) && $_SESSION['setCategoriesMaximumLevel'] != '') { - $lC_CategoryTree->setMaximumLevel($_SESSION['setCategoriesMaximumLevel']); - } + if (BOX_CATEGORIES_MAX_LEVEL == 'None') { + $bcml = 1; + } else if (BOX_CATEGORIES_MAX_LEVEL == 'All') { + $bcml = 0; + } else if (BOX_CATEGORIES_MAX_LEVEL == '1') { + $bcml = 2; + } else if (BOX_CATEGORIES_MAX_LEVEL == '2') { + $bcml = 3; + } else if (BOX_CATEGORIES_MAX_LEVEL == '3') { + $bcml = 4; + } + $lC_CategoryTree->setMaximumLevel($bcml); $lC_CategoryTree->setCategoryPath($cPath, '', ''); $lC_CategoryTree->setParentGroupStringTop('
      ', '
    '); $lC_CategoryTree->setParentGroupString('
      ', '
    '); @@ -49,12 +57,14 @@ function install() { $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Show Product Count', 'BOX_CATEGORIES_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())"); $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('Top Category', 'BOX_CATEGORIES_ROOT_CATEGORY', 0, 'Select the Top Category of the Categories Infobox', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category')"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('Expand Menu Item', 'BOX_CATEGORIES_MAX_LEVEL', '2', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))')"); } function getKeys() { if (!isset($this->_keys)) { $this->_keys = array('BOX_CATEGORIES_SHOW_PRODUCT_COUNT', - 'BOX_CATEGORIES_ROOT_CATEGORY'); + 'BOX_CATEGORIES_ROOT_CATEGORY', + 'BOX_CATEGORIES_MAX_LEVEL'); } return $this->_keys; diff --git a/catalog/includes/modules/boxes/information_pages.php b/catalog/includes/modules/boxes/information_pages.php index 1c22abdcb..1429f7bc8 100644 --- a/catalog/includes/modules/boxes/information_pages.php +++ b/catalog/includes/modules/boxes/information_pages.php @@ -28,7 +28,7 @@ function initialize() { $lC_CategoryTree->reset(); // added to control maximum level of information_pages infobox if desired if (isset($_SESSION['setInformationPagesMaximumLevel']) && $_SESSION['setInformationPagesMaximumLevel'] != '') { - $lC_CategoryTree->setMaximumLevel($_SESSION['setInformationPagesMaximumLevel']); + $lC_CategoryTree->setMaximumLevel(BOX_INFORMATION_MAX_LEVEL); } $lC_CategoryTree->setCategoryPath($cPath, '', ''); $lC_CategoryTree->setParentGroupStringTop('
      ', '
    '); diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql index 5384957eb..b0b0a89b8 100644 --- a/catalog/install/loadedcommerce.sql +++ b/catalog/install/loadedcommerce.sql @@ -1192,6 +1192,9 @@ INSERT INTO lc_configuration (configuration_id, configuration_title, configurati INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(180, 'Session Lifetime', 'SESSION_LIFETIME', 3600, 'The amount of time a user is logged in for after the last action.', 10, 0, now(), now(), NULL, NULL); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(181, 'Force Cookie Use', 'SESSION_FORCE_COOKIES', -1, 'Force the use cookies to handle sessions.', 10, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(182, 'Maximum New Products Per Page', 'NEW_PRODUCTS_PER_PAGE_DISPLAY', '9', 'Maximum number of new products to display in listing', 3, 20, now(), now(), NULL, NULL); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(183, 'Top Category', 'BOX_CATEGORIES_ROOT_CATEGORY', 0, 'Select the Top Category of the Categories Infobox', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(184, 'Expand Menu Item', 'BOX_CATEGORIES_MAX_LEVEL', '2', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); + INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(1, 'My Store', 'General information about my store', 1, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(2, 'Minimum Values', 'The minimum values for functions / data', 2, 1); diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql index 60c6748bd..e4d9d9e77 100644 --- a/catalog/install/loadedcommerce_innodb.sql +++ b/catalog/install/loadedcommerce_innodb.sql @@ -1192,6 +1192,8 @@ INSERT INTO lc_configuration (configuration_id, configuration_title, configurati INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(180, 'Session Lifetime', 'SESSION_LIFETIME', 3600, 'The amount of time a user is logged in for after the last action.', 10, 0, now(), now(), NULL, NULL); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(181, 'Force Cookie Use', 'SESSION_FORCE_COOKIES', -1, 'Force the use cookies to handle sessions.', 10, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(182, 'Maximum New Products Per Page', 'NEW_PRODUCTS_PER_PAGE_DISPLAY', '9', 'Maximum number of new products to display in listing', 3, 20, now(), now(), NULL, NULL); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(183, 'Top Category', 'BOX_CATEGORIES_ROOT_CATEGORY', 0, 'Select the Top Category of the Categories Infobox', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(184, 'Expand Menu Item', 'BOX_CATEGORIES_MAX_LEVEL', '2', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(1, 'My Store', 'General information about my store', 1, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(2, 'Minimum Values', 'The minimum values for functions / data', 2, 1); From 9aa246f9fe094d1725aa8c680f0b593d8647fa35 Mon Sep 17 00:00:00 2001 From: datazen Date: Fri, 11 Jul 2014 10:12:35 -0400 Subject: [PATCH 044/168] merge work --- .../applications/orders/classes/orders.php | 3 +- catalog/admin/includes/classes/order.php | 5 +- catalog/admin/includes/languages/en_US.php | 2 +- catalog/includes/javascript/general.js.php | 77 +- catalog/includes/languages/en_US.xml | 4 +- .../work/updates/runAfter/controller.php | 8 +- catalog/install/loadedcommerce.sql | 3331 ++++++++--------- catalog/install/loadedcommerce_innodb.sql | 3325 ++++++++-------- catalog/templates/core.php | 2 +- .../templates/core/content/products/info.php | 6 +- 10 files changed, 3376 insertions(+), 3387 deletions(-) diff --git a/catalog/admin/includes/applications/orders/classes/orders.php b/catalog/admin/includes/applications/orders/classes/orders.php index a9daf64f9..684451cda 100644 --- a/catalog/admin/includes/applications/orders/classes/orders.php +++ b/catalog/admin/includes/applications/orders/classes/orders.php @@ -342,10 +342,9 @@ public static function getInfo($id) { if ( !$lC_Order->isValid() ) { return array('error' => true, 'errmsg' => sprintf(ERROR_ORDER_DOES_NOT_EXIST, $id)); } - + $result['oID'] = $id; $result['customerId'] = $lC_Order->getCustomer('id'); - $result['customerIP'] = $lC_Order->getCustomer('customers_ip_address'); $result['customerAddress'] = lC_Address::format($lC_Order->getCustomer(), '
    '); $result['deliveryAddress'] = lC_Address::format($lC_Order->getDelivery(), '
    '); $result['billingAddress'] = lC_Address::format($lC_Order->getBilling(), '
    '); diff --git a/catalog/admin/includes/classes/order.php b/catalog/admin/includes/classes/order.php index 41cf57779..e700a7a99 100644 --- a/catalog/admin/includes/classes/order.php +++ b/catalog/admin/includes/classes/order.php @@ -46,7 +46,6 @@ protected function _getSummary($order_id) { 'country_title' => $Qorder->value('customers_country'), 'country_iso2' => $Qorder->value('customers_country_iso2'), 'country_iso3' => $Qorder->value('customers_country_iso3'), - 'customers_ip_address' => $Qorder->valueProtected('customers_ip_address'), 'format' => $Qorder->value('customers_address_format'), 'telephone' => $Qorder->valueProtected('customers_telephone'), 'email_address' => $Qorder->valueProtected('customers_email_address')); @@ -248,9 +247,9 @@ protected function _getProducts() { protected function _getProduct($oid, $pid) { global $lC_Database; - $Qproduct = $lC_Database->query('select products_id, products_name, products_model, products_sku, products_price, products_tax, products_quantity, products_simple_options_meta_data from :table_orders_products where products_id = :products_id and orders_id = :orders_id limit 1'); + $Qproduct = $lC_Database->query('select products_id, products_name, products_model, products_sku, products_price, products_tax, products_quantity, products_simple_options_meta_data from :table_orders_products where orders_products_id = :orders_products_id and orders_id = :orders_id limit 1'); $Qproduct->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); - $Qproduct->bindInt(':products_id', $pid); + $Qproduct->bindInt(':orders_products_id', $pid); $Qproduct->bindInt(':orders_id', $oid); $Qproduct->execute(); while ($Qproduct->next()) { diff --git a/catalog/admin/includes/languages/en_US.php b/catalog/admin/includes/languages/en_US.php index d71fe7bfc..396213e11 100644 --- a/catalog/admin/includes/languages/en_US.php +++ b/catalog/admin/includes/languages/en_US.php @@ -376,4 +376,4 @@ text_featured_product_no_expiration = No Expiration text_available_with_pro = This feature available with the PRO edition text_free_with_pro_edition = PRO Free with Pro Edition -error_specials_date = Error: The specials expire date cannot be before the start date. +error_specials_date = Error: The specials expire date cannot be before the start date. \ No newline at end of file diff --git a/catalog/includes/javascript/general.js.php b/catalog/includes/javascript/general.js.php index 6c13a8784..023ccb977 100644 --- a/catalog/includes/javascript/general.js.php +++ b/catalog/includes/javascript/general.js.php @@ -1,15 +1,15 @@ - \ No newline at end of file +}); + + + \ No newline at end of file diff --git a/catalog/includes/languages/en_US.xml b/catalog/includes/languages/en_US.xml index 5037101a7..83a5301f5 100644 --- a/catalog/includes/languages/en_US.xml +++ b/catalog/includes/languages/en_US.xml @@ -23,7 +23,7 @@ button_go_shopping - general + general text_contact @@ -2929,7 +2929,7 @@ Your friend, %s, thought that you would be interested in %s from %s.]]> text_admin_session_active general - + text_low_qoh_title diff --git a/catalog/includes/work/updates/runAfter/controller.php b/catalog/includes/work/updates/runAfter/controller.php index faf624c9c..6f606dbe5 100644 --- a/catalog/includes/work/updates/runAfter/controller.php +++ b/catalog/includes/work/updates/runAfter/controller.php @@ -275,7 +275,7 @@ public static function updateDB() { $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "products_variants` ADD `default_visual` INT( 11 ) DEFAULT '0' AFTER `default_combo`"); parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "products_variants` ADD `default_visual` INT( 11 ) DEFAULT '0' AFTER `default_combo`"); - + $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "products_variants_values` ADD `visual` VARCHAR( 1024 ) DEFAULT NULL AFTER `title`"); parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "products_variants_values` ADD `visual` VARCHAR( 1024 ) DEFAULT NULL AFTER `title`"); @@ -320,7 +320,7 @@ public static function updateDB() { parent::log("Database Update: UPDATE `" . $pf . "currencies` SET `symbol_left` = '€' where `code` = 'EUR'"); $lC_Database->simpleQuery("UPDATE `" . $pf . "currencies` SET `symbol_left` = '£' where `code` = 'GBP'"); - parent::log("Database Update: UPDATE `" . $pf . "currencies` SET `symbol_left` = '£' where `code` = 'GBP'"); + parent::log("Database Update: UPDATE `" . $pf . "currencies` SET `symbol_left` = '£' where `code` = 'GBP'"); $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "configuration_group` (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES (10, 'Sessions', 'Session settings', 10, 1)"); parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "configuration_group` (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES (10, 'Sessions', 'Session settings', 10, 1)"); @@ -357,12 +357,12 @@ public static function updateDB() { $lC_Database->simpleQuery("INSERT IGNORE INTO `" . $pf . "customers_access` (id, level, status) VALUES (2, 'Registered', 1)"); parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "customers_access` (id, level, status) VALUES (2, 'Registered', 1)"); - } + } if (!defined('SESSION_FORCE_COOKIES')) { $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Force Cookie Use', 'SESSION_FORCE_COOKIES', -1, 'Force the use cookies to handle sessions.', 10, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Force Cookie Use', 'SESSION_FORCE_COOKIES', -1, 'Force the use cookies to handle sessions.', 10, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');"); -} + } $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "orders_products` ADD COLUMN `products_sku` VARCHAR(255) DEFAULT NULL AFTER `products_model`"); parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "orders_products` ADD COLUMN `products_sku` VARCHAR(255) DEFAULT NULL AFTER `products_model`"); diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql index f5a972869..8de3bd08f 100644 --- a/catalog/install/loadedcommerce.sql +++ b/catalog/install/loadedcommerce.sql @@ -326,11 +326,7 @@ CREATE TABLE lc_customers_groups_data ( id int(11) NOT NULL AUTO_INCREMENT, customers_group_id int(11) NOT NULL DEFAULT '1', baseline_discount decimal(5,2) NOT NULL DEFAULT '0.00', - customers_access_levels varchar(255) NOT NULL DEFAULT '', - hidden_products_notification tinyint(1) NOT NULL DEFAULT '0', - taxable tinyint(1) NOT NULL DEFAULT '0', - payment_modules varchar(255) NOT NULL DEFAULT '', - shipping_modules varchar(255) NOT NULL DEFAULT '', + customers_access_levels VARCHAR(255) NOT NULL DEFAULT '', PRIMARY KEY (id) ) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci; @@ -1221,130 +1217,130 @@ INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_ INSERT INTO lc_countries VALUES (1,'Afghanistan','AF','AFG',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BDS','?? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BDG','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BGL','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BAL','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BAM','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'DAY','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'FRA','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'FYB','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'GHA','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'GHO','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'HEL','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'HER','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'JOW','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KAB','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KAN','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KAP','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KHO','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KNR','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KDZ','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'LAG','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'LOW','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'NAN','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'NIM','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'NUR','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'ORU','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'PIA','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'PKA','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'PAN','??? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'PAR','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'SAM','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'SAR','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'TAK','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'WAR','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'ZAB','????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BDS','بد خشان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BDG','بادغیس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BGL','بغلان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BAL','بلخ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BAM','بامیان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'DAY','دایکندی'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'FRA','Ùراه'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'FYB','Ùارياب'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'GHA','غزنى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'GHO','غور'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'HEL','هلمند'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'HER','هرات'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'JOW','جوزجان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KAB','کابل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KAN','قندھار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KAP','کاپيسا'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KHO','خوست'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KNR','Ú©Ùنَر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KDZ','كندوز'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'LAG','لغمان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'LOW','لوګر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'NAN','ننگرهار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'NIM','نیمروز'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'NUR','نورستان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'ORU','ؤروزگان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'PIA','پکتیا'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'PKA','پکتيکا'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'PAN','پنج شیر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'PAR','پروان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'SAM','سمنگان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'SAR','سر پل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'TAK','تخار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'WAR','وردک'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'ZAB','زابل'); INSERT INTO lc_countries VALUES (2,'Albania','AL','ALB',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'BR','Beratit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'BU','Bulqizës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'DI','Dibrës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'DL','Delvinës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'DR','Durrësit'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'BU','Bulqizës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'DI','Dibrës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'DL','Delvinës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'DR','Durrësit'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'DV','Devollit'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'EL','Elbasanit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'ER','Kolonjës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'ER','Kolonjës'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'FR','Fierit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'GJ','Gjirokastrës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'GJ','Gjirokastrës'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'GR','Gramshit'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'HA','Hasit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KA','Kavajës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KA','Kavajës'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KB','Kurbinit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KC','Kuçovës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KO','Korçës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KR','Krujës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KU','Kukësit'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KC','Kuçovës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KO','Korçës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KR','Krujës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KU','Kukësit'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'LB','Librazhdit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'LE','Lezhës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'LU','Lushnjës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'MK','Mallakastrës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'MM','Malësisë së Madhe'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'MR','Mirditës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'LE','Lezhës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'LU','Lushnjës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'MK','Mallakastrës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'MM','Malësisë së Madhe'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'MR','Mirditës'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'MT','Matit'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'PG','Pogradecit'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'PQ','Peqinit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'PR','Përmetit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'PU','Pukës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'SH','Shkodrës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'PR','Përmetit'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'PU','Pukës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'SH','Shkodrës'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'SK','Skraparit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'SR','Sarandës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'TE','Tepelenës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'TP','Tropojës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'TR','Tiranës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'VL','Vlorës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'SR','Sarandës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'TE','Tepelenës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'TP','Tropojës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'TR','Tiranës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'VL','Vlorës'); INSERT INTO lc_countries VALUES (3,'Algeria','DZ','DZA',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'01','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'02','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'03','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'04','????? ?? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'05','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'06','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'07','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'08','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'09','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'10','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'11','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'12','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'13','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'14','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'15','???? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'16','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'17','????? ??? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'18','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'19','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'20','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'21','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'22','????? ???? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'23','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'24','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'25','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'26','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'27','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'28','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'29','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'30','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'31','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'32','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'33','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'34','????? ??? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'35','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'36','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'37','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'38','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'39','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'40','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'41','????? ??? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'42','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'43','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'44','????? ??? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'45','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'46','????? ??? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'47','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'48','????? ??????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'01','ولاية أدرار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'02','ولاية الشلÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'03','ولاية الأغواط'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'04','ولاية أم البواقي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'05','ولاية باتنة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'06','ولاية بجاية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'07','ولاية بسكرة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'08','ولاية بشار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'09','البليدة‎'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'10','ولاية البويرة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'11','ولاية تمنراست'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'12','ولاية تبسة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'13','تلمسان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'14','ولاية تيارت'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'15','تيزي وزو'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'16','ولاية الجزائر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'17','ولاية عين الدÙلى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'18','ولاية جيجل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'19','ولاية سطيÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'20','ولاية سعيدة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'21','السكيكدة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'22','ولاية سيدي بلعباس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'23','ولاية عنابة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'24','ولاية قالمة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'25','قسنطينة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'26','ولاية المدية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'27','ولاية مستغانم'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'28','ولاية المسيلة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'29','ولاية معسكر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'30','ورقلة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'31','وهران'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'32','ولاية البيض'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'33','ولاية اليزي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'34','ولاية برج بوعريريج'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'35','ولاية بومرداس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'36','ولاية الطارÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'37','تندوÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'38','ولاية تسمسيلت'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'39','ولاية الوادي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'40','ولاية خنشلة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'41','ولاية سوق أهراس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'42','ولاية تيبازة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'43','ولاية ميلة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'44','ولاية عين الدÙلى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'45','ولاية النعامة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'46','ولاية عين تموشنت'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'47','ولاية غرداية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'48','ولاية غليزان'); INSERT INTO lc_countries VALUES (4,'American Samoa','AS','ASM',''); @@ -1362,27 +1358,27 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (5,'EN','Enc INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (5,'LE','Escaldes-Engordany'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (5,'LM','La Massana'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (5,'OR','Ordino'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (5,'SJ','Sant Juliá de Lória'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (5,'SJ','Sant Juliá de Lória'); INSERT INTO lc_countries VALUES (6,'Angola','AO','AGO',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'BGO','Bengo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'BGU','Benguela'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'BIE','Bié'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'BIE','Bié'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'CAB','Cabinda'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'CCU','Cuando Cubango'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'CNO','Cuanza Norte'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'CUS','Cuanza Sul'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'CNN','Cunene'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'HUA','Huambo'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'HUI','Huíla'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'HUI','Huíla'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'LUA','Luanda'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'LNO','Lunda Norte'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'LSU','Lunda Sul'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'MAL','Malanje'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'MOX','Moxico'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'NAM','Namibe'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'UIG','Uíge'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'UIG','Uíge'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'ZAI','Zaire'); INSERT INTO lc_countries VALUES (7,'Anguilla','AI','AIA',''); @@ -1404,7 +1400,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'A','Sal INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'B','Buenos Aires Province'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'C','Capital Federal'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'D','San Luis'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'E','Entre Ríos'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'E','Entre Ríos'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'F','La Rioja'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'G','Santiago del Estero'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'H','Chaco'); @@ -1414,30 +1410,30 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'L','La INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'M','Mendoza'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'N','Misiones'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'P','Formosa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'Q','Neuquén'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'R','Río Negro'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'Q','Neuquén'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'R','Río Negro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'S','Santa Fe'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'T','Tucumán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'T','Tucumán'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'U','Chubut'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'V','Tierra del Fuego'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'W','Corrientes'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'X','Córdoba'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'X','Córdoba'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'Y','Jujuy'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'Z','Santa Cruz'); INSERT INTO lc_countries VALUES (11,'Armenia','AM','ARM',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'AG','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'AR','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'AV','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'ER','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'GR','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'KT','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'LO','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'SH','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'SU','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'TV','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'VD','????? ???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'AG','Ô±Ö€Õ¡Õ£Õ¡Õ®Õ¸Õ¿Õ¶'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'AR','Ô±Ö€Õ¡Ö€Õ¡Õ¿'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'AV','Ô±Ö€Õ´Õ¡Õ¾Õ«Ö€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'ER','ÔµÖ€Ö‡Õ¡Õ¶'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'GR','Ô³Õ¥Õ²Õ¡Ö€Ö„Õ¸Ö‚Õ¶Õ«Ö„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'KT','Ô¿Õ¸Õ¿Õ¡ÕµÖ„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'LO','Ô¼Õ¸Õ¼Õ«'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'SH','Õ‡Õ«Ö€Õ¡Õ¯'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'SU','ÕÕµÕ¸Ö‚Õ¶Õ«Ö„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'TV','ÕÕ¡Õ¾Õ¸Ö‚Õ·'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'VD','ÕŽÕ¡ÕµÕ¸Ö ÕÕ¸Ö€'); INSERT INTO lc_countries VALUES (12,'Aruba','AW','ABW',''); @@ -1455,9 +1451,9 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (13,'WA','We INSERT INTO lc_countries VALUES (14,'Austria','AT','AUT',":name\n:street_address\nA-:postcode :city\n:country"); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'1','Burgenland'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'2','Kärnten'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'3','Niederösterreich'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'4','Oberösterreich'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'2','Kärnten'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'3','Niederösterreich'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'4','Oberösterreich'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'5','Salzburg'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'6','Steiermark'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'7','Tirol'); @@ -1466,82 +1462,82 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'9','Wie INSERT INTO lc_countries VALUES (15,'Azerbaijan','AZ','AZE',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AB','?li Bayramli'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ABS','Abseron'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGC','Agcab?di'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGM','Agdam'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGS','Agdas'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGA','Agstafa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGU','Agsu'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AB','Æli Bayramlı'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ABS','AbÅŸeron'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGC','AÄŸcabÉ™di'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGM','AÄŸdam'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGS','AÄŸdaÅŸ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGA','AÄŸstafa'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGU','AÄŸsu'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AST','Astara'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BA','Baki'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BAB','Bab?k'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BAL','Balak?n'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BAR','B?rd?'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BEY','Beyl?qan'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BIL','Bil?suvar'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'CAB','C?brayil'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'CAL','C?lilabab'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BA','Bakı'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BAB','BabÉ™k'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BAL','BalakÉ™n'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BAR','BÉ™rdÉ™'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BEY','BeylÉ™qan'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BIL','BilÉ™suvar'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'CAB','CÉ™brayıl'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'CAL','CÉ™lilabab'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'CUL','Julfa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'DAS','Dask?s?n'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'DAV','D?v?çi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'FUZ','Füzuli'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'GA','G?nc?'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'GAD','G?d?b?y'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'DAS','DaÅŸkÉ™sÉ™n'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'DAV','DÉ™vəçi'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'FUZ','Füzuli'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'GA','GÉ™ncÉ™'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'GAD','GÉ™dÉ™bÉ™y'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'GOR','Goranboy'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'GOY','Göyçay'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'HAC','Haciqabul'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'IMI','Imisli'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ISM','Ismayilli'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'KAL','K?lb?c?r'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'KUR','Kürd?mir'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'LA','L?nk?ran'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'LAC','Laçin'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'LAN','L?nk?ran'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'GOY','Göyçay'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'HAC','Hacıqabul'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'IMI','Ä°miÅŸli'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ISM','Ä°smayıllı'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'KAL','KÉ™lbÉ™cÉ™r'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'KUR','KürdÉ™mir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'LA','LÉ™nkÉ™ran'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'LAC','Laçın'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'LAN','LÉ™nkÉ™ran'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'LER','Lerik'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'MAS','Masalli'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'MI','Ming?çevir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'MAS','Masallı'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'MI','Mingəçevir'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'NA','Naftalan'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'NEF','Neftçala'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'OGU','Oguz'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'NEF','Neftçala'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'OGU','OÄŸuz'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ORD','Ordubad'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'QAB','Q?b?l?'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'QAB','QÉ™bÉ™lÉ™'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'QAX','Qax'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'QAZ','Qazax'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'QOB','Qobustan'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'QBA','Quba'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'QBI','Qubadli'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'QBI','Qubadlı'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'QUS','Qusar'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SA','S?ki'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAT','Saatli'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SA','Şəki'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAT','Saatlı'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAB','Sabirabad'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAD','S?d?r?k'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAH','Sahbuz'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAK','S?ki'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAD','SÉ™dÉ™rÉ™k'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAH','Åžahbuz'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAK','Şəki'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAL','Salyan'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SM','Sumqayit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SMI','Samaxi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SKR','S?mkir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SM','Sumqayıt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SMI','Åžamaxı'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SKR','Şəmkir'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SMX','Samux'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAR','S?rur'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SIY','Siy?z?n'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SS','Susa (City)'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SUS','Susa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'TAR','T?rt?r'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAR','Şərur'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SIY','SiyÉ™zÉ™n'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SS','ÅžuÅŸa (City)'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SUS','ÅžuÅŸa'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'TAR','TÉ™rtÉ™r'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'TOV','Tovuz'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'UCA','Ucar'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XA','Xank?ndi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XAC','Xaçmaz'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XA','XankÉ™ndi'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XAC','Xaçmaz'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XAN','Xanlar'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XIZ','Xizi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XCI','Xocali'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XVD','Xocav?nd'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'YAR','Yardimli'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XIZ','Xızı'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XCI','Xocalı'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XVD','XocavÉ™nd'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'YAR','Yardımlı'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'YE','Yevlax (City)'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'YEV','Yevlax'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ZAN','Z?ngilan'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ZAN','ZÉ™ngilan'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ZAQ','Zaqatala'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ZAR','Z?rdab'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ZAR','ZÉ™rdab'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'NX','Nakhichevan'); INSERT INTO lc_countries VALUES (16,'Bahamas','BS','BHS',''); @@ -1570,18 +1566,18 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (16,'SP','Sa INSERT INTO lc_countries VALUES (17,'Bahrain','BH','BHR',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'01','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'02','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'03','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'04','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'05','??????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'06','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'07','??????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'08','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'09','?????? ???????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'10','??????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'11','??? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'12','????? ???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'01','الحد'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'02','المحرق'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'03','المنامة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'04','جد Ø­Ùص'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'05','المنطقة الشمالية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'06','سترة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'07','المنطقة الوسطى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'08','مدينة عيسى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'09','الرÙاع والمنطقة الجنوبية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'10','المنطقة الغربية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'11','جزر حوار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'12','مدينة حمد'); INSERT INTO lc_countries VALUES (18,'Bangladesh','BD','BGD',''); @@ -1666,12 +1662,12 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (19,'T','Sai INSERT INTO lc_countries VALUES (20,'Belarus','BY','BLR',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'BR','???´????? ??´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'HO','??´???????? ??´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'HR','???´???????? ??´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'MA','??????????? ??´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'MI','??´????? ??´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'VI','??´??????? ??´??????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'BR','БрÑÌÑÑ†ÐºÐ°Ñ Ð²Ð¾ÌблаÑць'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'HO','ГоÌмельÑÐºÐ°Ñ Ð²Ð¾ÌблаÑць'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'HR','ГроÌдзенÑÐºÐ°Ñ Ð²Ð¾ÌблаÑць'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'MA','МагілёўÑÐºÐ°Ñ Ð²Ð¾ÌблаÑць'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'MI','МіÌнÑÐºÐ°Ñ Ð²Ð¾ÌблаÑць'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'VI','Ð’Ñ–ÌцебÑÐºÐ°Ñ Ð²Ð¾ÌблаÑць'); INSERT INTO lc_countries VALUES (21,'Belgium','BE','BEL',":name\n:street_address\nB-:postcode :city\n:country"); @@ -1683,7 +1679,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (21,'VOV','O INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (21,'VWV','West-Vlaanderen'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (21,'WBR','Brabant Wallon'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (21,'WHT','Hainaut'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (21,'WLG','Liège/Lüttich'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (21,'WLG','Liège/Lüttich'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (21,'WLX','Luxembourg'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (21,'WNA','Namur'); @@ -1707,7 +1703,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (23,'DO','Do INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (23,'KO','Kouffo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (23,'LI','Littoral'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (23,'MO','Mono'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (23,'OU','Ouémé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (23,'OU','Ouémé'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (23,'PL','Plateau'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (23,'ZO','Zou'); @@ -1756,7 +1752,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (26,'H','Chu INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (26,'L','La Paz'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (26,'N','Pando'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (26,'O','Oruro'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (26,'P','Potosí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (26,'P','Potosí'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (26,'S','Santa Cruz'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (26,'T','Tarija'); @@ -1779,30 +1775,30 @@ INSERT INTO lc_countries VALUES (30,'Brazil','BR','BRA',":name\n:street_address\ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'AC','Acre'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'AL','Alagoas'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'AM','Amazônia'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'AP','Amapá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'AM','Amazônia'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'AP','Amapá'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'BA','Bahia'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'CE','Ceará'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'CE','Ceará'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'DF','Distrito Federal'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'ES','Espírito Santo'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'GO','Goiás'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'MA','Maranhão'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'ES','Espírito Santo'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'GO','Goiás'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'MA','Maranhão'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'MG','Minas Gerais'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'MS','Mato Grosso do Sul'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'MT','Mato Grosso'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'PA','Pará'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'PB','Paraíba'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'PA','Pará'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'PB','Paraíba'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'PE','Pernambuco'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'PI','Piauí'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'PR','Paraná'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'PI','Piauí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'PR','Paraná'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'RJ','Rio de Janeiro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'RN','Rio Grande do Norte'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'RO','Rondônia'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'RO','Rondônia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'RR','Roraima'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'RS','Rio Grande do Sul'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'SC','Santa Catarina'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'SE','Sergipe'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'SP','São Paulo'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'SP','São Paulo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'TO','Tocantins'); INSERT INTO lc_countries VALUES (31,'British Indian Ocean Territory','IO','IOT',''); @@ -1856,28 +1852,28 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (33,'28','Ya INSERT INTO lc_countries VALUES (34,'Burkina Faso','BF','BFA',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BAL','Balé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BAL','Balé'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BAM','Bam'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BAN','Banwa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BAZ','Bazèga'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BAZ','Bazèga'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BGR','Bougouriba'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BLG','Boulgou'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BLK','Boulkiemdé'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'COM','Komoé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BLK','Boulkiemdé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'COM','Komoé'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'GAN','Ganzourgou'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'GNA','Gnagna'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'GOU','Gourma'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'HOU','Houet'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'IOB','Ioba'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KAD','Kadiogo'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KEN','Kénédougou'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KEN','Kénédougou'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KMD','Komondjari'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KMP','Kompienga'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KOP','Koulpélogo'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KOP','Koulpélogo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KOS','Kossi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KOT','Kouritenga'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KOW','Kourwéogo'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'LER','Léraba'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KOW','Kourwéogo'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'LER','Léraba'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'LOR','Loroum'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'MOU','Mouhoun'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'NAM','Namentenga'); @@ -1886,12 +1882,12 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'NAY','N INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'NOU','Noumbiel'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'OUB','Oubritenga'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'OUD','Oudalan'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'PAS','Passoré'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'PAS','Passoré'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'PON','Poni'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'SEN','Séno'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'SEN','Séno'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'SIS','Sissili'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'SMT','Sanmatenga'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'SNG','Sanguié'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'SNG','Sanguié'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'SOM','Soum'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'SOR','Sourou'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'TAP','Tapoa'); @@ -1900,7 +1896,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'YAG','Y INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'YAT','Yatenga'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'ZIR','Ziro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'ZON','Zondoma'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'ZOU','Zoundwéogo'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'ZOU','Zoundwéogo'); INSERT INTO lc_countries VALUES (35,'Burundi','BI','BDI',''); @@ -1927,7 +1923,7 @@ INSERT INTO lc_countries VALUES (37,'Cameroon','CM','CMR',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (37,'AD','Adamaoua'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (37,'CE','Centre'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (37,'EN','Extrême-Nord'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (37,'EN','Extrême-Nord'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (37,'ES','Est'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (37,'LT','Littoral'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (37,'NO','Nord'); @@ -1958,18 +1954,18 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'BR','Br INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'BV','Boa Vista'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'CA','Santa Catarina'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'CR','Santa Cruz'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'CS','Calheta de São Miguel'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'CS','Calheta de São Miguel'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'MA','Maio'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'MO','Mosteiros'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'PA','Paúl'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'PA','Paúl'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'PN','Porto Novo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'PR','Praia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'RG','Ribeira Grande'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'SD','São Domingos'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'SF','São Filipe'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'SD','São Domingos'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'SF','São Filipe'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'SL','Sal'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'SN','São Nicolau'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'SV','São Vicente'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'SN','São Nicolau'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'SV','São Vicente'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'TA','Tarrafal'); INSERT INTO lc_countries VALUES (40,'Cayman Islands','KY','CYM',''); @@ -1991,15 +1987,15 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'BGF','B INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'BK ','Basse-Kotto'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'HK ','Haute-Kotto'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'HM ','Haut-Mbomou'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'HS ','Mambéré-Kadéï'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'KB ','Nana-Grébizi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'KG ','Kémo'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'HS ','Mambéré-Kadéï'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'KB ','Nana-Grébizi'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'KG ','Kémo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'LB ','Lobaye'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'MB ','Mbomou'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'MP ','Ombella-M\'Poko'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'NM ','Nana-Mambéré'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'OP ','Ouham-Pendé'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'SE ','Sangha-Mbaéré'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'NM ','Nana-Mambéré'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'OP ','Ouham-Pendé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'SE ','Sangha-Mbaéré'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'UK ','Ouaka'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'VR ','Vakaga'); @@ -2009,69 +2005,69 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'BA ','B INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'BET','Borkou-Ennedi-Tibesti'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'BI ','Biltine'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'CB ','Chari-Baguirmi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'GR ','Guéra'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'GR ','Guéra'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'KA ','Kanem'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'LC ','Lac'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'LR ','Logone-Oriental'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'LO ','Logone-Occidental'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'MC ','Moyen-Chari'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'MK ','Mayo-Kébbi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'OD ','Ouaddaï'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'MK ','Mayo-Kébbi'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'OD ','Ouaddaï'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'SA ','Salamat'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'TA ','Tandjilé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'TA ','Tandjilé'); INSERT INTO lc_countries VALUES (43,'Chile','CL','CHL',":name\n:street_address\n:city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'AI','Aisén del General Carlos Ibañez'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'AI','Aisén del General Carlos Ibañez'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'AN','Antofagasta'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'AR','La Araucanía'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'AR','La Araucanía'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'AT','Atacama'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'BI','Biobío'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'BI','Biobío'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'CO','Coquimbo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'LI','Libertador Bernardo O\'Higgins'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'LL','Los Lagos'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'MA','Magallanes y de la Antartica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'ML','Maule'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'RM','Metropolitana de Santiago'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'TA','Tarapacá'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'VS','Valparaíso'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'TA','Tarapacá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'VS','Valparaíso'); INSERT INTO lc_countries VALUES (44,'China','CN','CHN',":name\n:street_address\n:postcode :city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'11','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'12','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'13','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'14','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'15','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'21','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'22','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'23','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'31','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'32','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'33','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'34','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'35','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'36','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'37','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'41','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'42','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'43','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'44','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'45','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'46','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'50','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'51','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'52','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'53','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'54','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'61','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'62','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'63','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'64','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'65','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'71','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'91','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'92','??'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'11','北京'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'12','天津'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'13','河北'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'14','山西'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'15','内蒙å¤è‡ªæ²»åŒº'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'21','è¾½å®'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'22','å‰æž—'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'23','黑龙江çœ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'31','上海'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'32','江è‹'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'33','浙江'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'34','安徽'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'35','ç¦å»º'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'36','江西'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'37','山东'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'41','æ²³å—'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'42','湖北'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'43','æ¹–å—'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'44','广东'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'45','广西壮æ—自治区'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'46','æµ·å—'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'50','é‡åº†'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'51','å››å·'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'52','贵州'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'53','云å—'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'54','西è—自治区'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'61','陕西'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'62','甘肃'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'63','é’æµ·'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'64','å®å¤'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'65','æ–°ç–†'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'71','臺ç£'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'91','香港'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'92','澳門'); INSERT INTO lc_countries VALUES (45,'Christmas Island','CX','CXR',''); @@ -2088,48 +2084,48 @@ INSERT INTO lc_countries VALUES (47,'Colombia','CO','COL',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'AMA','Amazonas'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'ANT','Antioquia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'ARA','Arauca'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'ATL','Atlántico'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'BOL','Bolívar'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'BOY','Boyacá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'ATL','Atlántico'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'BOL','Bolívar'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'BOY','Boyacá'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'CAL','Caldas'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'CAQ','Caquetá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'CAQ','Caquetá'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'CAS','Casanare'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'CAU','Cauca'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'CES','Cesar'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'CHO','Chocó'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'COR','Córdoba'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'CHO','Chocó'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'COR','Córdoba'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'CUN','Cundinamarca'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'DC','Bogotá Distrito Capital'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'GUA','Guainía'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'DC','Bogotá Distrito Capital'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'GUA','Guainía'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'GUV','Guaviare'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'HUI','Huila'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'LAG','La Guajira'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'MAG','Magdalena'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'MET','Meta'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'NAR','Nariño'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'NAR','Nariño'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'NSA','Norte de Santander'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'PUT','Putumayo'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'QUI','Quindío'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'QUI','Quindío'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'RIS','Risaralda'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'SAN','Santander'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'SAP','San Andrés y Providencia'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'SAP','San Andrés y Providencia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'SUC','Sucre'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'TOL','Tolima'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'VAC','Valle del Cauca'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'VAU','Vaupés'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'VAU','Vaupés'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'VID','Vichada'); INSERT INTO lc_countries VALUES (48,'Comoros','KM','COM',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (48,'A','Anjouan'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (48,'G','Grande Comore'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (48,'M','Mohéli'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (48,'M','Mohéli'); INSERT INTO lc_countries VALUES (49,'Congo','CG','COG',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (49,'BC','Congo-Central'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (49,'BN','Bandundu'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (49,'EQ','Équateur'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (49,'EQ','Équateur'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (49,'KA','Katanga'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (49,'KE','Kasai-Oriental'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (49,'KN','Kinshasa'); @@ -2163,117 +2159,117 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (51,'A','Ala INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (51,'C','Cartago'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (51,'G','Guanacaste'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (51,'H','Heredia'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (51,'L','Limón'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (51,'L','Limón'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (51,'P','Puntarenas'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (51,'SJ','San José'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (51,'SJ','San José'); INSERT INTO lc_countries VALUES (52,'Cote D\'Ivoire','CI','CIV',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'01','Lagunes'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'02','Haut-Sassandra'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'03','Savanes'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'04','Vallée du Bandama'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'05','Moyen-Comoé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'04','Vallée du Bandama'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'05','Moyen-Comoé'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'06','Dix-Huit'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'07','Lacs'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'08','Zanzan'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'09','Bas-Sassandra'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'10','Denguélé'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'11','N\'zi-Comoé'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'12','Marahoué'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'13','Sud-Comoé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'10','Denguélé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'11','N\'zi-Comoé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'12','Marahoué'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'13','Sud-Comoé'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'14','Worodouqou'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'15','Sud-Bandama'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'16','Agnébi'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'16','Agnébi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'17','Bafing'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'18','Fromager'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'19','Moyen-Cavally'); INSERT INTO lc_countries VALUES (53,'Croatia','HR','HRV',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'01','Zagrebacka županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'02','Krapinsko-zagorska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'03','Sisacko-moslavacka županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'04','Karlovacka županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'05','Varaždinska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'06','Koprivnicko-križevacka županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'07','Bjelovarsko-bilogorska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'08','Primorsko-goranska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'09','Licko-senjska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'10','Viroviticko-podravska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'11','Požeško-slavonska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'12','Brodsko-posavska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'13','Zadarska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'14','Osjecko-baranjska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'15','Šibensko-kninska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'16','Vukovarsko-srijemska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'17','Splitsko-dalmatinska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'18','Istarska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'19','Dubrovacko-neretvanska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'20','Medimurska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'01','ZagrebaÄka županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'02','Krapinsko-zagorska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'03','SisaÄko-moslavaÄka županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'04','KarlovaÄka županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'05','Varaždinska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'06','KoprivniÄko-križevaÄka županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'07','Bjelovarsko-bilogorska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'08','Primorsko-goranska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'09','LiÄko-senjska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'10','VirovitiÄko-podravska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'11','PožeÅ¡ko-slavonska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'12','Brodsko-posavska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'13','Zadarska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'14','OsjeÄko-baranjska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'15','Å ibensko-kninska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'16','Vukovarsko-srijemska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'17','Splitsko-dalmatinska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'18','Istarska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'19','DubrovaÄko-neretvanska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'20','MeÄ‘imurska županija'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'21','Zagreb'); INSERT INTO lc_countries VALUES (54,'Cuba','CU','CUB',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'01','Pinar del Río'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'01','Pinar del Río'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'02','La Habana'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'03','Ciudad de La Habana'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'04','Matanzas'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'05','Villa Clara'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'06','Cienfuegos'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'07','Sancti Spíritus'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'08','Ciego de Ávila'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'09','Camagüey'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'07','Sancti Spíritus'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'08','Ciego de Ãvila'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'09','Camagüey'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'10','Las Tunas'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'11','Holguín'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'11','Holguín'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'12','Granma'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'13','Santiago de Cuba'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'14','Guantánamo'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'14','Guantánamo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'99','Isla de la Juventud'); INSERT INTO lc_countries VALUES (55,'Cyprus','CY','CYP',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'01','?e??ve?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'02','?e???s?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'03','?µµ???st??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'04','????a?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'05','?eµes??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'06','??f??'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'01','ΚεÏÏvεια'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'02','Λευκωσία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'03','Αμμόχωστος'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'04','ΛάÏνακα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'05','Λεμεσός'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'06','Πάφος'); INSERT INTO lc_countries VALUES (56,'Czech Republic','CZ','CZE',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'JC','Jihoceský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'JM','Jihomoravský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'KA','Karlovarský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'VY','Vysocina kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'KR','Královéhradecký kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'LI','Liberecký kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'MO','Moravskoslezský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'OL','Olomoucký kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'PA','Pardubický kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'PL','Plzenský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'PR','Hlavní mesto Praha'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'ST','Stredoceský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'US','Ústecký kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'ZL','Zlínský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'JC','JihoÄeský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'JM','Jihomoravský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'KA','Karlovarský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'VY','VysoÄina kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'KR','Královéhradecký kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'LI','Liberecký kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'MO','Moravskoslezský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'OL','Olomoucký kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'PA','Pardubický kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'PL','Plzeňský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'PR','Hlavní mÄ›sto Praha'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'ST','StÅ™edoÄeský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'US','Ústecký kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'ZL','Zlínský kraj'); INSERT INTO lc_countries VALUES (57,'Denmark','DK','DNK',":name\n:street_address\nDK-:postcode :city\n:country"); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'040','Bornholms Regionskommune'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'101','København'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'101','København'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'147','Frederiksberg'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'070','Århus Amt'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'015','Københavns Amt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'070','Ã…rhus Amt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'015','Københavns Amt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'020','Frederiksborg Amt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'042','Fyns Amt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'080','Nordjyllands Amt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'055','Ribe Amt'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'065','Ringkjøbing Amt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'065','Ringkjøbing Amt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'025','Roskilde Amt'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'050','Sønderjyllands Amt'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'035','Storstrøms Amt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'050','Sønderjyllands Amt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'035','Storstrøms Amt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'060','Vejle Amt'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'030','Vestsjællands Amt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'030','Vestsjællands Amt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'076','Viborg Amt'); INSERT INTO lc_countries VALUES (58,'Djibouti','DJ','DJI',''); @@ -2301,33 +2297,33 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (59,'PET','S INSERT INTO lc_countries VALUES (60,'Dominican Republic','DO','DOM',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'01','Distrito Nacional'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'02','Ázua'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'02','Ãzua'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'03','Baoruco'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'04','Barahona'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'05','Dajabón'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'05','Dajabón'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'06','Duarte'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'07','Elías Piña'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'07','Elías Piña'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'08','El Seibo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'09','Espaillat'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'10','Independencia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'11','La Altagracia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'12','La Romana'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'13','La Vega'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'14','María Trinidad Sánchez'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'14','María Trinidad Sánchez'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'15','Monte Cristi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'16','Pedernales'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'17','Peravia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'18','Puerto Plata'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'19','Salcedo'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'20','Samaná'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'21','San Cristóbal'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'20','Samaná'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'21','San Cristóbal'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'22','San Juan'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'23','San Pedro de Macorís'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'24','Sánchez Ramírez'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'23','San Pedro de Macorís'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'24','Sánchez Ramírez'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'25','Santiago'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'26','Santiago Rodríguez'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'26','Santiago Rodríguez'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'27','Valverde'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'28','Monseñor Nouel'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'28','Monseñor Nouel'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'29','Monte Plata'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'30','Hato Mayor'); @@ -2341,7 +2337,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'CO','Co INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'DI','Dili'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'ER','Ermera'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'LA','Lautem'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'LI','Liquiçá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'LI','Liquiçá'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'MF','Manufahi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'MT','Manatuto'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'OE','Oecussi'); @@ -2350,81 +2346,81 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'VI','Vi INSERT INTO lc_countries VALUES (62,'Ecuador','EC','ECU',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'A','Azuay'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'B','Bolívar'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'B','Bolívar'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'C','Carchi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'D','Orellana'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'E','Esmeraldas'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'F','Cañar'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'F','Cañar'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'G','Guayas'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'H','Chimborazo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'I','Imbabura'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'L','Loja'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'M','Manabí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'M','Manabí'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'N','Napo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'O','El Oro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'P','Pichincha'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'R','Los Ríos'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'R','Los Ríos'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'S','Morona-Santiago'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'T','Tungurahua'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'U','Sucumbíos'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'W','Galápagos'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'U','Sucumbíos'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'W','Galápagos'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'X','Cotopaxi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'Y','Pastaza'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'Z','Zamora-Chinchipe'); INSERT INTO lc_countries VALUES (63,'Egypt','EG','EGY',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'ALX','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'ASN','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'AST','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'BA','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'BH','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'BNS','??? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'C','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'DK','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'DT','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'FYM','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'GH','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'GZ','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'IS','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'JS','???? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'KB','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'KFS','??? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'KN','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'MN','?????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'MNF','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'MT','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'PTS','?????? ??? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'SHG','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'SHR','???????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'SIN','???? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'SUZ','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'WAD','?????? ??????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'ALX','الإسكندرية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'ASN','أسوان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'AST','أسيوط'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'BA','البحر الأحمر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'BH','البحيرة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'BNS','بني سويÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'C','القاهرة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'DK','الدقهلية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'DT','دمياط'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'FYM','الÙيوم'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'GH','الغربية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'GZ','الجيزة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'IS','الإسماعيلية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'JS','جنوب سيناء'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'KB','القليوبية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'KFS','ÙƒÙر الشيخ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'KN','قنا'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'MN','محاÙظة المنيا'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'MNF','المنوÙية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'MT','مطروح'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'PTS','محاÙظة بور سعيد'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'SHG','محاÙظة سوهاج'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'SHR','المحاÙظة الشرقيّة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'SIN','شمال سيناء'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'SUZ','السويس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'WAD','الوادى الجديد'); INSERT INTO lc_countries VALUES (64,'El Salvador','SV','SLV',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'AH','Ahuachapán'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'CA','Cabañas'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'AH','Ahuachapán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'CA','Cabañas'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'CH','Chalatenango'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'CU','Cuscatlán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'CU','Cuscatlán'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'LI','La Libertad'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'MO','Morazán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'MO','Morazán'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'PA','La Paz'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'SA','Santa Ana'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'SM','San Miguel'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'SO','Sonsonate'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'SS','San Salvador'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'SV','San Vicente'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'UN','La Unión'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'US','Usulután'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'UN','La Unión'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'US','Usulután'); INSERT INTO lc_countries VALUES (65,'Equatorial Guinea','GQ','GNQ',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (65,'AN','Annobón'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (65,'AN','Annobón'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (65,'BN','Bioko Norte'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (65,'BS','Bioko Sur'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (65,'CS','Centro Sur'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (65,'KN','Kié-Ntem'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (65,'KN','Kié-Ntem'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (65,'LI','Litoral'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (65,'WN','Wele-Nzas'); @@ -2442,32 +2438,32 @@ INSERT INTO lc_countries VALUES (67,'Estonia','EE','EST',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'37','Harju maakond'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'39','Hiiu maakond'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'44','Ida-Viru maakond'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'49','Jõgeva maakond'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'51','Järva maakond'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'57','Lääne maakond'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'59','Lääne-Viru maakond'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'65','Põlva maakond'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'67','Pärnu maakond'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'49','Jõgeva maakond'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'51','Järva maakond'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'57','Lääne maakond'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'59','Lääne-Viru maakond'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'65','Põlva maakond'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'67','Pärnu maakond'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'70','Rapla maakond'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'74','Saare maakond'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'78','Tartu maakond'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'82','Valga maakond'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'84','Viljandi maakond'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'86','Võru maakond'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'86','Võru maakond'); INSERT INTO lc_countries VALUES (68,'Ethiopia','ET','ETH',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'AA','??? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'AF','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'AH','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'BG','??????-???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'DD','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'GB','???? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'HR','??? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'OR','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'SM','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'SN','??? ???? ??????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'TG','????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'AA','አዲስ አበባ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'AF','አá‹áˆ­'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'AH','አማራ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'BG','ቤንሻንጉáˆ-ጉáˆá‹'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'DD','ድሬዳዋ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'GB','ጋáˆá‰¤áˆ‹ ሕá‹á‰¦á‰½'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'HR','ሀረሪ ሕá‹á‰¥'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'OR','ኦሮሚያ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'SM','ሶማሌ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'SN','ደቡብ ብሔሮች ብሔረሰቦችና ሕá‹á‰¦á‰½'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'TG','ትáŒáˆ«á‹­'); INSERT INTO lc_countries VALUES (69,'Falkland Islands (Malvinas)','FK','FLK',''); INSERT INTO lc_countries VALUES (70,'Faroe Islands','FO','FRO',''); @@ -2483,11 +2479,11 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (71,'W','Wes INSERT INTO lc_countries VALUES (72,'Finland','FI','FIN',":name\n:street_address\nFIN-:postcode :city\n:country"); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'AL','Ahvenanmaan maakunta'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'ES','Etelä-Suomen lääni'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'IS','Itä-Suomen lääni'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'LL','Lapin lääni'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'LS','Länsi-Suomen lääni'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'OL','Oulun lääni'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'ES','Etelä-Suomen lääni'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'IS','Itä-Suomen lääni'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'LL','Lapin lääni'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'LS','Länsi-Suomen lääni'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'OL','Oulun lääni'); INSERT INTO lc_countries VALUES (73,'France','FR','FRA',":name\n:street_address\n:postcode :city\n:country"); @@ -2497,39 +2493,39 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'03','Al INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'04','Alpes-de-Haute-Provence'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'05','Hautes-Alpes'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'06','Alpes-Maritimes'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'07','Ardèche'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'07','Ardèche'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'08','Ardennes'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'09','Ariège'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'09','Ariège'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'10','Aube'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'11','Aude'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'12','Aveyron'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'13','Bouches-du-Rhône'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'13','Bouches-du-Rhône'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'14','Calvados'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'15','Cantal'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'16','Charente'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'17','Charente-Maritime'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'18','Cher'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'19','Corrèze'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'21','Côte-d\'Or'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'22','Côtes-d\'Armor'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'19','Corrèze'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'21','Côte-d\'Or'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'22','Côtes-d\'Armor'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'23','Creuse'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'24','Dordogne'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'25','Doubs'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'26','Drôme'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'26','Drôme'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'27','Eure'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'28','Eure-et-Loir'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'29','Finistère'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'29','Finistère'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'2A','Corse-du-Sud'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'2B','Haute-Corse'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'30','Gard'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'31','Haute-Garonne'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'32','Gers'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'33','Gironde'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'34','Hérault'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'34','Hérault'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'35','Ille-et-Vilaine'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'36','Indre'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'37','Indre-et-Loire'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'38','Isère'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'38','Isère'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'39','Jura'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'40','Landes'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'41','Loir-et-Cher'); @@ -2539,7 +2535,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'44','Lo INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'45','Loiret'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'46','Lot'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'47','Lot-et-Garonne'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'48','Lozère'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'48','Lozère'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'49','Maine-et-Loire'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'50','Manche'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'51','Marne'); @@ -2549,20 +2545,20 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'54','Me INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'55','Meuse'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'56','Morbihan'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'57','Moselle'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'58','Nièvre'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'58','Nièvre'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'59','Nord'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'60','Oise'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'61','Orne'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'62','Pas-de-Calais'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'63','Puy-de-Dôme'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'64','Pyrénées-Atlantiques'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'65','Hautes-Pyrénées'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'66','Pyrénées-Orientales'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'63','Puy-de-Dôme'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'64','Pyrénées-Atlantiques'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'65','Hautes-Pyrénées'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'66','Pyrénées-Orientales'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'67','Bas-Rhin'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'68','Haut-Rhin'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'69','Rhône'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'70','Haute-Saône'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'71','Saône-et-Loire'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'69','Rhône'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'70','Haute-Saône'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'71','Saône-et-Loire'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'72','Sarthe'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'73','Savoie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'74','Haute-Savoie'); @@ -2570,13 +2566,13 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'75','Pa INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'76','Seine-Maritime'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'77','Seine-et-Marne'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'78','Yvelines'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'79','Deux-Sèvres'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'79','Deux-Sèvres'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'80','Somme'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'81','Tarn'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'82','Tarn-et-Garonne'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'83','Var'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'84','Vaucluse'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'85','Vendée'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'85','Vendée'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'86','Vienne'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'87','Haute-Vienne'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'88','Vosges'); @@ -2587,12 +2583,12 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'92','Ha INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'93','Seine-Saint-Denis'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'94','Val-de-Marne'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'95','Val-d\'Oise'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'NC','Territoire des Nouvelle-Calédonie et Dependances'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'PF','Polynésie Française'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'NC','Territoire des Nouvelle-Calédonie et Dependances'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'PF','Polynésie Française'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'PM','Saint-Pierre et Miquelon'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'TF','Terres australes et antarctiques françaises'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'TF','Terres australes et antarctiques françaises'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'YT','Mayotte'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'WF','Territoire des îles Wallis et Futuna'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'WF','Territoire des îles Wallis et Futuna'); INSERT INTO lc_countries VALUES (74,'France, Metropolitan','FX','FXX',":name\n:street_address\n:postcode :city\n:country"); INSERT INTO lc_countries VALUES (75,'French Guiana','GF','GUF',":name\n:street_address\n:postcode :city\n:country"); @@ -2639,24 +2635,24 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (79,'WP','We INSERT INTO lc_countries VALUES (80,'Georgia','GE','GEO',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'AB','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'AJ','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'GU','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'IM','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'KA','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'KK','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'MM','??????-????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'RL','????-??????? ?? ????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'SJ','??????-????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'SK','???? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'SZ','?????????-???? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'TB','???????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'AB','áƒáƒ¤áƒ®áƒáƒ–ეთი'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'AJ','áƒáƒ­áƒáƒ áƒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'GU','გურიáƒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'IM','იმერეთი'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'KA','კáƒáƒ®áƒ”თი'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'KK','ქვემრქáƒáƒ áƒ—ლი'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'MM','მცხეთáƒ-მთიáƒáƒœáƒ”თი'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'RL','რáƒáƒ­áƒ-ლეჩხუმი დრქვემრსვáƒáƒœáƒ”თი'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'SJ','სáƒáƒ›áƒªáƒ®áƒ”-ჯáƒáƒ•áƒáƒ®áƒ”თი'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'SK','შიდრქáƒáƒ áƒ—ლი'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'SZ','სáƒáƒ›áƒ”გრელáƒ-ზემრსვáƒáƒœáƒ”თი'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'TB','თბილისი'); INSERT INTO lc_countries VALUES (81,'Germany','DE','DEU',":name\n:street_address\nD-:postcode :city\n:country"); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'BE','Berlin'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'BR','Brandenburg'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'BW','Baden-Württemberg'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'BW','Baden-Württemberg'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'BY','Bayern'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'HB','Bremen'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'HE','Hessen'); @@ -2669,7 +2665,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'SH','Sc INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'SL','Saarland'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'SN','Sachsen'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'ST','Sachsen-Anhalt'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'TH','Thüringen'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'TH','Thüringen'); INSERT INTO lc_countries VALUES (82,'Ghana','GH','GHA',''); @@ -2688,58 +2684,58 @@ INSERT INTO lc_countries VALUES (83,'Gibraltar','GI','GIB',''); INSERT INTO lc_countries VALUES (84,'Greece','GR','GRC',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'01','??t???a?a??a??a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'03','????t?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'04','??ß??a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'05','????ta??a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'06','F???t?da'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'07','F???da'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'11','??????da'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'12','???ad?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'13','??a?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'14','??e?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'15','???????a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'16','?a????a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'17','?ess???a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'21','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'22','??????a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'23','?efa??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'24','?e???da'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'31','??ta'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'32','Tesp??t?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'33','???????a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'34','??eße?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'41','?a?d?tsa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'42','????sa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'43','?a???s?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'44','????a?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'51','G?eße??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'52','???µa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'53','?µa??a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'54','Tessa??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'55','?aß??a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'56','?ast????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'57','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'58','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'59','????a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'61','??e??a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'62','Se????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'63','F?????a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'64','?a???d???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'69','???? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'71','?ß???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'72','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'73','??d?p?'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'81','??de????sa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'82','?????de?'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'83','??sß??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'84','S?µ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'85','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'91','?????e??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'92','?as???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'93','?e??µ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'94','?a????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'A1','?tt???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'01','ΑιτωλοακαÏνανία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'03','Βοιωτία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'04','ΕÏβοια'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'05','ΕυÏυτανία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'06','Φθιώτιδα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'07','Φωκίδα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'11','ΑÏγολίδα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'12','ΑÏκαδία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'13','ἈχαÎα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'14','Ηλεία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'15','ΚοÏινθία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'16','Λακωνία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'17','Μεσσηνία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'21','Ζάκυνθος'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'22','ΚέÏκυÏα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'23','Κεφαλλονιά'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'24','Λευκάδα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'31','ΆÏτα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'32','ΘεσπÏωτία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'33','Ιωάννινα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'34','ΠÏεβεζα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'41','ΚαÏδίτσα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'42','ΛάÏισα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'43','Μαγνησία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'44','ΤÏίκαλα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'51','ΓÏεβενά'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'52','ΔÏάμα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'53','Ημαθία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'54','Θεσσαλονίκη'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'55','Καβάλα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'56','ΚαστοÏιά'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'57','Κιλκίς'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'58','Κοζάνη'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'59','Πέλλα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'61','ΠιεÏία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'62','ΣεÏÏών'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'63','ΦλώÏινα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'64','Χαλκιδική'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'69','ÎŒÏος Άθως'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'71','ΈβÏος'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'72','Ξάνθη'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'73','Ροδόπη'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'81','Δωδεκάνησα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'82','Κυκλάδες'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'83','Λέσβου'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'84','Σάμος'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'85','Χίος'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'91','ΗÏάκλειο'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'92','Λασίθι'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'93','ΡεθÏμνο'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'94','Χανίων'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'A1','Αττική'); INSERT INTO lc_countries VALUES (85,'Greenland','GL','GRL',":name\n:street_address\nDK-:postcode :city\n:country"); @@ -2771,53 +2767,53 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'HU','Hu INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'IZ','Izabal'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'JA','Jalapa'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'JU','Jutiapa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'PE','El Petén'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'PE','El Petén'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'PR','El Progreso'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'QC','El Quiché'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'QC','El Quiché'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'QZ','Quetzaltenango'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'RE','Retalhuleu'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'SA','Sacatepéquez'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'SA','Sacatepéquez'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'SM','San Marcos'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'SO','Sololá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'SO','Sololá'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'SR','Santa Rosa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'SU','Suchitepéquez'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'TO','Totonicapán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'SU','Suchitepéquez'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'TO','Totonicapán'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'ZA','Zacapa'); INSERT INTO lc_countries VALUES (90,'Guinea','GN','GIN',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'BE','Beyla'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'BF','Boffa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'BK','Boké'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'BK','Boké'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'CO','Coyah'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'DB','Dabola'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'DI','Dinguiraye'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'DL','Dalaba'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'DU','Dubréka'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'DU','Dubréka'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'FA','Faranah'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'FO','Forécariah'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'FO','Forécariah'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'FR','Fria'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'GA','Gaoual'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'GU','Guékédou'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'GU','Guékédou'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'KA','Kankan'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'KB','Koubia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'KD','Kindia'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'KE','Kérouané'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'KE','Kérouané'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'KN','Koundara'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'KO','Kouroussa'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'KS','Kissidougou'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'LA','Labé'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'LE','Lélouma'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'LA','Labé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'LE','Lélouma'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'LO','Lola'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'MC','Macenta'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'MD','Mandiana'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'ML','Mali'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'MM','Mamou'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'NZ','Nzérékoré'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'NZ','Nzérékoré'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'PI','Pita'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'SI','Siguiri'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'TE','Télimélé'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'TO','Tougué'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'TE','Télimélé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'TO','Tougué'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'YO','Yomou'); INSERT INTO lc_countries VALUES (91,'Guinea-Bissau','GW','GNB',''); @@ -2867,139 +2863,139 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (94,'H','Hea INSERT INTO lc_countries VALUES (95,'Honduras','HN','HND',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'AT','Atlántida'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'AT','Atlántida'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'CH','Choluteca'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'CL','Colón'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'CL','Colón'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'CM','Comayagua'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'CP','Copán'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'CR','Cortés'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'EP','El Paraíso'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'FM','Francisco Morazán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'CP','Copán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'CR','Cortés'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'EP','El Paraíso'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'FM','Francisco Morazán'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'GD','Gracias a Dios'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'IB','Islas de la Bahía'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'IN','Intibucá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'IB','Islas de la Bahía'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'IN','Intibucá'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'LE','Lempira'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'LP','La Paz'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'OC','Ocotepeque'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'OL','Olancho'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'SB','Santa Bárbara'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'SB','Santa Bárbara'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'VA','Valle'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'YO','Yoro'); INSERT INTO lc_countries VALUES (96,'Hong Kong','HK','HKG',":name\n:street_address\n:city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'HCW','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'HEA','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'HSO','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'HWC','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KKC','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KKT','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KSS','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KWT','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KYT','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NIS','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NKT','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NNO','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NSK','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NST','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NTP','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NTW','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NTM','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NYL','???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'HCW','中西å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'HEA','æ±å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'HSO','å—å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'HWC','ç£ä»”å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KKC','ä¹é¾åŸŽå€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KKT','觀塘å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KSS','深水埗å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KWT','黃大仙å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KYT','油尖旺å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NIS','離島å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NKT','葵é’å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NNO','北å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NSK','西貢å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NST','沙田å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NTP','大埔å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NTW','èƒç£å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NTM','屯門å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NYL','元朗å€'); INSERT INTO lc_countries VALUES (97,'Hungary','HU','HUN',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BA','Baranya megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BC','Békéscsaba'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BE','Békés megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BK','Bács-Kiskun megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BC','Békéscsaba'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BE','Békés megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BK','Bács-Kiskun megye'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BU','Budapest'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BZ','Borsod-Abaúj-Zemplén megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'CS','Csongrád megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BZ','Borsod-Abaúj-Zemplén megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'CS','Csongrád megye'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'DE','Debrecen'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'DU','Dunaújváros'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'DU','Dunaújváros'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'EG','Eger'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'FE','Fejér megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'GS','Gyor-Moson-Sopron megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'GY','Gyor'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'HB','Hajdú-Bihar megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'FE','Fejér megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'GS','GyÅ‘r-Moson-Sopron megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'GY','GyÅ‘r'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'HB','Hajdú-Bihar megye'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'HE','Heves megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'HV','Hódmezovásárhely'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'JN','Jász-Nagykun-Szolnok megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'KE','Komárom-Esztergom megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'KM','Kecskemét'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'KV','Kaposvár'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'HV','HódmezÅ‘vásárhely'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'JN','Jász-Nagykun-Szolnok megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'KE','Komárom-Esztergom megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'KM','Kecskemét'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'KV','Kaposvár'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'MI','Miskolc'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'NK','Nagykanizsa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'NO','Nógrád megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'NY','Nyíregyháza'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'NO','Nógrád megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'NY','Nyíregyháza'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'PE','Pest megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'PS','Pécs'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'PS','Pécs'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SD','Szeged'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SF','Székesfehérvár'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SF','Székesfehérvár'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SH','Szombathely'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SK','Szolnok'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SN','Sopron'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SO','Somogy megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SS','Szekszárd'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'ST','Salgótarján'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SZ','Szabolcs-Szatmár-Bereg megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'TB','Tatabánya'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SS','Szekszárd'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'ST','Salgótarján'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SZ','Szabolcs-Szatmár-Bereg megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'TB','Tatabánya'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'TO','Tolna megye'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'VA','Vas megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'VE','Veszprém megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'VM','Veszprém'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'VE','Veszprém megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'VM','Veszprém'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'ZA','Zala megye'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'ZE','Zalaegerszeg'); INSERT INTO lc_countries VALUES (98,'Iceland','IS','ISL',":name\n:street_address\nIS:postcode :city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'1','Höfuðborgarsvæðið'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'2','Suðurnes'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'1','Höfuðborgarsvæðið'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'2','Suðurnes'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'3','Vesturland'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'4','Vestfirðir'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'5','Norðurland vestra'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'6','Norðurland eystra'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'7','Austfirðir'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'8','Suðurland'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'4','Vestfirðir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'5','Norðurland vestra'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'6','Norðurland eystra'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'7','Austfirðir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'8','Suðurland'); INSERT INTO lc_countries VALUES (99,'India','IN','IND',":name\n:street_address\n:city-:postcode\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-AN','?????? ?? ??????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-AP','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-AR','??????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-AS','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-BR','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-CH','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-CT','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-DD','??? ??? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-DL','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-DN','????? ??? ??? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-GA','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-GJ','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-HP','?????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-HR','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-JH','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-JK','????? ?? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-KA','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-KL','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-LD','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-ML','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-MH','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-MN','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-MP','???? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-MZ','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-NL','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-OR','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-PB','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-PY','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-RJ','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-SK','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-TN','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-TR','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-UL','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-UP','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-WB','??????????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-AN','अंडमान और निकोबार दà¥à¤µà¥€à¤ª'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-AP','ఆంధà±à°° à°ªà±à°°à°¦à±‡à°¶à±'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-AR','अरà¥à¤£à¤¾à¤šà¤² पà¥à¤°à¤¦à¥‡à¤¶'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-AS','অসম'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-BR','बिहार'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-CH','चंडीगढ़'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-CT','छतà¥à¤¤à¥€à¤¸à¤—ढ़'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-DD','દમણ અને દિવ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-DL','दिलà¥à¤²à¥€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-DN','દાદરા અને નગર હવેલી'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-GA','गोंय'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-GJ','ગà«àªœàª°àª¾àª¤'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-HP','हिमाचल पà¥à¤°à¤¦à¥‡à¤¶'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-HR','हरियाणा'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-JH','à¤à¤¾à¤°à¤–ंड'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-JK','जमà¥à¤®à¥‚ और कशà¥à¤®à¥€à¤°'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-KA','ಕನಾ೯ಟಕ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-KL','കേരളം'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-LD','ലകàµà´·à´¦àµà´µàµ€à´ªàµ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-ML','मेघालय'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-MH','महाराषà¥à¤Ÿà¥à¤°'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-MN','मणिपà¥à¤°'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-MP','मधà¥à¤¯ पà¥à¤°à¤¦à¥‡à¤¶'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-MZ','मिज़ोरम'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-NL','नागालैंड'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-OR','उड़ीसा'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-PB','ਪੰਜਾਬ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-PY','பà¯à®¤à¯à®šà¯à®šà¯‡à®°à®¿'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-RJ','राजसà¥à¤¥à¤¾à¤¨'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-SK','सिकà¥à¤•à¤¿à¤®'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-TN','தமிழ௠நாடà¯'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-TR','তà§à¦°à¦¿à¦ªà§à¦°à¦¾'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-UL','उतà¥à¤¤à¤°à¤¾à¤‚चल'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-UP','उतà¥à¤¤à¤° पà¥à¤°à¤¦à¥‡à¤¶'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-WB','পশà§à¦šà¦¿à¦®à¦¬à¦™à§à¦—'); INSERT INTO lc_countries VALUES (100,'Indonesia','ID','IDN',":name\n:street_address\n:city :postcode\n:country"); @@ -3036,93 +3032,93 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (100,'YO','Y INSERT INTO lc_countries VALUES (101,'Iran','IR','IRN',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'01','?????? ????????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'02','?????? ????????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'03','?????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'04','?????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'05','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'06','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'07','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'08','?????? ??????? ? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'09','?????? ?????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'10','?????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'11','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'12','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'13','?????? ?????? ??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'14','?????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'15','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'16','?????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'17','?????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'18','?????? ???????? ? ???? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'19','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'20','?????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'21','?????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'22','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'23','?????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'24','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'25','?????? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'26','?????? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'27','?????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'28','?????? ?????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'01','محاÙظة آذربایجان شرقي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'02','محاÙظة آذربایجان غربي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'03','محاÙظة اردبیل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'04','محاÙظة اصÙهان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'05','محاÙظة ایلام'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'06','محاÙظة بوشهر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'07','محاÙظة طهران'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'08','محاÙظة چهارمحل Ùˆ بختیاري'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'09','محاÙظة خراسان رضوي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'10','محاÙظة خوزستان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'11','محاÙظة زنجان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'12','محاÙظة سمنان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'13','محاÙظة سيستان وبلوتشستان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'14','محاÙظة Ùارس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'15','محاÙظة کرمان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'16','محاÙظة کردستان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'17','محاÙظة کرمانشاه'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'18','محاÙظة کهکیلویه Ùˆ بویر أحمد'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'19','محاÙظة گیلان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'20','محاÙظة لرستان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'21','محاÙظة مازندران'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'22','محاÙظة مرکزي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'23','محاÙظة هرمزگان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'24','محاÙظة همدان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'25','محاÙظة یزد'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'26','محاÙظة قم'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'27','محاÙظة گلستان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'28','محاÙظة قزوين'); INSERT INTO lc_countries VALUES (102,'Iraq','IQ','IRQ',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'AN','?????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'AR','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'BA','?????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'BB','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'BG','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'DA','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'DI','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'DQ','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'KA','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'MA','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'MU','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'NA','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'NI','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'QA','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'SD','???? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'SW','?????? ??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'TS','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'WA','????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'AN','محاÙظة الأنبار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'AR','أربيل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'BA','محاÙظة البصرة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'BB','بابل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'BG','محاÙظة بغداد'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'DA','دهوك'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'DI','ديالى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'DQ','ذي قار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'KA','كربلاء'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'MA','ميسان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'MU','المثنى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'NA','النجÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'NI','نینوى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'QA','القادسية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'SD','صلاح الدين'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'SW','محاÙظة السليمانية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'TS','التأمیم'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'WA','واسط'); INSERT INTO lc_countries VALUES (103,'Ireland','IE','IRL',":name\n:street_address\nIE-:city\n:country"); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'C','Corcaigh'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'CE','Contae an Chláir'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'CN','An Cabhán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'CE','Contae an Chláir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'CN','An Cabhán'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'CW','Ceatharlach'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'D','Baile Átha Cliath'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'DL','Dún na nGall'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'D','Baile Ãtha Cliath'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'DL','Dún na nGall'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'G','Gaillimh'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'KE','Cill Dara'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'KK','Cill Chainnigh'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'KY','Contae Chiarraí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'KY','Contae Chiarraí'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'LD','An Longfort'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'LH','Contae Lú'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'LH','Contae Lú'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'LK','Luimneach'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'LM','Contae Liatroma'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'LS','Contae Laoise'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'MH','Contae na Mí'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'MN','Muineachán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'MH','Contae na Mí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'MN','Muineachán'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'MO','Contae Mhaigh Eo'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'OY','Contae Uíbh Fhailí'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'RN','Ros Comáin'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'OY','Contae Uíbh Fhailí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'RN','Ros Comáin'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'SO','Sligeach'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'TA','Tiobraid Árann'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'TA','Tiobraid Ãrann'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'WD','Port Lairge'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'WH','Contae na hIarmhí'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'WW','Cill Mhantáin'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'WH','Contae na hIarmhí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'WW','Cill Mhantáin'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'WX','Loch Garman'); INSERT INTO lc_countries VALUES (104,'Israel','IL','ISR',":name\n:street_address\n:postcode :city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'D ','???? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'HA','???? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'JM','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'M ','???? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'TA','?? ????-???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'Z ','???? ?????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'D ','מחוז הדרו×'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'HA','מחוז חיפה'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'JM','ירושלי×'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'M ','מחוז המרכז'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'TA','תל ×ביב-יפו'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'Z ','מחוז הצפון'); INSERT INTO lc_countries VALUES (105,'Italy','IT','ITA',":name\n:street_address\n:postcode-:city :state_code\n:country"); @@ -3162,7 +3158,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (105,'FE','F INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (105,'FG','Foggia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (105,'FI','Firenze'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (105,'FM','Fermo'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (105,'FO','Forlì-Cesena'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (105,'FO','Forlì-Cesena'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (105,'FR','Frosinone'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (105,'GE','Genova'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (105,'GO','Gorizia'); @@ -3256,88 +3252,88 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (106,'14','S INSERT INTO lc_countries VALUES (107,'Japan','JP','JPN',":name\n:street_address, :suburb\n:city :postcode\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'01','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'02','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'03','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'04','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'05','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'06','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'07','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'08','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'09','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'10','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'11','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'12','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'13','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'14','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'15','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'16','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'17','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'18','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'19','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'20','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'21','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'22','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'23','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'24','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'25','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'26','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'27','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'28','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'29','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'30','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'31','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'32','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'33','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'34','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'35','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'36','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'37','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'38','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'39','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'40','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'41','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'42','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'43','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'44','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'45','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'46','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'47','??'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'01','北海é“'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'02','é’森'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'03','岩手'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'04','宮城'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'05','秋田'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'06','山形'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'07','ç¦å³¶'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'08','茨城'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'09','栃木'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'10','群馬'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'11','埼玉'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'12','åƒè‘‰'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'13','æ±äº¬'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'14','神奈å·'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'15','新潟'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'16','富山'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'17','石å·'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'18','ç¦äº•'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'19','山梨'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'20','長野'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'21','å²é˜œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'22','é™å²¡'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'23','愛知'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'24','三é‡'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'25','滋賀'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'26','京都'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'27','大阪'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'28','兵庫'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'29','奈良'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'30','和歌山'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'31','é³¥å–'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'32','島根'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'33','岡山'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'34','広島'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'35','å±±å£'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'36','徳島'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'37','香å·'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'38','愛媛'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'39','高知'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'40','ç¦å²¡'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'41','ä½è³€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'42','é•·å´Ž'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'43','熊本'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'44','大分'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'45','宮崎'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'46','鹿å…島'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'47','沖縄'); INSERT INTO lc_countries VALUES (108,'Jordan','JO','JOR',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AJ','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AM','?????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AQ','?????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AT','?????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AZ','?????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'BA','?????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'JA','?????? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'JR','?????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'KA','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'MA','?????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'MD','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'MN','?????? ????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AJ','محاÙظة عجلون'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AM','محاÙظة العاصمة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AQ','محاÙظة العقبة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AT','محاÙظة الطÙيلة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AZ','محاÙظة الزرقاء'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'BA','محاÙظة البلقاء'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'JA','محاÙظة جرش'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'JR','محاÙظة إربد'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'KA','محاÙظة الكرك'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'MA','محاÙظة المÙرق'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'MD','محاÙظة مادبا'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'MN','محاÙظة معان'); INSERT INTO lc_countries VALUES (109,'Kazakhstan','KZ','KAZ',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AL','??????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AL','Ðлматы'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AC','Almaty City'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AM','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AQ','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AS','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AT','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'BA','????? ?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'BY','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'MA','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'ON','???????? ?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'PA','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'QA','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'QO','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'QY','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'SH','????? ?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'SO','????????? ?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'ZH','??????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AM','Ðқмола'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AQ','Ðқтөбе'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AS','ÐÑтана'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AT','Ðтырау'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'BA','Ð‘Ð°Ñ‚Ñ‹Ñ ÒšÐ°Ð·Ð°Ò›Ñтан'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'BY','Байқоңыр'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'MA','МаңғыÑтау'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'ON','ОңтүÑтік ҚазақÑтан'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'PA','Павлодар'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'QA','Қарағанды'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'QO','ҚоÑтанай'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'QY','Қызылорда'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'SH','Ð¨Ñ‹Ò“Ñ‹Ñ ÒšÐ°Ð·Ð°Ò›Ñтан'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'SO','СолтүÑтік ҚазақÑтан'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'ZH','Жамбыл'); INSERT INTO lc_countries VALUES (110,'Kenya','KE','KEN',''); @@ -3358,108 +3354,108 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (111,'P','Ph INSERT INTO lc_countries VALUES (112,'Korea, North','KP','PRK',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'CHA','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'HAB','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'HAN','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'HWB','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'HWN','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'KAN','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'KAE','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'NAJ','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'NAM','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'PYB','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'PYN','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'PYO','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'YAN','???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'CHA','ìžê°•ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'HAB','함경 ë¶ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'HAN','함경 남ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'HWB','황해 ë¶ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'HWN','황해 남ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'KAN','ê°•ì›ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'KAE','개성시'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'NAJ','ë¼ì„  ì§í• ì‹œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'NAM','ë‚¨í¬ íŠ¹ê¸‰ì‹œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'PYB','í‰ì•ˆ ë¶ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'PYN','í‰ì•ˆ 남ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'PYO','í‰ì–‘ ì§í• ì‹œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'YAN','량강ë„'); INSERT INTO lc_countries VALUES (113,'Korea, South','KR','KOR',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'11','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'26','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'27','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'28','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'29','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'30','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'31','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'41','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'42','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'43','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'44','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'45','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'46','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'47','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'48','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'49','???????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'11','서울특별시'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'26','부산 ê´‘ì—­ì‹œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'27','대구 ê´‘ì—­ì‹œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'28','ì¸ì²œê´‘ì—­ì‹œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'29','광주 ê´‘ì—­ì‹œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'30','대전 ê´‘ì—­ì‹œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'31','울산 ê´‘ì—­ì‹œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'41','경기ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'42','ê°•ì›ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'43','충청 ë¶ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'44','충청 남ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'45','ì „ë¼ ë¶ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'46','ì „ë¼ ë‚¨ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'47','ê²½ìƒ ë¶ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'48','ê²½ìƒ ë‚¨ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'49','제주특별ìžì¹˜ë„'); INSERT INTO lc_countries VALUES (114,'Kuwait','KW','KWT',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'AH','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'FA','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'JA','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'KU','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'HW','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'MU','????? ??????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'AH','الاحمدي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'FA','الÙروانية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'JA','الجهراء'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'KU','ألعاصمه'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'HW','حولي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'MU','مبارك الكبير'); INSERT INTO lc_countries VALUES (115,'Kyrgyzstan','KG','KGZ',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'B','?????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'C','??? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'GB','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'J','?????-???? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'N','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'O','?? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'T','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'Y','????-??? ???????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'B','Баткен облаÑÑ‚Ñ‹'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'C','Чүй облаÑÑ‚Ñ‹'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'GB','Бишкек'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'J','Жалал-Ðбад облаÑÑ‚Ñ‹'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'N','Ðарын облаÑÑ‚Ñ‹'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'O','Ош облаÑÑ‚Ñ‹'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'T','Ð¢Ð°Ð»Ð°Ñ Ð¾Ð±Ð»Ð°ÑÑ‚Ñ‹'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'Y','ЫÑык-Көл облаÑÑ‚Ñ‹'); INSERT INTO lc_countries VALUES (116,'Laos','LA','LAO',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'AT','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'BK','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'BL','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'CH','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'HO','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'KH','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'LM','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'LP','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'OU','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'PH','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'SL','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'SV','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'VI','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'VT','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'XA','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'XE','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'XI','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'XN','????????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'AT','ອັດຕະປື'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'BK','ບà»à»ˆà»àºà»‰àº§'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'BL','ບà»àº¥àº´àº„à»àº²à»„ຊ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'CH','ຈà»àº²àº›àº²àºªàº±àº'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'HO','ຫົວພັນ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'KH','ຄà»àº²àº¡à»ˆàº§àº™'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'LM','ຫລວງນà»à»‰àº²àº—າ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'LP','ຫລວງພະບາງ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'OU','ອຸດົມໄຊ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'PH','ຜົງສາລີ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'SL','ສາລະວັນ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'SV','ສະຫວັນນະເຂດ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'VI','ວຽງຈັນ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'VT','ວຽງຈັນ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'XA','ໄຊàºàº°àºšàº¹àº¥àºµ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'XE','ເຊàºàº­àº‡'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'XI','ຊຽງຂວາງ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'XN','ໄຊສົມບູນ'); INSERT INTO lc_countries VALUES (117,'Latvia','LV','LVA',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'AI','Aizkraukles rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'AL','Aluksnes rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'AL','AlÅ«ksnes rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'BL','Balvu rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'BU','Bauskas rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'CE','Cesu rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'CE','CÄ“su rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'DA','Daugavpils rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'DGV','Daugpilis'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'DO','Dobeles rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'GU','Gulbenes rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'JEL','Jelgava'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'JK','Jekabpils rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'JK','JÄ“kabpils rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'JL','Jelgavas rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'JUR','Jurmala'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'KR','Kraslavas rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'KU','Kuldigas rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'LE','Liepajas rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'LM','Limbažu rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'JUR','JÅ«rmala'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'KR','KrÄslavas rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'KU','KuldÄ«gas rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'LE','LiepÄjas rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'LM','Limbažu rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'LPX','Liepoja'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'LU','Ludzas rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'MA','Madonas rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'OG','Ogres rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'PR','Preilu rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'RE','Rezeknes rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'REZ','Rezekne'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'RI','Rigas rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'RIX','Riga'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'PR','Preiļu rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'RE','RÄ“zeknes rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'REZ','RÄ“zekne'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'RI','RÄ«gas rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'RIX','RÄ«ga'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'SA','Saldus rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'TA','Talsu rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'TU','Tukuma rajons'); @@ -3503,40 +3499,40 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (120,'SI','S INSERT INTO lc_countries VALUES (121,'Libyan Arab Jamahiriya','LY','LBY',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'AJ','Ajdabiya'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'BA','Banghazi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'BU','Al Butnan'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'BW','Bani Walid'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'AJ','AjdÄbiyÄ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'BA','BanghÄzÄ«'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'BU','Al BuÅ£nÄn'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'BW','BanÄ« WalÄ«d'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'DR','Darnah'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'GD','Ghadamis'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'GR','Gharyan'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'GT','Ghat'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'HZ','Al ?izam al Akh?ar'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'JA','Al Jabal al Akh?ar'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'JB','Jaghbub'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'JI','Al Jifarah'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'GD','GhadÄmis'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'GR','GharyÄn'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'GT','GhÄt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'HZ','Al ḨizÄm al Akhḑar'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'JA','Al Jabal al Akhḑar'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'JB','JaghbÅ«b'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'JI','Al JifÄrah'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'JU','Al Jufrah'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'KF','Al Kufrah'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'MB','Al Marqab'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'MI','Misratah'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'MI','MiÅŸrÄtah'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'MJ','Al Marj'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'MQ','Murzuq'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'MZ','Mizdah'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'NL','Nalut'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'NQ','An Nuqat al Khams'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'NL','NÄlÅ«t'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'NQ','An NuqaÅ£ al Khams'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'QB','Al Qubbah'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'QT','Al Qatrun'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'SB','Sabha'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'SH','Ash Shati'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'QT','Al QaÅ£rÅ«n'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'SB','SabhÄ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'SH','Ash ShÄÅ£i'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'SR','Surt'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'SS','Sabratah Surman'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'TB','Tarabulus'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'TM','Tarhunah-Masallatah'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'TN','Tajura wa an Nawa?i al Arba?'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'WA','Al Wa?ah'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'WD','Wadi al ?ayat'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'YJ','Yafran-Jadu'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'ZA','Az Zawiyah'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'SS','ÅžabrÄtah ÅžurmÄn'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'TB','Å¢arÄbulus'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'TM','TarhÅ«nah-MasallÄtah'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'TN','TÄjÅ«rÄ wa an NawÄḩī al ArbÄÊ»'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'WA','Al WÄḩah'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'WD','WÄdÄ« al ḨayÄt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'YJ','Yafran-JÄdÅ«'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'ZA','Az ZÄwiyah'); INSERT INTO lc_countries VALUES (122,'Liechtenstein','LI','LIE',''); @@ -3555,13 +3551,13 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (122,'V','Va INSERT INTO lc_countries VALUES (123,'Lithuania','LT','LTU',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'AL','Alytaus Apskritis'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'KL','Klaipedos Apskritis'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'KL','KlaipÄ—dos Apskritis'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'KU','Kauno Apskritis'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'MR','Marijampoles Apskritis'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'PN','Panevežio Apskritis'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'SA','Šiauliu Apskritis'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'TA','Taurages Apskritis'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'TE','Telšiu Apskritis'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'MR','MarijampolÄ—s Apskritis'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'PN','Panevėžio Apskritis'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'SA','Å iaulių Apskritis'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'TA','TauragÄ—s Apskritis'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'TE','TelÅ¡ių Apskritis'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'UT','Utenos Apskritis'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'VL','Vilniaus Apskritis'); @@ -3573,95 +3569,95 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (124,'L','Lu INSERT INTO lc_countries VALUES (125,'Macau','MO','MAC',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (125,'I','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (125,'M','???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (125,'I','海島市'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (125,'M','澳門市'); INSERT INTO lc_countries VALUES (126,'Macedonia','MK','MKD',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'BR','Berovo'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CH','????????-????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DL','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KB','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'OC','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'LO','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'MK','?????????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PH','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PT','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ST','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SL','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NI','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ZR','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KY','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KZ','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'UM','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'LI','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RN','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NA','????? ??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'TL','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DM','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DE','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KG','????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KS','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'MG','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NV','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PP','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RE','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VJ','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'BN','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GT','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'JG','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'MR','??????? ? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'TR','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ET','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VH','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ZE','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'AD','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'AR','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'BU','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CI','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CE','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CS','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GB','???? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GP','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'IL','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KX','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VD','?????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PE','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'AJ','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SS','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SU','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SO','???? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ZK','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'BG','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'BS','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GV','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KN','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NS','???? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RV','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SD','???? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RU','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VA','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VL','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CZ','?????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DB','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DA','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DR','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KH','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'MD','?????????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'OD','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'OS','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PN','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'UG','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VV','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VC','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ZA','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CA','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DK','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GR','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'AV','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NG','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RM','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VE','?????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CH','Чешиново-Облешево'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DL','Делчево'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KB','Карбинци'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'OC','Кочани'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'LO','Лозово'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'MK','МакедонÑка каменица'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PH','Пехчево'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PT','Пробиштип'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ST','Штип'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SL','Свети Ðиколе'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NI','Виница'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ZR','Зрновци'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KY','Кратово'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KZ','Крива Паланка'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'UM','Куманово'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'LI','Липково'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RN','Ранковце'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NA','Старо Ðагоричане'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'TL','Битола'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DM','Демир ХиÑар'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DE','Долнени'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KG','Кривогаштани'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KS','Крушево'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'MG','Могила'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NV','Ðоваци'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PP','Прилеп'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RE','РеÑен'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VJ','Боговиње'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'BN','Брвеница'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GT','ГоÑтивар'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'JG','Јегуновце'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'MR','Маврово и РоÑтуша'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'TR','Теарце'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ET','Тетово'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VH','Врапчиште'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ZE','Желино'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'AD','Ðеродром'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'AR','Ðрачиново'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'BU','Бутел'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CI','Чаир'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CE','Центар'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CS','Чучер Сандево'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GB','Гази Баба'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GP','Ѓорче Петров'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'IL','Илинден'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KX','Карпош'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VD','КиÑела Вода'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PE','Петровец'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'AJ','Сарај'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SS','Сопиште'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SU','Студеничани'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SO','Шуто Оризари'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ZK','Зелениково'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'BG','Богданци'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'BS','БоÑилово'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GV','Гевгелија'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KN','Конче'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NS','Ðово Село'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RV','Радовиш'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SD','Стар Дојран'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RU','Струмица'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VA','Валандово'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VL','ВаÑилево'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CZ','Центар Жупа'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DB','Дебар'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DA','Дебарца'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DR','Другово'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KH','Кичево'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'MD','МакедонÑки Брод'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'OD','Охрид'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'OS','ОÑломеј'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PN','ПлаÑница'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'UG','Струга'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VV','Вевчани'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VC','Вранештица'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ZA','ЗајаÑ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CA','Чашка'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DK','Демир Капија'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GR','ГрадÑко'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'AV','Кавадарци'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NG','Ðеготино'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RM','РоÑоман'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VE','ВелеÑ'); INSERT INTO lc_countries VALUES (127,'Madagascar','MG','MDG',''); @@ -3752,7 +3748,7 @@ INSERT INTO lc_countries VALUES (131,'Mali','ML','MLI',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (131,'1','Kayes'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (131,'2','Koulikoro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (131,'3','Sikasso'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (131,'4','Ségou'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (131,'4','Ségou'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (131,'5','Mopti'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (131,'6','Tombouctou'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (131,'7','Gao'); @@ -3862,19 +3858,19 @@ INSERT INTO lc_countries VALUES (134,'Martinique','MQ','MTQ',''); INSERT INTO lc_countries VALUES (135,'Mauritania','MR','MRT',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'01','????? ????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'02','????? ????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'03','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'04','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'05','????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'06','????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'07','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'08','????? ????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'09','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'10','????? ???? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'11','????? ???? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'12','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'NKC','???????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'01','ولاية الحوض الشرقي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'02','ولاية الحوض الغربي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'03','ولاية العصابة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'04','ولاية كركول'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'05','ولاية البراكنة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'06','ولاية الترارزة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'07','ولاية آدرار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'08','ولاية داخلت نواذيبو'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'09','ولاية تكانت'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'10','ولاية كيدي ماغة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'11','ولاية تيرس زمور'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'12','ولاية إينشيري'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'NKC','نواكشوط'); INSERT INTO lc_countries VALUES (136,'Mauritius','MU','MUS',''); @@ -3915,16 +3911,16 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'GUA',' INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'HID','Hidalgo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'JAL','Jalisco'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'MEX','Mexico'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'MIC','Michoacán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'MIC','Michoacán'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'MOR','Morelos'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'NAY','Nayarit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'NLE','Nuevo León'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'NLE','Nuevo León'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'OAX','Oaxaca'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'PUE','Puebla'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'QUE','Querétaro'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'QUE','Querétaro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'ROO','Quintana Roo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'SIN','Sinaloa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'SLP','San Luis Potosí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'SLP','San Luis Potosí'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'SON','Sonora'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'TAB','Tabasco'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'TAM','Tamaulipas'); @@ -3942,14 +3938,14 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (139,'YAP',' INSERT INTO lc_countries VALUES (140,'Moldova','MD','MDA',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'BA','Balti'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'BA','BălÅ£i'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'CA','Cahul'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'CU','Chisinau'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'ED','Edinet'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'GA','Gagauzia'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'LA','Lapusna'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'CU','ChiÅŸinău'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'ED','EdineÅ£'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'GA','Găgăuzia'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'LA','LăpuÅŸna'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'OR','Orhei'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'SN','Stânga Nistrului'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'SN','Stânga Nistrului'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'SO','Soroca'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'TI','Tighina'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'UN','Ungheni'); @@ -3963,34 +3959,34 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (141,'MV','M INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (141,'SM','Saint Michel'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (141,'CO','Condamine'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (141,'LC','La Colle'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (141,'RE','Les Révoires'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (141,'RE','Les Révoires'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (141,'MO','Moneghetti'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (141,'FV','Fontvieille'); INSERT INTO lc_countries VALUES (142,'Mongolia','MN','MNG',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'1','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'035','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'037','??????-??? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'039','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'041','??????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'043','???? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'046','??? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'047','??? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'049','??????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'051','????????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'053','???????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'055','?????????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'057','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'059','???????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'061','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'063','????????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'064','?????????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'065','????-????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'067','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'069','?????????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'071','???? ????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'073','???????? ?????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'1','Улаанбаатар'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'035','Орхон аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'037','Дархан-Уул аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'039','Ð¥Ñнтий аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'041','ХөвÑгөл аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'043','Ховд аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'046','Ð£Ð²Ñ Ð°Ð¹Ð¼Ð°Ð³'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'047','Төв аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'049','СÑлÑÐ½Ð³Ñ Ð°Ð¹Ð¼Ð°Ð³'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'051','Сүхбаатар аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'053','Өмнөговь аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'055','Өвөрхангай аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'057','Завхан аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'059','Дундговь аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'061','Дорнод аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'063','Дорноговь аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'064','ГовьÑүмбÑÑ€ аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'065','Говь-Ðлтай аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'067','Булган аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'069','БаÑнхонгор аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'071','БаÑн Өлгий аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'073','Ðрхангай аймаг'); INSERT INTO lc_countries VALUES (143,'Montserrat','MS','MSR',''); @@ -4010,26 +4006,26 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (145,'L','Ma INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (145,'MPM','Maputo cidade'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (145,'N','Nampula'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (145,'P','Cabo Delgado'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (145,'Q','Zambézia'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (145,'Q','Zambézia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (145,'S','Sofala'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (145,'T','Tete'); INSERT INTO lc_countries VALUES (146,'Myanmar','MM','MMR',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'AY','?????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'BG','????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'MG','?????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'MD','??????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'SG','???????????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'TN','???????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'YG','????????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'CH','?????????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'KC','?????????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'KH','???????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'KN','????????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'MN','????????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'RK','?????????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'SH','????????????????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'AY','ဧရာá€á€á€®á€á€­á€¯á€„္‌း'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'BG','ပဲá€á€°á€¸á€á€¯á€­á€„္‌း'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'MG','မကေ္á€á€¸á€á€­á€¯á€„္‌း'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'MD','မန္á€á€œá€±á€¸á€á€¯á€­á€„္‌း'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'SG','စစ္‌ကုိင္‌း‌á€á€¯á€­á€„္‌း'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'TN','á€á€”င္သာရိá€á€¯á€­á€„္‌း'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'YG','ရန္‌ကုန္‌á€á€¯á€­á€„္‌း'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'CH','á€á€¹á€šá€„္‌းပ္ရည္‌နယ္‌'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'KC','ကá€á€¹á€šá€„္‌ပ္ရည္‌နယ္‌'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'KH','ကယား‌ပ္ရည္‌နယ္‌'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'KN','ကရင္‌‌ပ္ရည္‌နယ္‌'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'MN','မ္á€á€”္‌ပ္ရည္‌နယ္‌'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'RK','ရá€á€¯á€­á€„္‌ပ္ရည္‌နယ္‌'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'SH','ရုမ္‌းပ္ရည္‌နယ္‌'); INSERT INTO lc_countries VALUES (147,'Namibia','NA','NAM',''); @@ -4100,7 +4096,7 @@ INSERT INTO lc_countries VALUES (151,'Netherlands Antilles','AN','ANT',":name\n: INSERT INTO lc_countries VALUES (152,'New Caledonia','NC','NCL',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (152,'L','Province des Îles'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (152,'L','Province des ÃŽles'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (152,'N','Province Nord'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (152,'S','Province Sud'); @@ -4125,23 +4121,23 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (153,'WTC',' INSERT INTO lc_countries VALUES (154,'Nicaragua','NI','NIC',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'AN','Atlántico Norte'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'AS','Atlántico Sur'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'AN','Atlántico Norte'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'AS','Atlántico Sur'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'BO','Boaco'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'CA','Carazo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'CI','Chinandega'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'CO','Chontales'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'ES','Estelí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'ES','Estelí'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'GR','Granada'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'JI','Jinotega'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'LE','León'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'LE','León'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'MD','Madriz'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'MN','Managua'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'MS','Masaya'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'MT','Matagalpa'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'NS','Nueva Segovia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'RI','Rivas'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'SJ','Río San Juan'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'SJ','Río San Juan'); INSERT INTO lc_countries VALUES (155,'Niger','NE','NER',''); @@ -4150,7 +4146,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (155,'2','Da INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (155,'3','Dosso'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (155,'4','Maradi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (155,'5','Tahoua'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (155,'6','Tillabéry'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (155,'6','Tillabéry'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (155,'7','Zinder'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (155,'8','Niamey'); @@ -4204,7 +4200,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (159,'T','Ti INSERT INTO lc_countries VALUES (160,'Norway','NO','NOR',":name\n:street_address\nNO-:postcode :city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'01','Østfold fylke'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'01','Østfold fylke'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'02','Akershus fylke'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'03','Oslo fylke'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'04','Hedmark fylke'); @@ -4217,34 +4213,34 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'10','V INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'11','Rogaland fylke'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'12','Hordaland fylke'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'14','Sogn og Fjordane fylke'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'15','Møre og Romsdal fylke'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'16','Sør-Trøndelag fylke'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'17','Nord-Trøndelag fylke'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'15','Møre og Romsdal fylke'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'16','Sør-Trøndelag fylke'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'17','Nord-Trøndelag fylke'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'18','Nordland fylke'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'19','Troms fylke'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'20','Finnmark fylke'); INSERT INTO lc_countries VALUES (161,'Oman','OM','OMN',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'BA','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'DA','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'DH','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'MA','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'MU','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'SH','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'WU','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'ZA','???????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'BA','الباطنة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'DA','الداخلية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'DH','ظÙار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'MA','مسقط'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'MU','مسندم'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'SH','الشرقية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'WU','الوسطى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'ZA','الظاهرة'); INSERT INTO lc_countries VALUES (162,'Pakistan','PK','PAK',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'BA','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'IS','????? ??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'JK','???? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'NA','????? ????? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'NW','???? ????? ????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'PB','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'SD','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'TA','????? ?????? ????? ???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'BA','بلوچستان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'IS','ÙˆÙاقی دارالحکومت'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'JK','آزاد کشمیر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'NA','شمالی Ø¹Ù„Ø§Ù‚Û Ø¬Ø§Øª'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'NW','شمال مغربی سرحدی صوبÛ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'PB','پنجاب'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'SD','سندھ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'TA','ÙˆÙاقی قبائلی Ø¹Ù„Ø§Ù‚Û Ø¬Ø§Øª'); INSERT INTO lc_countries VALUES (163,'Palau','PW','PLW',''); @@ -4268,13 +4264,13 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (163,'SO','S INSERT INTO lc_countries VALUES (164,'Panama','PA','PAN',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'1','Bocas del Toro'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'2','Coclé'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'3','Colón'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'4','Chiriquí'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'5','Darién'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'2','Coclé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'3','Colón'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'4','Chiriquí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'5','Darién'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'6','Herrera'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'7','Los Santos'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'8','Panamá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'8','Panamá'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'9','Veraguas'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'Q','Kuna Yala'); @@ -4303,39 +4299,39 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (165,'WPD',' INSERT INTO lc_countries VALUES (166,'Paraguay','PY','PRY',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'1','Concepción'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'1','Concepción'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'2','San Pedro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'3','Cordillera'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'4','Guairá'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'5','Caaguazú'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'6','Caazapá'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'7','Itapúa'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'4','Guairá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'5','Caaguazú'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'6','Caazapá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'7','Itapúa'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'8','Misiones'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'9','Paraguarí'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'10','Alto Paraná'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'9','Paraguarí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'10','Alto Paraná'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'11','Central'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'12','Ñeembucú'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'12','Ñeembucú'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'13','Amambay'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'14','Canindeyú'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'14','Canindeyú'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'15','Presidente Hayes'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'16','Alto Paraguay'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'19','Boquerón'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'ASU','Asunción'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'19','Boquerón'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'ASU','Asunción'); INSERT INTO lc_countries VALUES (167,'Peru','PE','PER',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'AMA','Amazonas'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'ANC','Ancash'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'APU','Apurímac'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'APU','Apurímac'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'ARE','Arequipa'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'AYA','Ayacucho'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'CAJ','Cajamarca'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'CAL','Callao'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'CUS','Cuzco'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'HUC','Huánuco'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'HUC','Huánuco'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'HUV','Huancavelica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'ICA','Ica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'JUN','Junín'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'JUN','Junín'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'LAL','La Libertad'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'LAM','Lambayeque'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'LIM','Lima'); @@ -4345,7 +4341,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'MOQ',' INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'PAS','Pasco'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'PIU','Piura'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'PUN','Puno'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'SAM','San Martín'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'SAM','San Martín'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'TAC','Tacna'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'TUM','Tumbes'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'UCA','Ucayali'); @@ -4436,20 +4432,20 @@ INSERT INTO lc_countries VALUES (169,'Pitcairn','PN','PCN',''); INSERT INTO lc_countries VALUES (170,'Poland','PL','POL',":name\n:street_address\n:postcode :city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'DS','Dolnoslaskie'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'DS','DolnoÅ›lÄ…skie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'KP','Kujawsko-Pomorskie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'LU','Lubelskie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'LB','Lubuskie'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'LD','Lódzkie'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'MA','Malopolskie'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'LD','Åódzkie'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'MA','MaÅ‚opolskie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'MZ','Mazowieckie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'OP','Opolskie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'PK','Podkarpackie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'PD','Podlaskie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'PM','Pomorskie'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'SL','Slaskie'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'SK','Swietokrzyskie'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'WN','Warminsko-Mazurskie'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'SL','ÅšlÄ…skie'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'SK','ÅšwiÄ™tokrzyskie'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'WN','WarmiÅ„sko-Mazurskie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'WP','Wielkopolskie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'ZP','Zachodniopomorskie'); @@ -4458,176 +4454,176 @@ INSERT INTO lc_countries VALUES (171,'Portugal','PT','PRT',":name\n:street_addre INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'01','Aveiro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'02','Beja'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'03','Braga'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'04','Bragança'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'04','Bragança'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'05','Castelo Branco'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'06','Coimbra'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'07','Évora'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'07','Évora'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'08','Faro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'09','Guarda'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'10','Leiria'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'11','Lisboa'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'12','Portalegre'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'13','Porto'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'14','Santarém'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'15','Setúbal'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'14','Santarém'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'15','Setúbal'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'16','Viana do Castelo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'17','Vila Real'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'18','Viseu'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'20','Região Autónoma dos Açores'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'30','Região Autónoma da Madeira'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'20','Região Autónoma dos Açores'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'30','Região Autónoma da Madeira'); INSERT INTO lc_countries VALUES (172,'Puerto Rico','PR','PRI',''); INSERT INTO lc_countries VALUES (173,'Qatar','QA','QAT',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'DA','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'GH','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'JB','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'JU','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'KH','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'ME','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'MS','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'RA','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'US','?? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'WA','??????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'DA','الدوحة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'GH','الغويرية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'JB','جريان الباطنة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'JU','الجميلية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'KH','الخور'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'ME','مسيعيد'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'MS','الشمال'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'RA','الريان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'US','أم صلال'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'WA','الوكرة'); INSERT INTO lc_countries VALUES (174,'Reunion','RE','REU',''); INSERT INTO lc_countries VALUES (175,'Romania','RO','ROM',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'AB','Alba'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'AG','Arges'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'AG','ArgeÅŸ'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'AR','Arad'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'B','Bucuresti'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BC','Bacau'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'B','BucureÅŸti'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BC','Bacău'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BH','Bihor'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BN','Bistrita-Nasaud'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BR','Braila'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BT','Botosani'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BV','Brasov'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BZ','Buzau'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BN','BistriÅ£a-Năsăud'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BR','Brăila'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BT','BotoÅŸani'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BV','BraÅŸov'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BZ','Buzău'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'CJ','Cluj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'CL','Calarasi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'CS','Caras-Severin'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'CT','Constanta'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'CL','CălăraÅŸi'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'CS','CaraÅŸ-Severin'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'CT','ConstanÅ£a'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'CV','Covasna'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'DB','Dâmbovita'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'DB','DâmboviÅ£a'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'DJ','Dolj'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'GJ','Gorj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'GL','Galati'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'GL','GalaÅ£i'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'GR','Giurgiu'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'HD','Hunedoara'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'HG','Harghita'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'IF','Ilfov'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'IL','Ialomita'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'IS','Iasi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'MH','Mehedinti'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'MM','Maramures'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'MS','Mures'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'NT','Neamt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'IL','IalomiÅ£a'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'IS','IaÅŸi'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'MH','MehedinÅ£i'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'MM','MaramureÅŸ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'MS','MureÅŸ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'NT','NeamÅ£'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'OT','Olt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'PH','Prahova'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'SB','Sibiu'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'SJ','Salaj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'SJ','Sălaj'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'SM','Satu Mare'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'SV','Suceava'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'TL','Tulcea'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'TM','Timis'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'TM','TimiÅŸ'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'TR','Teleorman'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'VL','Vâlcea'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'VL','Vâlcea'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'VN','Vrancea'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'VS','Vaslui'); INSERT INTO lc_countries VALUES (176,'Russia','RU','RUS',":name\n:street_address\n:postcode :city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AD','?????´? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AGB','???´?????-????´????? ??????´???? ?´????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AL','????´? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ALT','????´????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AMU','???´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ARK','????´????????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AST','???????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'BA','???????????´? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'BEL','???????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'BRY','???´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'BU','????´??? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CE','????´????? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CHE','????´??????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CHI','????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CHU','????´????? ??????´???? ?´????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CU','????´????? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'DA','???????´? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'EVE','??????´????? ??????´???? ?´????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'IN','??????´??? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'IRK','????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'IVA','???´??????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KAM','?????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KB','???????´??-?????´????? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KC','??????´???-?????´????? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KDA','????????´????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KEM','??´????????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KGD','??????????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KGN','?????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KHA','????´??????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KHM','??´???-?????´????? ??????´???? ?´????—????´'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KIA','???????´????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KIR','??´??????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KK','????´???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KL','?????´??? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KLU','????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KO','??´?? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KOR','????´????? ??????´???? ?´????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KOS','??????????´? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KR','????´??? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KRS','??´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'LEN','????????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'LIP','??´?????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MAG','??????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ME','????´? ?? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MO','?????´??? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MOS','?????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MOW','??????´'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MUR','??´???????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'NEN','????´???? ??????´???? ?´????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'NGR','???????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'NIZ','????????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'NVS','????????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'OMS','?´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ORE','??????´?????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ORL','????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'PNZ','??´???????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'PRI','?????´????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'PSK','????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ROS','?????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'RYA','????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SA','????´ (???´???) ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SAK','??????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SAM','????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SAR','????´??????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SE','??´?????? ???´???–???´??? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SMO','????´?????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SPE','?????-???????´??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'STA','????????´?????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SVE','???????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TA','?????´????? ????????´?'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TAM','?????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TAY','?????´????? ??????´???? ?´????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TOM','??´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TUL','??´?????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TVE','???????´? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TY','????´ ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TYU','????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'UD','????´?????? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ULY','????´??????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'UOB','????-????´????? ????´????? ??????´???? ?´????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'VGG','????????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'VLA','?????´??????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'VLG','??????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'VOR','????´??????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'XXX','??´?????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'YAN','???´??-????´???? ??????´???? ?´????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'YAR','??????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'YEV','????´????? ??????´???? ?´??????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AD','ÐдыгеÌÑ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AGB','ÐгиÌнÑкий-БурÑÌÑ‚Ñкий автоноÌмный оÌкруг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AL','ÐлтаÌй РеÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ALT','ÐлтаÌйÑкий край'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AMU','ÐмуÌÑ€ÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ARK','ÐрхаÌнгельÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AST','ÐÑтрахаÌнÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'BA','БашкортоÑтаÌн РеÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'BEL','БелгороÌдÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'BRY','БрÑÌнÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'BU','БурÑÌÑ‚Ð¸Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CE','ЧечеÌнÑÐºÐ°Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CHE','ЧелÑÌбинÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CHI','ЧитиÌнÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CHU','ЧукоÌÑ‚Ñкий автоноÌмный оÌкруг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CU','ЧуваÌшÑÐºÐ°Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'DA','ДагеÑтаÌн РеÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'EVE','ЭвенкиÌйÑкий автоноÌмный оÌкруг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'IN','ИнгушеÌÑ‚Ð¸Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'IRK','ИркуÌÑ‚ÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'IVA','ИваÌновÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KAM','КамчаÌÑ‚ÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KB','КабардиÌно-БалкаÌÑ€ÑÐºÐ°Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KC','КарачаÌево-ЧеркеÌÑÑÐºÐ°Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KDA','КраÑнодаÌÑ€Ñкий край'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KEM','КеÌмеровÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KGD','КалининграÌдÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KGN','КургаÌнÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KHA','ХабаÌровÑкий край'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KHM','ХаÌнты-МанÑиÌйÑкий автоноÌмный оÌкруг—ЮграÌ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KIA','КраÑноÑÌÑ€Ñкий край'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KIR','КиÌровÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KK','ХакаÌÑиÑ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KL','КалмыÌÐºÐ¸Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KLU','КалуÌжÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KO','КоÌми РеÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KOR','КорÑÌкÑкий автоноÌмный оÌкруг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KOS','КоÑтромÑкаÌÑ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KR','КареÌÐ»Ð¸Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KRS','КуÌÑ€ÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'LEN','ЛенинграÌдÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'LIP','ЛиÌÐ¿ÐµÑ†ÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MAG','МагадаÌнÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ME','МариÌй Эл РеÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MO','МордоÌÐ²Ð¸Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MOS','МоÑкоÌвÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MOW','МоÑкваÌ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MUR','МуÌрманÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'NEN','ÐенеÌцкий автоноÌмный оÌкруг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'NGR','ÐовгороÌдÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'NIZ','ÐижегороÌдÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'NVS','ÐовоÑибиÌÑ€ÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'OMS','ОÌмÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ORE','ОренбуÌргÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ORL','ОрлоÌвÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'PNZ','ПеÌнзенÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'PRI','ПримоÌÑ€Ñкий край'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'PSK','ПÑкоÌвÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ROS','РоÑтоÌвÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'RYA','РÑзаÌнÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SA','Ð¡Ð°Ñ…Ð°Ì (ЯкуÌтиÑ) РеÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SAK','СахалиÌнÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SAM','СамаÌÑ€ÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SAR','СараÌтовÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SE','СеÌÐ²ÐµÑ€Ð½Ð°Ñ ÐžÑеÌтиÑ–ÐлаÌÐ½Ð¸Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SMO','СмолÌенÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SPE','Санкт-ПетербуÌрг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'STA','СтавропоÌльÑкий край'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SVE','СвердлоÌвÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TA','РеÑпуÌблика ТатарÑтаÌн'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TAM','ТамбоÌвÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TAY','ТаймыÌÑ€Ñкий автоноÌмный оÌкруг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TOM','ТоÌмÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TUL','ТуÌльÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TVE','ТверÑкаÌÑ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TY','Ð¢Ñ‹Ð²Ð°Ì Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TYU','ТюмеÌнÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'UD','УдмуÌртÑÐºÐ°Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ULY','УльÑÌновÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'UOB','УÑÑ‚ÑŒ-ОрдыÌнÑкий БурÑÌÑ‚Ñкий автоноÌмный оÌкруг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'VGG','ВолгограÌдÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'VLA','ВладиÌмирÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'VLG','ВологоÌдÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'VOR','ВороÌнежÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'XXX','ПеÌрмÑкий край'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'YAN','ЯмаÌло-ÐенеÌцкий автоноÌмный оÌкруг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'YAR','ЯроÑлаÌвÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'YEV','ЕвреÌйÑÐºÐ°Ñ Ð°Ð²Ñ‚Ð¾Ð½Ð¾ÌÐ¼Ð½Ð°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); INSERT INTO lc_countries VALUES (177,'Rwanda','RW','RWA',''); @@ -4693,24 +4689,24 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (182,'SE','S INSERT INTO lc_countries VALUES (183,'Sao Tome and Principe','ST','STP',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (183,'P','Príncipe'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (183,'S','São Tomé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (183,'P','Príncipe'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (183,'S','São Tomé'); INSERT INTO lc_countries VALUES (184,'Saudi Arabia','SA','SAU',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'01','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'02','??? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'03','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'04','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'05','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'06','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'07','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'08','?????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'09','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'10','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'11','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'12','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'14','????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'01','الرياض'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'02','مكة المكرمة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'03','المدينه'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'04','الشرقية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'05','القصيم'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'06','حائل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'07','تبوك'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'08','الحدود الشمالية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'09','جيزان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'10','نجران'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'11','الباحة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'12','الجوÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'14','عسير'); INSERT INTO lc_countries VALUES (185,'Senegal','SN','SEN',''); @@ -4763,18 +4759,18 @@ INSERT INTO lc_countries VALUES (188,'Singapore','SG','SGP', ":name\n:street_add INSERT INTO lc_countries VALUES (189,'Slovakia','SK','SVK',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'BC','Banskobystrický kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'BL','Bratislavský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'KI','Košický kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'NJ','Nitrianský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'PV','Prešovský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'TA','Trnavský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'TC','Trencianský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'ZI','Žilinský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'BC','Banskobystrický kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'BL','Bratislavský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'KI','KoÅ¡ický kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'NJ','Nitrianský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'PV','PreÅ¡ovský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'TA','Trnavský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'TC','TrenÄianský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'ZI','Žilinský kraj'); INSERT INTO lc_countries VALUES (190,'Slovenia','SI','SVN',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'001','Ajdovšcina'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'001','AjdovÅ¡Äina'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'002','Beltinci'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'003','Bled'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'004','Bohinj'); @@ -4782,55 +4778,55 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'005',' INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'006','Bovec'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'007','Brda'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'008','Brezovica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'009','Brežice'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'010','Tišina'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'009','Brežice'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'010','TiÅ¡ina'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'011','Celje'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'012','Cerklje na Gorenjskem'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'013','Cerknica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'014','Cerkno'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'015','Crenšovci'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'016','Crna na Koroškem'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'017','Crnomelj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'015','ÄŒrenÅ¡ovci'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'016','ÄŒrna na KoroÅ¡kem'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'017','ÄŒrnomelj'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'018','Destrnik'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'019','Divaca'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'019','DivaÄa'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'020','Dobrepolje'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'021','Dobrova-Polhov Gradec'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'022','Dol pri Ljubljani'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'023','Domžale'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'023','Domžale'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'024','Dornava'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'025','Dravograd'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'026','Duplek'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'027','Gorenja vas-Poljane'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'028','Gorišnica'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'028','GoriÅ¡nica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'029','Gornja Radgona'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'030','Gornji Grad'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'031','Gornji Petrovci'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'032','Grosuplje'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'033','Šalovci'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'033','Å alovci'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'034','Hrastnik'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'035','Hrpelje-Kozina'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'036','Idrija'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'037','Ig'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'038','Ilirska Bistrica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'039','Ivancna Gorica'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'039','IvanÄna Gorica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'040','Izola'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'041','Jesenice'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'042','Juršinci'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'042','JurÅ¡inci'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'043','Kamnik'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'044','Kanal ob Soci'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'045','Kidricevo'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'044','Kanal ob SoÄi'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'045','KidriÄevo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'046','Kobarid'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'047','Kobilje'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'048','Kocevje'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'048','KoÄevje'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'049','Komen'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'050','Koper'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'051','Kozje'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'052','Kranj'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'053','Kranjska Gora'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'054','Krško'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'054','KrÅ¡ko'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'055','Kungota'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'056','Kuzma'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'057','Laško'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'057','LaÅ¡ko'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'058','Lenart'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'059','Lendava'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'060','Litija'); @@ -4838,19 +4834,19 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'061',' INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'062','Ljubno'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'063','Ljutomer'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'064','Logatec'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'065','Loška Dolina'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'066','Loški Potok'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'067','Luce'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'065','LoÅ¡ka Dolina'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'066','LoÅ¡ki Potok'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'067','LuÄe'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'068','Lukovica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'069','Majšperk'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'069','MajÅ¡perk'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'070','Maribor'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'071','Medvode'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'072','Mengeš'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'072','MengeÅ¡'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'073','Metlika'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'074','Mežica'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'074','Mežica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'075','Miren-Kostanjevica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'076','Mislinja'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'077','Moravce'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'077','MoravÄe'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'078','Moravske Toplice'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'079','Mozirje'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'080','Murska Sobota'); @@ -4860,54 +4856,54 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'083',' INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'084','Nova Gorica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'085','Novo mesto'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'086','Odranci'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'087','Ormož'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'087','Ormož'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'088','Osilnica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'089','Pesnica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'090','Piran'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'091','Pivka'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'092','Podcetrtek'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'092','PodÄetrtek'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'093','Podvelka'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'094','Postojna'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'095','Preddvor'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'096','Ptuj'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'097','Puconci'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'098','Race-Fram'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'099','Radece'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'098','RaÄe-Fram'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'099','RadeÄe'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'100','Radenci'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'101','Radlje ob Dravi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'102','Radovljica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'103','Ravne na Koroškem'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'103','Ravne na KoroÅ¡kem'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'104','Ribnica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'106','Rogaška Slatina'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'105','Rogašovci'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'106','RogaÅ¡ka Slatina'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'105','RogaÅ¡ovci'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'107','Rogatec'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'108','Ruše'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'109','Semic'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'108','RuÅ¡e'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'109','SemiÄ'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'110','Sevnica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'111','Sežana'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'111','Sežana'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'112','Slovenj Gradec'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'113','Slovenska Bistrica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'114','Slovenske Konjice'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'115','Starše'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'115','StarÅ¡e'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'116','Sveti Jurij'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'117','Šencur'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'118','Šentilj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'119','Šentjernej'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'120','Šentjur pri Celju'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'121','Škocjan'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'122','Škofja Loka'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'123','Škofljica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'124','Šmarje pri Jelšah'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'125','Šmartno ob Paki'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'126','Šoštanj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'127','Štore'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'117','Å enÄur'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'118','Å entilj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'119','Å entjernej'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'120','Å entjur pri Celju'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'121','Å kocjan'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'122','Å kofja Loka'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'123','Å kofljica'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'124','Å marje pri JelÅ¡ah'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'125','Å martno ob Paki'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'126','Å oÅ¡tanj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'127','Å tore'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'128','Tolmin'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'129','Trbovlje'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'130','Trebnje'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'131','Tržic'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'132','Turnišce'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'131','TržiÄ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'132','TurniÅ¡Äe'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'133','Velenje'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'134','Velike Lašce'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'134','Velike LaÅ¡Äe'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'135','Videm'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'136','Vipava'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'137','Vitanje'); @@ -4916,14 +4912,14 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'139',' INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'140','Vrhnika'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'141','Vuzenica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'142','Zagorje ob Savi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'143','Zavrc'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'144','Zrece'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'146','Železniki'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'147','Žiri'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'143','ZavrÄ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'144','ZreÄe'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'146','Železniki'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'147','Žiri'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'148','Benedikt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'149','Bistrica ob Sotli'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'150','Bloke'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'151','Braslovce'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'151','BraslovÄe'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'152','Cankova'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'153','Cerkvenjak'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'154','Dobje'); @@ -4932,41 +4928,41 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'156',' INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'157','Dolenjske Toplice'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'158','Grad'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'159','Hajdina'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'160','Hoce-Slivnica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'161','Hodoš'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'160','HoÄe-Slivnica'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'161','HodoÅ¡'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'162','Horjul'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'163','Jezersko'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'164','Komenda'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'165','Kostel'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'166','Križevci'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'166','Križevci'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'167','Lovrenc na Pohorju'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'168','Markovci'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'169','Miklavž na Dravskem polju'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'170','Mirna Pec'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'169','Miklavž na Dravskem polju'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'170','Mirna PeÄ'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'171','Oplotnica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'172','Podlehnik'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'173','Polzela'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'174','Prebold'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'175','Prevalje'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'176','Razkrižje'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'176','Razkrižje'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'177','Ribnica na Pohorju'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'178','Selnica ob Dravi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'179','Sodražica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'180','Solcava'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'179','Sodražica'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'180','SolÄava'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'181','Sveta Ana'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'182','Sveti Andraž v Slovenskih goricah'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'183','Šempeter-Vrtojba'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'182','Sveti Andraž v Slovenskih goricah'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'183','Å empeter-Vrtojba'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'184','Tabor'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'185','Trnovska vas'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'186','Trzin'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'187','Velika Polana'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'188','Veržej'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'188','Veržej'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'189','Vransko'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'190','Žalec'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'191','Žetale'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'192','Žirovnica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'193','Žužemberk'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'194','Šmartno pri Litiji'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'190','Žalec'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'191','Žetale'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'192','Žirovnica'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'193','Žužemberk'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'194','Å martno pri Litiji'); INSERT INTO lc_countries VALUES (191,'Solomon Islands','SB','SLB',''); @@ -5018,27 +5014,27 @@ INSERT INTO lc_countries VALUES (194,'South Georgia and the South Sandwich Islan INSERT INTO lc_countries VALUES (195,'Spain','ES','ESP',":name\n:street_address\n:postcode :city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AN','Andalucía'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AR','Aragón'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AN','Andalucía'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AR','Aragón'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'A','Alicante'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AB','Albacete'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AL','Almería'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AN','Andalucía'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AV','Ávila'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AL','Almería'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AN','Andalucía'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AV','Ãvila'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'B','Barcelona'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'BA','Badajoz'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'BI','Vizcaya'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'BU','Burgos'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'C','A Coruña'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CA','Cádiz'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CC','Cáceres'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'C','A Coruña'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CA','Cádiz'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CC','Cáceres'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CE','Ceuta'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CL','Castilla y León'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CL','Castilla y León'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CM','Castilla-La Mancha'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CN','Islas Canarias'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CO','Córdoba'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CO','Córdoba'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CR','Ciudad Real'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CS','Castellón'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CS','Castellón'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CT','Catalonia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CU','Cuenca'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'EX','Extremadura'); @@ -5050,13 +5046,13 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'GU','G INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'H','Huelva'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'HU','Huesca'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'IB','Islas Baleares'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'J','Jaén'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'J','Jaén'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'L','Lleida'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'LE','León'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'LE','León'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'LO','La Rioja'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'LU','Lugo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'M','Madrid'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'MA','Málaga'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'MA','Málaga'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'ML','Melilla'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'MU','Murcia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'NA','Navarre'); @@ -5071,14 +5067,14 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'SA','S INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'SE','Seville'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'SG','Segovia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'SO','Soria'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'SS','Guipúzcoa'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'SS','Guipúzcoa'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'T','Tarragona'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'TE','Teruel'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'TF','Santa Cruz De Tenerife'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'TO','Toledo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'V','Valencia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'VA','Valladolid'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'VI','Álava'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'VI','Ãlava'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'Z','Zaragoza'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'ZA','Zamora'); @@ -5099,32 +5095,32 @@ INSERT INTO lc_countries VALUES (198,'St. Pierre and Miquelon','PM','SPM',''); INSERT INTO lc_countries VALUES (199,'Sudan','SD','SDN',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'ANL','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'BAM','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'BRT','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'JZR','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'KRT','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'QDR','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'WDH','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'ANB','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'ANZ','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'ASH','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'BJA','?????????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'GIS','??? ??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'GBG','??? ??? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'GDA','??? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'GKU','??? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'JDA','???? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'JKU','???? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'JQL','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'KSL','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'NNL','????? ??? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SBG','???? ??? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SDA','???? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SKU','???? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SIS','??? ??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SNR','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'WRB','?????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'ANL','أعالي النيل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'BAM','البحر الأحمر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'BRT','البحيرات'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'JZR','ولاية الجزيرة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'KRT','الخرطوم'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'QDR','القضارÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'WDH','الوحدة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'ANB','النيل الأبيض'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'ANZ','النيل الأزرق'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'ASH','الشمالية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'BJA','الاستوائية الوسطى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'GIS','غرب الاستوائية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'GBG','غرب بحر الغزال'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'GDA','غرب دارÙور'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'GKU','غرب كردÙان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'JDA','جنوب دارÙور'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'JKU','جنوب كردÙان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'JQL','جونقلي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'KSL','كسلا'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'NNL','ولاية نهر النيل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SBG','شمال بحر الغزال'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SDA','شمال دارÙور'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SKU','شمال كردÙان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SIS','شرق الاستوائية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SNR','سنار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'WRB','واراب'); INSERT INTO lc_countries VALUES (200,'Suriname','SR','SUR',''); @@ -5150,31 +5146,31 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (202,'SH','S INSERT INTO lc_countries VALUES (203,'Sweden','SE','SWE',":name\n:street_address\n:postcode :city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'AB','Stockholms län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'C','Uppsala län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'D','Södermanlands län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'E','Östergötlands län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'F','Jönköpings län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'G','Kronobergs län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'H','Kalmar län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'I','Gotlands län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'K','Blekinge län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'M','Skåne län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'N','Hallands län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'O','Västra Götalands län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'S','Värmlands län;'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'T','Örebro län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'U','Västmanlands län;'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'W','Dalarnas län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'X','Gävleborgs län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'Y','Västernorrlands län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'Z','Jämtlands län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'AC','Västerbottens län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'BD','Norrbottens län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'AB','Stockholms län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'C','Uppsala län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'D','Södermanlands län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'E','Östergötlands län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'F','Jönköpings län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'G','Kronobergs län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'H','Kalmar län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'I','Gotlands län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'K','Blekinge län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'M','SkÃ¥ne län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'N','Hallands län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'O','Västra Götalands län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'S','Värmlands län;'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'T','Örebro län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'U','Västmanlands län;'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'W','Dalarnas län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'X','Gävleborgs län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'Y','Västernorrlands län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'Z','Jämtlands län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'AC','Västerbottens län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'BD','Norrbottens län'); INSERT INTO lc_countries VALUES (204,'Switzerland','CH','CHE',":name\n:street_address\n:postcode :city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'ZH','Zürich'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'ZH','Zürich'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'BE','Bern'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'LU','Luzern'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'UR','Uri'); @@ -5191,64 +5187,64 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'SH','S INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'AR','Appenzell Ausserrhoden'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'AI','Appenzell Innerrhoden'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'SG','Saint Gallen'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'GR','Graubünden'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'GR','Graubünden'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'AG','Aargau'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'TG','Thurgau'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'TI','Ticino'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'VD','Vaud'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'VS','Valais'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'NE','Nuechâtel'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'GE','Genève'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'NE','Nuechâtel'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'GE','Genève'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'JU','Jura'); INSERT INTO lc_countries VALUES (205,'Syrian Arab Republic','SY','SYR',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'DI','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'DR','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'DZ','??? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'HA','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'HI','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'HL','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'HM','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'ID','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'LA','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'QU','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'RA','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'RD','??? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'SU','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'TA','?????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'DI','دمشق'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'DR','درعا'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'DZ','دير الزور'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'HA','الحسكة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'HI','حمص'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'HL','حلب'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'HM','حماه'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'ID','ادلب'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'LA','اللاذقية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'QU','القنيطرة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'RA','الرقة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'RD','ری٠دمشق'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'SU','السويداء'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'TA','طرطوس'); INSERT INTO lc_countries VALUES (206,'Taiwan','TW','TWN',":name\n:street_address\n:city :postcode\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'CHA','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'CYI','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'CYQ','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'HSQ','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'HSZ','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'HUA','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'ILA','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'KEE','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'KHH','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'KHQ','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'MIA','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'NAN','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'PEN','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'PIF','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TAO','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TNN','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TNQ','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TPE','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TPQ','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TTT','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TXG','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TXQ','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'YUN','???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'CHA','彰化縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'CYI','嘉義市'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'CYQ','嘉義縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'HSQ','新竹縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'HSZ','新竹市'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'HUA','花蓮縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'ILA','宜蘭縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'KEE','基隆市'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'KHH','高雄市'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'KHQ','高雄縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'MIA','苗栗縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'NAN','å—投縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'PEN','澎湖縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'PIF','å±æ±ç¸£'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TAO','桃æºåŽ¿'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TNN','å°å—市'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TNQ','å°å—縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TPE','臺北市'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TPQ','臺北縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TTT','å°æ±ç¸£'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TXG','å°ä¸­å¸‚'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TXQ','å°ä¸­ç¸£'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'YUN','雲林縣'); INSERT INTO lc_countries VALUES (207,'Tajikistan','TJ','TJK',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (207,'GB','??????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (207,'KT','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (207,'SU','???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (207,'GB','کوهستان بدخشان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (207,'KT','ختلان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (207,'SU','سغد'); INSERT INTO lc_countries VALUES (208,'Tanzania','TZ','TZA',''); @@ -5266,7 +5262,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'11','Z INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'12','Lindi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'13','Mara'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'14','Mbeya'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'15','Zanzibar Západ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'15','Zanzibar Západ'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'16','Morogoro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'17','Mtwara'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'18','Mwanza'); @@ -5281,80 +5277,80 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'26','M INSERT INTO lc_countries VALUES (209,'Thailand','TH','THA',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-10','?????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-11','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-12','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-13','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-14','???????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-15','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-16','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-17','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-18','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-19','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-20','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-21','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-22','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-23','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-24','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-25','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-26','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-27','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-30','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-31','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-32','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-33','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-34','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-35','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-36','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-37','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-39','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-40','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-41','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-42','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-43','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-44','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-45','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-46','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-47','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-48','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-49','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-50','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-51','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-52','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-53','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-55','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-56','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-57','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-58','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-60','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-61','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-62','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-63','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-64','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-66','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-67','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-70','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-71','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-72','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-73','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-74','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-75','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-76','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-77','???????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-80','?????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-81','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-82','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-83','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-84','????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-85','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-86','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-90','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-91','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-92','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-93','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-94','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-95','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-96','????????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-10','à¸à¸£à¸¸à¸‡à¹€à¸—พมหานคร'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-11','สมุทรปราà¸à¸²à¸£'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-12','นนทบุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-13','ปทุมธานี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-14','พระนครศรีอยุธยา'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-15','อ่างทอง'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-16','ลพบุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-17','สิงห์บุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-18','ชัยนาท'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-19','สระบุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-20','ชลบุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-21','ระยอง'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-22','จันทบุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-23','ตราด'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-24','ฉะเชิงเทรา'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-25','ปราจีนบุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-26','นครนายà¸'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-27','สระà¹à¸à¹‰à¸§'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-30','นครราชสีมา'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-31','บุรีรัมย์'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-32','สุรินทร์'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-33','ศรีสะเà¸à¸©'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-34','อุบลราชธานี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-35','ยโสธร'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-36','ชัยภูมิ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-37','อำนาจเจริà¸'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-39','หนองบัวลำภู'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-40','ขอนà¹à¸à¹ˆà¸™'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-41','อุดรธานี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-42','เลย'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-43','หนองคาย'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-44','มหาสารคาม'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-45','ร้อยเอ็ด'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-46','à¸à¸²à¸¬à¸ªà¸´à¸™à¸˜à¸¸à¹Œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-47','สà¸à¸¥à¸™à¸„ร'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-48','นครพนม'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-49','มุà¸à¸”าหาร'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-50','เชียงใหม่'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-51','ลำพูน'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-52','ลำปาง'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-53','อุตรดิตถ์'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-55','น่าน'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-56','พะเยา'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-57','เชียงราย'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-58','à¹à¸¡à¹ˆà¸®à¹ˆà¸­à¸‡à¸ªà¸­à¸™'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-60','นครสวรรค์'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-61','อุทัยธานี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-62','à¸à¸³à¹à¸žà¸‡à¹€à¸žà¸Šà¸£'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-63','ตาà¸'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-64','สุโขทัย'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-66','ชุมพร'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-67','พิจิตร'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-70','ราชบุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-71','à¸à¸²à¸à¸ˆà¸™à¸šà¸¸à¸£à¸µ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-72','สุพรรณบุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-73','นครปà¸à¸¡'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-74','สมุทรสาคร'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-75','สมุทรสงคราม'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-76','เพชรบุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-77','ประจวบคีรีขันธ์'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-80','นครศรีธรรมราช'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-81','à¸à¸£à¸°à¸šà¸µà¹ˆ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-82','พังงา'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-83','ภูเà¸à¹‡à¸•'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-84','สุราษฎร์ธานี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-85','ระนอง'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-86','ชุมพร'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-90','สงขลา'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-91','สตูล'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-92','ตรัง'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-93','พัทลุง'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-94','ปัตตานี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-95','ยะลา'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-96','นราธิวาส'); INSERT INTO lc_countries VALUES (210,'Togo','TG','TGO',''); @@ -5397,84 +5393,84 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (213,'WTO',' INSERT INTO lc_countries VALUES (214,'Tunisia','TN','TUN',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'11','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'12','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'13','????? ?? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'14','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'21','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'22','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'23','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'31','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'32','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'33','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'34','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'41','????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'42','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'43','????? ???? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'51','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'52','????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'53','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'61','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'71','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'72','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'73','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'81','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'82','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'83','????? ??????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'11','ولاية تونس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'12','ولاية أريانة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'13','ولاية بن عروس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'14','ولاية منوبة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'21','ولاية نابل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'22','ولاية زغوان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'23','ولاية بنزرت'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'31','ولاية باجة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'32','ولاية جندوبة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'33','ولاية الكاÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'34','ولاية سليانة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'41','ولاية القيروان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'42','ولاية القصرين'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'43','ولاية سيدي بوزيد'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'51','ولاية سوسة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'52','ولاية المنستير'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'53','ولاية المهدية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'61','ولاية صÙاقس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'71','ولاية Ù‚Ùصة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'72','ولاية توزر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'73','ولاية قبلي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'81','ولاية قابس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'82','ولاية مدنين'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'83','ولاية تطاوين'); INSERT INTO lc_countries VALUES (215,'Turkey','TR','TUR',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'01','Adana'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'02','Adiyaman'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'02','Adıyaman'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'03','Afyonkarahisar'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'04','Agri'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'04','AÄŸrı'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'05','Amasya'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'06','Ankara'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'07','Antalya'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'08','Artvin'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'09','Aydin'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'10','Balikesir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'09','Aydın'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'10','Balıkesir'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'11','Bilecik'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'12','Bingöl'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'12','Bingöl'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'13','Bitlis'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'14','Bolu'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'15','Burdur'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'16','Bursa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'17','Çanakkale'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'18','Çankiri'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'19','Çorum'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'17','Çanakkale'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'18','Çankırı'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'19','Çorum'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'20','Denizli'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'21','Diyarbakir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'21','Diyarbakır'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'22','Edirne'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'23','Elazig'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'23','Elazığ'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'24','Erzincan'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'25','Erzurum'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'26','Eskisehir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'26','EskiÅŸehir'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'27','Gaziantep'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'28','Giresun'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'29','Gümüshane'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'29','Gümüşhane'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'30','Hakkari'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'31','Hatay'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'32','Isparta'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'33','Mersin'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'34','Istanbul'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'35','Izmir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'34','Ä°stanbul'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'35','Ä°zmir'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'36','Kars'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'37','Kastamonu'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'38','Kayseri'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'39','Kirklareli'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'40','Kirsehir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'39','Kırklareli'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'40','KırÅŸehir'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'41','Kocaeli'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'42','Konya'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'43','Kütahya'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'43','Kütahya'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'44','Malatya'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'45','Manisa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'46','Kahramanmaras'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'46','KahramanmaraÅŸ'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'47','Mardin'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'48','Mugla'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'49','Mus'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'50','Nevsehir'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'51','Nigde'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'48','MuÄŸla'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'49','MuÅŸ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'50','NevÅŸehir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'51','NiÄŸde'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'52','Ordu'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'53','Rize'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'54','Sakarya'); @@ -5482,37 +5478,37 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'55','S INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'56','Siirt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'57','Sinop'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'58','Sivas'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'59','Tekirdag'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'59','TekirdaÄŸ'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'60','Tokat'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'61','Trabzon'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'62','Tunceli'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'63','Sanliurfa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'64','Usak'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'63','Åžanlıurfa'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'64','UÅŸak'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'65','Van'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'66','Yozgat'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'67','Zonguldak'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'68','Aksaray'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'69','Bayburt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'70','Karaman'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'71','Kirikkale'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'71','Kırıkkale'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'72','Batman'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'73','Sirnak'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'74','Bartin'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'73','Şırnak'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'74','Bartın'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'75','Ardahan'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'76','Igdir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'76','IÄŸdır'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'77','Yalova'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'78','Karabük'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'78','Karabük'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'79','Kilis'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'80','Osmaniye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'81','Düzce'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'81','Düzce'); INSERT INTO lc_countries VALUES (216,'Turkmenistan','TM','TKM',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'A','Ahal welaýaty'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'B','Balkan welaýaty'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'D','Dasoguz welaýaty'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'L','Lebap welaýaty'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'M','Mary welaýaty'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'A','Ahal welaýaty'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'B','Balkan welaýaty'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'D','DaÅŸoguz welaýaty'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'L','Lebap welaýaty'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'M','Mary welaýaty'); INSERT INTO lc_countries VALUES (217,'Turks and Caicos Islands','TC','TCA',''); @@ -5603,33 +5599,33 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (219,'415',' INSERT INTO lc_countries VALUES (220,'Ukraine','UA','UKR',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'05','????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'07','????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'09','????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'12','???????????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'14','???????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'18','??????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'19','?????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'21','???????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'23','?????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'26','?????-??????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'30','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'32','???????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'35','?????????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'40','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'43','?????????? ?????????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'46','????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'48','???????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'51','??????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'53','?????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'59','??????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'61','????????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'63','?????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'65','?????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'68','??????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'71','????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'74','???????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'77','??????????? ???????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'05','Вінницька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'07','ВолинÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'09','ЛуганÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'12','ДніпропетровÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'14','Донецька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'18','ЖитомирÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'19','РівненÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'21','ЗакарпатÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'23','Запорізька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'26','Івано-ФранківÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'30','Київ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'32','КиївÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'35','КіровоградÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'40','СеваÑтополь'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'43','ÐÐ²Ñ‚Ð¾Ð½Ð¾Ð¼Ð½Ð°Ñ Ð ÐµÑпублика Крым'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'46','ЛьвівÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'48','МиколаївÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'51','ОдеÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'53','ПолтавÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'59','СумÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'61','ТернопільÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'63','ХарківÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'65','ХерÑонÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'68','Хмельницька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'71','ЧеркаÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'74','ЧернігівÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'77','Чернівецька облаÑÑ‚ÑŒ'); INSERT INTO lc_countries VALUES (221,'United Arab Emirates','AE','ARE',''); @@ -5953,13 +5949,13 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'LA','L INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'MA','Maldonado'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'MO','Montevideo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'PA','Paysandu'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'RN','Río Negro'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'RN','Río Negro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'RO','Rocha'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'RV','Rivera'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'SA','Salto'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'SJ','San José'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'SJ','San José'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'SO','Soriano'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'TA','Tacuarembó'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'TA','Tacuarembó'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'TT','Treinta y Tres'); INSERT INTO lc_countries VALUES (226,'Uzbekistan','UZ','UZB',''); @@ -5982,10 +5978,10 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (226,'XO','X INSERT INTO lc_countries VALUES (227,'Vanuatu','VU','VUT',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (227,'MAP','Malampa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (227,'PAM','Pénama'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (227,'PAM','Pénama'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (227,'SAM','Sanma'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (227,'SEE','Shéfa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (227,'TAE','Taféa'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (227,'SEE','Shéfa'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (227,'TAE','Taféa'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (227,'TOB','Torba'); INSERT INTO lc_countries VALUES (228,'Vatican City State (Holy See)','VA','VAT',''); @@ -5993,17 +5989,17 @@ INSERT INTO lc_countries VALUES (228,'Vatican City State (Holy See)','VA','VAT', INSERT INTO lc_countries VALUES (229,'Venezuela','VE','VEN',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'A','Distrito Capital'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'B','Anzoátegui'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'B','Anzoátegui'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'C','Apure'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'D','Aragua'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'E','Barinas'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'F','Bolívar'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'F','Bolívar'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'G','Carabobo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'H','Cojedes'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'I','Falcón'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'J','Guárico'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'I','Falcón'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'J','Guárico'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'K','Lara'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'L','Mérida'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'L','Mérida'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'M','Miranda'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'N','Monagas'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'O','Nueva Esparta'); @@ -6020,70 +6016,70 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'Z','Am INSERT INTO lc_countries VALUES (230,'Vietnam','VN','VNM',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'01','Lai Châu'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'02','Lào Cai'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'03','Hà Giang'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'04','Cao B?ng'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'05','Son La'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'06','Yên Bái'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'07','Tuyên Quang'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'09','L?ng Son'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'13','Qu?ng Ninh'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'14','Hòa Bình'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'15','Hà Tây'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'18','Ninh Bình'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'20','Thái Bình'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'21','Thanh Hóa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'22','Ngh? An'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'23','Hà Tinh'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'24','Qu?ng Bình'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'25','Qu?ng Tr?'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'26','Th?a Thiên-Hu?'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'27','Qu?ng Nam'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'01','Lai Châu'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'02','Lào Cai'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'03','Hà Giang'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'04','Cao Bằng'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'05','SÆ¡n La'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'06','Yên Bái'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'07','Tuyên Quang'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'09','Lạng SÆ¡n'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'13','Quảng Ninh'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'14','Hòa Bình'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'15','Hà Tây'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'18','Ninh Bình'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'20','Thái Bình'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'21','Thanh Hóa'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'22','Nghệ An'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'23','Hà TÄ©nh'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'24','Quảng Bình'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'25','Quảng Trị'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'26','Thừa Thiên-Huế'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'27','Quảng Nam'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'28','Kon Tum'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'29','Qu?ng Ngãi'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'29','Quảng Ngãi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'30','Gia Lai'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'31','Bình Ð?nh'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'32','Phú Yên'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'33','Ð?k L?k'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'34','Khánh Hòa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'35','Lâm Ð?ng'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'36','Ninh Thu?n'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'37','Tây Ninh'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'39','Ð?ng Nai'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'40','Bình Thu?n'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'31','Bình Äịnh'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'32','Phú Yên'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'33','Äắk Lắk'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'34','Khánh Hòa'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'35','Lâm Äồng'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'36','Ninh Thuận'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'37','Tây Ninh'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'39','Äồng Nai'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'40','Bình Thuận'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'41','Long An'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'43','Bà R?a-Vung Tàu'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'43','Bà Rịa-VÅ©ng Tàu'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'44','An Giang'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'45','Ð?ng Tháp'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'46','Ti?n Giang'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'47','Kiên Giang'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'48','C?n Tho'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'49','Vinh Long'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'50','B?n Tre'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'51','Trà Vinh'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'52','Sóc Trang'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'53','B?c K?n'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'54','B?c Giang'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'55','B?c Liêu'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'56','B?c Ninh'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'57','Bình Duong'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'58','Bình Phu?c'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'59','Cà Mau'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'60','Ðà N?ng'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'61','H?i Duong'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'62','H?i Phòng'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'63','Hà Nam'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'64','Hà N?i'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'65','Sài Gòn'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'66','Hung Yên'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'67','Nam Ð?nh'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'68','Phú Th?'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'69','Thái Nguyên'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'70','Vinh Phúc'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'71','Ði?n Biên'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'72','Ð?k Nông'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'73','H?u Giang'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'45','Äồng Tháp'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'46','Tiá»n Giang'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'47','Kiên Giang'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'48','Cần ThÆ¡'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'49','VÄ©nh Long'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'50','Bến Tre'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'51','Trà Vinh'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'52','Sóc Trăng'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'53','Bắc Kạn'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'54','Bắc Giang'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'55','Bạc Liêu'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'56','Bắc Ninh'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'57','Bình DÆ°Æ¡ng'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'58','Bình PhÆ°á»›c'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'59','Cà Mau'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'60','Äà Nẵng'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'61','Hải DÆ°Æ¡ng'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'62','Hải Phòng'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'63','Hà Nam'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'64','Hà Ná»™i'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'65','Sài Gòn'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'66','HÆ°ng Yên'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'67','Nam Äịnh'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'68','Phú Thá»'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'69','Thái Nguyên'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'70','VÄ©nh Phúc'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'71','Äiện Biên'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'72','Äắk Nông'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'73','Hậu Giang'); INSERT INTO lc_countries VALUES (231,'Virgin Islands (British)','VG','VGB',''); INSERT INTO lc_countries VALUES (232,'Virgin Islands (U.S.)','VI','VIR',''); @@ -6101,25 +6097,25 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (233,'W','Wa INSERT INTO lc_countries VALUES (234,'Western Sahara','EH','ESH',''); INSERT INTO lc_countries VALUES (235,'Yemen','YE','YEM',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'AB','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'AD','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'AM','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'BA','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'DA','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'DH','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'HD','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'HJ','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'HU','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'IB','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'JA','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'LA','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'MA','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'MR','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'MW','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'SD','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'SN','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'SH','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'TA','???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'AB','أبين‎'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'AD','عدن'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'AM','عمران'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'BA','البيضاء'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'DA','الضالع'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'DH','ذمار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'HD','حضرموت'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'HJ','حجة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'HU','الحديدة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'IB','إب'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'JA','الجوÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'LA','لحج'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'MA','مأرب'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'MR','المهرة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'MW','المحويت'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'SD','صعدة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'SN','صنعاء'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'SH','شبوة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'TA','تعز'); INSERT INTO lc_countries VALUES (236,'Yugoslavia','YU','YUG',''); INSERT INTO lc_countries VALUES (237,'Zaire','ZR','ZAR',''); @@ -6189,9 +6185,6 @@ INSERT INTO lc_currencies (currencies_id, title, code, symbol_left, symbol_right INSERT INTO lc_currencies (currencies_id, title, code, symbol_left, symbol_right, decimal_places, value, last_updated) VALUES(2, 'Euro', 'EUR', '€', '', '2', 0.726579, '2014-03-03 09:59:23'); INSERT INTO lc_currencies (currencies_id, title, code, symbol_left, symbol_right, decimal_places, value, last_updated) VALUES(3, 'British Pounds', 'GBP', '£', '', '2', 0.598311, '2014-03-03 09:59:23'); -INSERT INTO lc_customers_access (id, level, status) VALUES(1, 'Guest', 1); -INSERT INTO lc_customers_access (id, level, status) VALUES(2, 'Registered', 1); - INSERT INTO lc_customers_groups (customers_group_id, language_id, customers_group_name) VALUES(1, 1, 'Registered'); INSERT INTO lc_customers_groups (customers_group_id, language_id, customers_group_name) VALUES(2, 1, 'Wholesale'); diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql index 85c112e08..eb314bf87 100644 --- a/catalog/install/loadedcommerce_innodb.sql +++ b/catalog/install/loadedcommerce_innodb.sql @@ -1221,130 +1221,130 @@ INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_ INSERT INTO lc_countries VALUES (1,'Afghanistan','AF','AFG',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BDS','?? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BDG','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BGL','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BAL','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BAM','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'DAY','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'FRA','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'FYB','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'GHA','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'GHO','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'HEL','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'HER','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'JOW','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KAB','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KAN','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KAP','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KHO','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KNR','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KDZ','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'LAG','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'LOW','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'NAN','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'NIM','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'NUR','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'ORU','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'PIA','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'PKA','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'PAN','??? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'PAR','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'SAM','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'SAR','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'TAK','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'WAR','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'ZAB','????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BDS','بد خشان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BDG','بادغیس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BGL','بغلان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BAL','بلخ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'BAM','بامیان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'DAY','دایکندی'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'FRA','Ùراه'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'FYB','Ùارياب'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'GHA','غزنى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'GHO','غور'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'HEL','هلمند'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'HER','هرات'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'JOW','جوزجان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KAB','کابل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KAN','قندھار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KAP','کاپيسا'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KHO','خوست'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KNR','Ú©Ùنَر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'KDZ','كندوز'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'LAG','لغمان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'LOW','لوګر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'NAN','ننگرهار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'NIM','نیمروز'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'NUR','نورستان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'ORU','ؤروزگان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'PIA','پکتیا'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'PKA','پکتيکا'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'PAN','پنج شیر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'PAR','پروان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'SAM','سمنگان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'SAR','سر پل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'TAK','تخار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'WAR','وردک'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (1,'ZAB','زابل'); INSERT INTO lc_countries VALUES (2,'Albania','AL','ALB',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'BR','Beratit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'BU','Bulqizës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'DI','Dibrës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'DL','Delvinës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'DR','Durrësit'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'BU','Bulqizës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'DI','Dibrës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'DL','Delvinës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'DR','Durrësit'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'DV','Devollit'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'EL','Elbasanit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'ER','Kolonjës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'ER','Kolonjës'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'FR','Fierit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'GJ','Gjirokastrës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'GJ','Gjirokastrës'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'GR','Gramshit'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'HA','Hasit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KA','Kavajës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KA','Kavajës'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KB','Kurbinit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KC','Kuçovës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KO','Korçës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KR','Krujës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KU','Kukësit'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KC','Kuçovës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KO','Korçës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KR','Krujës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'KU','Kukësit'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'LB','Librazhdit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'LE','Lezhës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'LU','Lushnjës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'MK','Mallakastrës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'MM','Malësisë së Madhe'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'MR','Mirditës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'LE','Lezhës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'LU','Lushnjës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'MK','Mallakastrës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'MM','Malësisë së Madhe'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'MR','Mirditës'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'MT','Matit'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'PG','Pogradecit'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'PQ','Peqinit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'PR','Përmetit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'PU','Pukës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'SH','Shkodrës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'PR','Përmetit'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'PU','Pukës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'SH','Shkodrës'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'SK','Skraparit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'SR','Sarandës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'TE','Tepelenës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'TP','Tropojës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'TR','Tiranës'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'VL','Vlorës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'SR','Sarandës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'TE','Tepelenës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'TP','Tropojës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'TR','Tiranës'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (2,'VL','Vlorës'); INSERT INTO lc_countries VALUES (3,'Algeria','DZ','DZA',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'01','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'02','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'03','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'04','????? ?? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'05','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'06','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'07','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'08','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'09','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'10','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'11','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'12','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'13','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'14','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'15','???? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'16','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'17','????? ??? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'18','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'19','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'20','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'21','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'22','????? ???? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'23','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'24','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'25','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'26','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'27','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'28','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'29','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'30','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'31','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'32','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'33','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'34','????? ??? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'35','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'36','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'37','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'38','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'39','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'40','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'41','????? ??? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'42','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'43','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'44','????? ??? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'45','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'46','????? ??? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'47','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'48','????? ??????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'01','ولاية أدرار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'02','ولاية الشلÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'03','ولاية الأغواط'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'04','ولاية أم البواقي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'05','ولاية باتنة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'06','ولاية بجاية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'07','ولاية بسكرة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'08','ولاية بشار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'09','البليدة‎'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'10','ولاية البويرة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'11','ولاية تمنراست'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'12','ولاية تبسة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'13','تلمسان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'14','ولاية تيارت'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'15','تيزي وزو'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'16','ولاية الجزائر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'17','ولاية عين الدÙلى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'18','ولاية جيجل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'19','ولاية سطيÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'20','ولاية سعيدة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'21','السكيكدة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'22','ولاية سيدي بلعباس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'23','ولاية عنابة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'24','ولاية قالمة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'25','قسنطينة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'26','ولاية المدية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'27','ولاية مستغانم'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'28','ولاية المسيلة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'29','ولاية معسكر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'30','ورقلة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'31','وهران'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'32','ولاية البيض'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'33','ولاية اليزي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'34','ولاية برج بوعريريج'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'35','ولاية بومرداس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'36','ولاية الطارÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'37','تندوÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'38','ولاية تسمسيلت'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'39','ولاية الوادي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'40','ولاية خنشلة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'41','ولاية سوق أهراس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'42','ولاية تيبازة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'43','ولاية ميلة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'44','ولاية عين الدÙلى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'45','ولاية النعامة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'46','ولاية عين تموشنت'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'47','ولاية غرداية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (3,'48','ولاية غليزان'); INSERT INTO lc_countries VALUES (4,'American Samoa','AS','ASM',''); @@ -1362,27 +1362,27 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (5,'EN','Enc INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (5,'LE','Escaldes-Engordany'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (5,'LM','La Massana'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (5,'OR','Ordino'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (5,'SJ','Sant Juliá de Lória'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (5,'SJ','Sant Juliá de Lória'); INSERT INTO lc_countries VALUES (6,'Angola','AO','AGO',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'BGO','Bengo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'BGU','Benguela'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'BIE','Bié'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'BIE','Bié'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'CAB','Cabinda'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'CCU','Cuando Cubango'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'CNO','Cuanza Norte'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'CUS','Cuanza Sul'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'CNN','Cunene'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'HUA','Huambo'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'HUI','Huíla'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'HUI','Huíla'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'LUA','Luanda'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'LNO','Lunda Norte'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'LSU','Lunda Sul'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'MAL','Malanje'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'MOX','Moxico'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'NAM','Namibe'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'UIG','Uíge'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'UIG','Uíge'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (6,'ZAI','Zaire'); INSERT INTO lc_countries VALUES (7,'Anguilla','AI','AIA',''); @@ -1404,7 +1404,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'A','Sal INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'B','Buenos Aires Province'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'C','Capital Federal'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'D','San Luis'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'E','Entre Ríos'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'E','Entre Ríos'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'F','La Rioja'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'G','Santiago del Estero'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'H','Chaco'); @@ -1414,30 +1414,30 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'L','La INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'M','Mendoza'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'N','Misiones'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'P','Formosa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'Q','Neuquén'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'R','Río Negro'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'Q','Neuquén'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'R','Río Negro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'S','Santa Fe'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'T','Tucumán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'T','Tucumán'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'U','Chubut'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'V','Tierra del Fuego'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'W','Corrientes'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'X','Córdoba'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'X','Córdoba'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'Y','Jujuy'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (10,'Z','Santa Cruz'); INSERT INTO lc_countries VALUES (11,'Armenia','AM','ARM',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'AG','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'AR','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'AV','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'ER','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'GR','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'KT','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'LO','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'SH','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'SU','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'TV','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'VD','????? ???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'AG','Ô±Ö€Õ¡Õ£Õ¡Õ®Õ¸Õ¿Õ¶'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'AR','Ô±Ö€Õ¡Ö€Õ¡Õ¿'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'AV','Ô±Ö€Õ´Õ¡Õ¾Õ«Ö€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'ER','ÔµÖ€Ö‡Õ¡Õ¶'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'GR','Ô³Õ¥Õ²Õ¡Ö€Ö„Õ¸Ö‚Õ¶Õ«Ö„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'KT','Ô¿Õ¸Õ¿Õ¡ÕµÖ„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'LO','Ô¼Õ¸Õ¼Õ«'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'SH','Õ‡Õ«Ö€Õ¡Õ¯'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'SU','ÕÕµÕ¸Ö‚Õ¶Õ«Ö„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'TV','ÕÕ¡Õ¾Õ¸Ö‚Õ·'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (11,'VD','ÕŽÕ¡ÕµÕ¸Ö ÕÕ¸Ö€'); INSERT INTO lc_countries VALUES (12,'Aruba','AW','ABW',''); @@ -1455,9 +1455,9 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (13,'WA','We INSERT INTO lc_countries VALUES (14,'Austria','AT','AUT',":name\n:street_address\nA-:postcode :city\n:country"); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'1','Burgenland'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'2','Kärnten'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'3','Niederösterreich'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'4','Oberösterreich'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'2','Kärnten'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'3','Niederösterreich'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'4','Oberösterreich'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'5','Salzburg'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'6','Steiermark'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'7','Tirol'); @@ -1466,82 +1466,82 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (14,'9','Wie INSERT INTO lc_countries VALUES (15,'Azerbaijan','AZ','AZE',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AB','?li Bayramli'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ABS','Abseron'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGC','Agcab?di'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGM','Agdam'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGS','Agdas'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGA','Agstafa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGU','Agsu'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AB','Æli Bayramlı'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ABS','AbÅŸeron'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGC','AÄŸcabÉ™di'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGM','AÄŸdam'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGS','AÄŸdaÅŸ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGA','AÄŸstafa'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AGU','AÄŸsu'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'AST','Astara'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BA','Baki'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BAB','Bab?k'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BAL','Balak?n'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BAR','B?rd?'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BEY','Beyl?qan'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BIL','Bil?suvar'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'CAB','C?brayil'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'CAL','C?lilabab'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BA','Bakı'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BAB','BabÉ™k'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BAL','BalakÉ™n'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BAR','BÉ™rdÉ™'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BEY','BeylÉ™qan'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'BIL','BilÉ™suvar'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'CAB','CÉ™brayıl'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'CAL','CÉ™lilabab'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'CUL','Julfa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'DAS','Dask?s?n'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'DAV','D?v?çi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'FUZ','Füzuli'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'GA','G?nc?'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'GAD','G?d?b?y'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'DAS','DaÅŸkÉ™sÉ™n'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'DAV','DÉ™vəçi'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'FUZ','Füzuli'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'GA','GÉ™ncÉ™'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'GAD','GÉ™dÉ™bÉ™y'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'GOR','Goranboy'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'GOY','Göyçay'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'HAC','Haciqabul'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'IMI','Imisli'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ISM','Ismayilli'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'KAL','K?lb?c?r'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'KUR','Kürd?mir'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'LA','L?nk?ran'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'LAC','Laçin'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'LAN','L?nk?ran'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'GOY','Göyçay'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'HAC','Hacıqabul'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'IMI','Ä°miÅŸli'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ISM','Ä°smayıllı'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'KAL','KÉ™lbÉ™cÉ™r'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'KUR','KürdÉ™mir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'LA','LÉ™nkÉ™ran'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'LAC','Laçın'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'LAN','LÉ™nkÉ™ran'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'LER','Lerik'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'MAS','Masalli'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'MI','Ming?çevir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'MAS','Masallı'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'MI','Mingəçevir'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'NA','Naftalan'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'NEF','Neftçala'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'OGU','Oguz'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'NEF','Neftçala'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'OGU','OÄŸuz'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ORD','Ordubad'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'QAB','Q?b?l?'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'QAB','QÉ™bÉ™lÉ™'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'QAX','Qax'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'QAZ','Qazax'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'QOB','Qobustan'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'QBA','Quba'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'QBI','Qubadli'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'QBI','Qubadlı'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'QUS','Qusar'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SA','S?ki'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAT','Saatli'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SA','Şəki'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAT','Saatlı'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAB','Sabirabad'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAD','S?d?r?k'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAH','Sahbuz'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAK','S?ki'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAD','SÉ™dÉ™rÉ™k'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAH','Åžahbuz'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAK','Şəki'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAL','Salyan'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SM','Sumqayit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SMI','Samaxi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SKR','S?mkir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SM','Sumqayıt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SMI','Åžamaxı'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SKR','Şəmkir'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SMX','Samux'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAR','S?rur'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SIY','Siy?z?n'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SS','Susa (City)'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SUS','Susa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'TAR','T?rt?r'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SAR','Şərur'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SIY','SiyÉ™zÉ™n'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SS','ÅžuÅŸa (City)'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'SUS','ÅžuÅŸa'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'TAR','TÉ™rtÉ™r'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'TOV','Tovuz'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'UCA','Ucar'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XA','Xank?ndi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XAC','Xaçmaz'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XA','XankÉ™ndi'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XAC','Xaçmaz'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XAN','Xanlar'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XIZ','Xizi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XCI','Xocali'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XVD','Xocav?nd'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'YAR','Yardimli'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XIZ','Xızı'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XCI','Xocalı'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'XVD','XocavÉ™nd'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'YAR','Yardımlı'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'YE','Yevlax (City)'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'YEV','Yevlax'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ZAN','Z?ngilan'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ZAN','ZÉ™ngilan'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ZAQ','Zaqatala'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ZAR','Z?rdab'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'ZAR','ZÉ™rdab'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (15,'NX','Nakhichevan'); INSERT INTO lc_countries VALUES (16,'Bahamas','BS','BHS',''); @@ -1570,18 +1570,18 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (16,'SP','Sa INSERT INTO lc_countries VALUES (17,'Bahrain','BH','BHR',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'01','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'02','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'03','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'04','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'05','??????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'06','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'07','??????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'08','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'09','?????? ???????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'10','??????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'11','??? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'12','????? ???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'01','الحد'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'02','المحرق'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'03','المنامة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'04','جد Ø­Ùص'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'05','المنطقة الشمالية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'06','سترة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'07','المنطقة الوسطى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'08','مدينة عيسى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'09','الرÙاع والمنطقة الجنوبية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'10','المنطقة الغربية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'11','جزر حوار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (17,'12','مدينة حمد'); INSERT INTO lc_countries VALUES (18,'Bangladesh','BD','BGD',''); @@ -1666,12 +1666,12 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (19,'T','Sai INSERT INTO lc_countries VALUES (20,'Belarus','BY','BLR',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'BR','???´????? ??´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'HO','??´???????? ??´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'HR','???´???????? ??´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'MA','??????????? ??´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'MI','??´????? ??´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'VI','??´??????? ??´??????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'BR','БрÑÌÑÑ†ÐºÐ°Ñ Ð²Ð¾ÌблаÑць'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'HO','ГоÌмельÑÐºÐ°Ñ Ð²Ð¾ÌблаÑць'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'HR','ГроÌдзенÑÐºÐ°Ñ Ð²Ð¾ÌблаÑць'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'MA','МагілёўÑÐºÐ°Ñ Ð²Ð¾ÌблаÑць'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'MI','МіÌнÑÐºÐ°Ñ Ð²Ð¾ÌблаÑць'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (20,'VI','Ð’Ñ–ÌцебÑÐºÐ°Ñ Ð²Ð¾ÌблаÑць'); INSERT INTO lc_countries VALUES (21,'Belgium','BE','BEL',":name\n:street_address\nB-:postcode :city\n:country"); @@ -1683,7 +1683,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (21,'VOV','O INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (21,'VWV','West-Vlaanderen'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (21,'WBR','Brabant Wallon'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (21,'WHT','Hainaut'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (21,'WLG','Liège/Lüttich'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (21,'WLG','Liège/Lüttich'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (21,'WLX','Luxembourg'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (21,'WNA','Namur'); @@ -1707,7 +1707,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (23,'DO','Do INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (23,'KO','Kouffo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (23,'LI','Littoral'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (23,'MO','Mono'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (23,'OU','Ouémé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (23,'OU','Ouémé'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (23,'PL','Plateau'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (23,'ZO','Zou'); @@ -1756,7 +1756,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (26,'H','Chu INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (26,'L','La Paz'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (26,'N','Pando'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (26,'O','Oruro'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (26,'P','Potosí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (26,'P','Potosí'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (26,'S','Santa Cruz'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (26,'T','Tarija'); @@ -1779,30 +1779,30 @@ INSERT INTO lc_countries VALUES (30,'Brazil','BR','BRA',":name\n:street_address\ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'AC','Acre'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'AL','Alagoas'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'AM','Amazônia'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'AP','Amapá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'AM','Amazônia'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'AP','Amapá'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'BA','Bahia'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'CE','Ceará'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'CE','Ceará'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'DF','Distrito Federal'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'ES','Espírito Santo'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'GO','Goiás'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'MA','Maranhão'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'ES','Espírito Santo'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'GO','Goiás'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'MA','Maranhão'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'MG','Minas Gerais'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'MS','Mato Grosso do Sul'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'MT','Mato Grosso'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'PA','Pará'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'PB','Paraíba'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'PA','Pará'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'PB','Paraíba'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'PE','Pernambuco'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'PI','Piauí'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'PR','Paraná'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'PI','Piauí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'PR','Paraná'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'RJ','Rio de Janeiro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'RN','Rio Grande do Norte'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'RO','Rondônia'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'RO','Rondônia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'RR','Roraima'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'RS','Rio Grande do Sul'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'SC','Santa Catarina'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'SE','Sergipe'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'SP','São Paulo'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'SP','São Paulo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (30,'TO','Tocantins'); INSERT INTO lc_countries VALUES (31,'British Indian Ocean Territory','IO','IOT',''); @@ -1856,28 +1856,28 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (33,'28','Ya INSERT INTO lc_countries VALUES (34,'Burkina Faso','BF','BFA',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BAL','Balé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BAL','Balé'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BAM','Bam'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BAN','Banwa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BAZ','Bazèga'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BAZ','Bazèga'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BGR','Bougouriba'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BLG','Boulgou'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BLK','Boulkiemdé'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'COM','Komoé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'BLK','Boulkiemdé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'COM','Komoé'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'GAN','Ganzourgou'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'GNA','Gnagna'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'GOU','Gourma'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'HOU','Houet'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'IOB','Ioba'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KAD','Kadiogo'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KEN','Kénédougou'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KEN','Kénédougou'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KMD','Komondjari'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KMP','Kompienga'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KOP','Koulpélogo'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KOP','Koulpélogo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KOS','Kossi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KOT','Kouritenga'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KOW','Kourwéogo'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'LER','Léraba'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'KOW','Kourwéogo'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'LER','Léraba'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'LOR','Loroum'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'MOU','Mouhoun'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'NAM','Namentenga'); @@ -1886,12 +1886,12 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'NAY','N INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'NOU','Noumbiel'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'OUB','Oubritenga'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'OUD','Oudalan'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'PAS','Passoré'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'PAS','Passoré'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'PON','Poni'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'SEN','Séno'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'SEN','Séno'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'SIS','Sissili'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'SMT','Sanmatenga'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'SNG','Sanguié'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'SNG','Sanguié'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'SOM','Soum'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'SOR','Sourou'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'TAP','Tapoa'); @@ -1900,7 +1900,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'YAG','Y INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'YAT','Yatenga'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'ZIR','Ziro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'ZON','Zondoma'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'ZOU','Zoundwéogo'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (34,'ZOU','Zoundwéogo'); INSERT INTO lc_countries VALUES (35,'Burundi','BI','BDI',''); @@ -1927,7 +1927,7 @@ INSERT INTO lc_countries VALUES (37,'Cameroon','CM','CMR',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (37,'AD','Adamaoua'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (37,'CE','Centre'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (37,'EN','Extrême-Nord'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (37,'EN','Extrême-Nord'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (37,'ES','Est'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (37,'LT','Littoral'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (37,'NO','Nord'); @@ -1958,18 +1958,18 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'BR','Br INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'BV','Boa Vista'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'CA','Santa Catarina'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'CR','Santa Cruz'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'CS','Calheta de São Miguel'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'CS','Calheta de São Miguel'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'MA','Maio'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'MO','Mosteiros'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'PA','Paúl'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'PA','Paúl'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'PN','Porto Novo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'PR','Praia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'RG','Ribeira Grande'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'SD','São Domingos'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'SF','São Filipe'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'SD','São Domingos'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'SF','São Filipe'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'SL','Sal'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'SN','São Nicolau'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'SV','São Vicente'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'SN','São Nicolau'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'SV','São Vicente'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (39,'TA','Tarrafal'); INSERT INTO lc_countries VALUES (40,'Cayman Islands','KY','CYM',''); @@ -1991,15 +1991,15 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'BGF','B INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'BK ','Basse-Kotto'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'HK ','Haute-Kotto'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'HM ','Haut-Mbomou'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'HS ','Mambéré-Kadéï'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'KB ','Nana-Grébizi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'KG ','Kémo'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'HS ','Mambéré-Kadéï'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'KB ','Nana-Grébizi'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'KG ','Kémo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'LB ','Lobaye'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'MB ','Mbomou'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'MP ','Ombella-M\'Poko'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'NM ','Nana-Mambéré'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'OP ','Ouham-Pendé'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'SE ','Sangha-Mbaéré'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'NM ','Nana-Mambéré'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'OP ','Ouham-Pendé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'SE ','Sangha-Mbaéré'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'UK ','Ouaka'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (41,'VR ','Vakaga'); @@ -2009,69 +2009,69 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'BA ','B INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'BET','Borkou-Ennedi-Tibesti'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'BI ','Biltine'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'CB ','Chari-Baguirmi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'GR ','Guéra'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'GR ','Guéra'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'KA ','Kanem'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'LC ','Lac'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'LR ','Logone-Oriental'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'LO ','Logone-Occidental'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'MC ','Moyen-Chari'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'MK ','Mayo-Kébbi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'OD ','Ouaddaï'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'MK ','Mayo-Kébbi'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'OD ','Ouaddaï'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'SA ','Salamat'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'TA ','Tandjilé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (42,'TA ','Tandjilé'); INSERT INTO lc_countries VALUES (43,'Chile','CL','CHL',":name\n:street_address\n:city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'AI','Aisén del General Carlos Ibañez'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'AI','Aisén del General Carlos Ibañez'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'AN','Antofagasta'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'AR','La Araucanía'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'AR','La Araucanía'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'AT','Atacama'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'BI','Biobío'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'BI','Biobío'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'CO','Coquimbo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'LI','Libertador Bernardo O\'Higgins'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'LL','Los Lagos'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'MA','Magallanes y de la Antartica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'ML','Maule'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'RM','Metropolitana de Santiago'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'TA','Tarapacá'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'VS','Valparaíso'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'TA','Tarapacá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (43,'VS','Valparaíso'); INSERT INTO lc_countries VALUES (44,'China','CN','CHN',":name\n:street_address\n:postcode :city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'11','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'12','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'13','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'14','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'15','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'21','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'22','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'23','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'31','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'32','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'33','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'34','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'35','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'36','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'37','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'41','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'42','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'43','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'44','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'45','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'46','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'50','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'51','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'52','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'53','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'54','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'61','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'62','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'63','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'64','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'65','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'71','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'91','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'92','??'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'11','北京'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'12','天津'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'13','河北'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'14','山西'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'15','内蒙å¤è‡ªæ²»åŒº'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'21','è¾½å®'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'22','å‰æž—'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'23','黑龙江çœ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'31','上海'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'32','江è‹'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'33','浙江'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'34','安徽'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'35','ç¦å»º'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'36','江西'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'37','山东'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'41','æ²³å—'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'42','湖北'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'43','æ¹–å—'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'44','广东'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'45','广西壮æ—自治区'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'46','æµ·å—'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'50','é‡åº†'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'51','å››å·'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'52','贵州'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'53','云å—'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'54','西è—自治区'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'61','陕西'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'62','甘肃'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'63','é’æµ·'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'64','å®å¤'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'65','æ–°ç–†'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'71','臺ç£'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'91','香港'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (44,'92','澳門'); INSERT INTO lc_countries VALUES (45,'Christmas Island','CX','CXR',''); @@ -2088,48 +2088,48 @@ INSERT INTO lc_countries VALUES (47,'Colombia','CO','COL',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'AMA','Amazonas'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'ANT','Antioquia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'ARA','Arauca'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'ATL','Atlántico'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'BOL','Bolívar'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'BOY','Boyacá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'ATL','Atlántico'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'BOL','Bolívar'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'BOY','Boyacá'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'CAL','Caldas'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'CAQ','Caquetá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'CAQ','Caquetá'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'CAS','Casanare'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'CAU','Cauca'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'CES','Cesar'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'CHO','Chocó'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'COR','Córdoba'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'CHO','Chocó'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'COR','Córdoba'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'CUN','Cundinamarca'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'DC','Bogotá Distrito Capital'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'GUA','Guainía'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'DC','Bogotá Distrito Capital'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'GUA','Guainía'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'GUV','Guaviare'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'HUI','Huila'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'LAG','La Guajira'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'MAG','Magdalena'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'MET','Meta'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'NAR','Nariño'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'NAR','Nariño'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'NSA','Norte de Santander'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'PUT','Putumayo'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'QUI','Quindío'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'QUI','Quindío'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'RIS','Risaralda'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'SAN','Santander'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'SAP','San Andrés y Providencia'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'SAP','San Andrés y Providencia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'SUC','Sucre'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'TOL','Tolima'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'VAC','Valle del Cauca'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'VAU','Vaupés'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'VAU','Vaupés'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (47,'VID','Vichada'); INSERT INTO lc_countries VALUES (48,'Comoros','KM','COM',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (48,'A','Anjouan'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (48,'G','Grande Comore'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (48,'M','Mohéli'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (48,'M','Mohéli'); INSERT INTO lc_countries VALUES (49,'Congo','CG','COG',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (49,'BC','Congo-Central'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (49,'BN','Bandundu'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (49,'EQ','Équateur'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (49,'EQ','Équateur'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (49,'KA','Katanga'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (49,'KE','Kasai-Oriental'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (49,'KN','Kinshasa'); @@ -2163,117 +2163,117 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (51,'A','Ala INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (51,'C','Cartago'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (51,'G','Guanacaste'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (51,'H','Heredia'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (51,'L','Limón'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (51,'L','Limón'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (51,'P','Puntarenas'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (51,'SJ','San José'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (51,'SJ','San José'); INSERT INTO lc_countries VALUES (52,'Cote D\'Ivoire','CI','CIV',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'01','Lagunes'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'02','Haut-Sassandra'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'03','Savanes'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'04','Vallée du Bandama'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'05','Moyen-Comoé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'04','Vallée du Bandama'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'05','Moyen-Comoé'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'06','Dix-Huit'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'07','Lacs'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'08','Zanzan'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'09','Bas-Sassandra'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'10','Denguélé'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'11','N\'zi-Comoé'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'12','Marahoué'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'13','Sud-Comoé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'10','Denguélé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'11','N\'zi-Comoé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'12','Marahoué'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'13','Sud-Comoé'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'14','Worodouqou'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'15','Sud-Bandama'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'16','Agnébi'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'16','Agnébi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'17','Bafing'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'18','Fromager'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (52,'19','Moyen-Cavally'); INSERT INTO lc_countries VALUES (53,'Croatia','HR','HRV',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'01','Zagrebacka županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'02','Krapinsko-zagorska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'03','Sisacko-moslavacka županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'04','Karlovacka županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'05','Varaždinska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'06','Koprivnicko-križevacka županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'07','Bjelovarsko-bilogorska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'08','Primorsko-goranska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'09','Licko-senjska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'10','Viroviticko-podravska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'11','Požeško-slavonska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'12','Brodsko-posavska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'13','Zadarska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'14','Osjecko-baranjska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'15','Šibensko-kninska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'16','Vukovarsko-srijemska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'17','Splitsko-dalmatinska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'18','Istarska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'19','Dubrovacko-neretvanska županija'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'20','Medimurska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'01','ZagrebaÄka županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'02','Krapinsko-zagorska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'03','SisaÄko-moslavaÄka županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'04','KarlovaÄka županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'05','Varaždinska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'06','KoprivniÄko-križevaÄka županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'07','Bjelovarsko-bilogorska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'08','Primorsko-goranska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'09','LiÄko-senjska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'10','VirovitiÄko-podravska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'11','PožeÅ¡ko-slavonska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'12','Brodsko-posavska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'13','Zadarska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'14','OsjeÄko-baranjska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'15','Å ibensko-kninska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'16','Vukovarsko-srijemska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'17','Splitsko-dalmatinska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'18','Istarska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'19','DubrovaÄko-neretvanska županija'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'20','MeÄ‘imurska županija'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (53,'21','Zagreb'); INSERT INTO lc_countries VALUES (54,'Cuba','CU','CUB',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'01','Pinar del Río'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'01','Pinar del Río'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'02','La Habana'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'03','Ciudad de La Habana'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'04','Matanzas'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'05','Villa Clara'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'06','Cienfuegos'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'07','Sancti Spíritus'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'08','Ciego de Ávila'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'09','Camagüey'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'07','Sancti Spíritus'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'08','Ciego de Ãvila'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'09','Camagüey'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'10','Las Tunas'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'11','Holguín'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'11','Holguín'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'12','Granma'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'13','Santiago de Cuba'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'14','Guantánamo'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'14','Guantánamo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (54,'99','Isla de la Juventud'); INSERT INTO lc_countries VALUES (55,'Cyprus','CY','CYP',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'01','?e??ve?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'02','?e???s?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'03','?µµ???st??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'04','????a?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'05','?eµes??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'06','??f??'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'01','ΚεÏÏvεια'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'02','Λευκωσία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'03','Αμμόχωστος'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'04','ΛάÏνακα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'05','Λεμεσός'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (55,'06','Πάφος'); INSERT INTO lc_countries VALUES (56,'Czech Republic','CZ','CZE',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'JC','Jihoceský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'JM','Jihomoravský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'KA','Karlovarský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'VY','Vysocina kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'KR','Královéhradecký kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'LI','Liberecký kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'MO','Moravskoslezský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'OL','Olomoucký kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'PA','Pardubický kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'PL','Plzenský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'PR','Hlavní mesto Praha'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'ST','Stredoceský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'US','Ústecký kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'ZL','Zlínský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'JC','JihoÄeský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'JM','Jihomoravský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'KA','Karlovarský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'VY','VysoÄina kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'KR','Královéhradecký kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'LI','Liberecký kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'MO','Moravskoslezský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'OL','Olomoucký kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'PA','Pardubický kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'PL','Plzeňský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'PR','Hlavní mÄ›sto Praha'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'ST','StÅ™edoÄeský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'US','Ústecký kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (56,'ZL','Zlínský kraj'); INSERT INTO lc_countries VALUES (57,'Denmark','DK','DNK',":name\n:street_address\nDK-:postcode :city\n:country"); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'040','Bornholms Regionskommune'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'101','København'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'101','København'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'147','Frederiksberg'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'070','Århus Amt'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'015','Københavns Amt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'070','Ã…rhus Amt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'015','Københavns Amt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'020','Frederiksborg Amt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'042','Fyns Amt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'080','Nordjyllands Amt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'055','Ribe Amt'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'065','Ringkjøbing Amt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'065','Ringkjøbing Amt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'025','Roskilde Amt'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'050','Sønderjyllands Amt'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'035','Storstrøms Amt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'050','Sønderjyllands Amt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'035','Storstrøms Amt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'060','Vejle Amt'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'030','Vestsjællands Amt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'030','Vestsjællands Amt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (57,'076','Viborg Amt'); INSERT INTO lc_countries VALUES (58,'Djibouti','DJ','DJI',''); @@ -2301,33 +2301,33 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (59,'PET','S INSERT INTO lc_countries VALUES (60,'Dominican Republic','DO','DOM',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'01','Distrito Nacional'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'02','Ázua'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'02','Ãzua'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'03','Baoruco'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'04','Barahona'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'05','Dajabón'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'05','Dajabón'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'06','Duarte'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'07','Elías Piña'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'07','Elías Piña'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'08','El Seibo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'09','Espaillat'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'10','Independencia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'11','La Altagracia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'12','La Romana'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'13','La Vega'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'14','María Trinidad Sánchez'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'14','María Trinidad Sánchez'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'15','Monte Cristi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'16','Pedernales'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'17','Peravia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'18','Puerto Plata'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'19','Salcedo'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'20','Samaná'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'21','San Cristóbal'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'20','Samaná'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'21','San Cristóbal'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'22','San Juan'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'23','San Pedro de Macorís'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'24','Sánchez Ramírez'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'23','San Pedro de Macorís'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'24','Sánchez Ramírez'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'25','Santiago'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'26','Santiago Rodríguez'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'26','Santiago Rodríguez'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'27','Valverde'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'28','Monseñor Nouel'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'28','Monseñor Nouel'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'29','Monte Plata'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (60,'30','Hato Mayor'); @@ -2341,7 +2341,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'CO','Co INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'DI','Dili'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'ER','Ermera'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'LA','Lautem'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'LI','Liquiçá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'LI','Liquiçá'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'MF','Manufahi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'MT','Manatuto'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'OE','Oecussi'); @@ -2350,81 +2350,81 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (61,'VI','Vi INSERT INTO lc_countries VALUES (62,'Ecuador','EC','ECU',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'A','Azuay'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'B','Bolívar'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'B','Bolívar'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'C','Carchi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'D','Orellana'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'E','Esmeraldas'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'F','Cañar'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'F','Cañar'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'G','Guayas'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'H','Chimborazo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'I','Imbabura'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'L','Loja'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'M','Manabí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'M','Manabí'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'N','Napo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'O','El Oro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'P','Pichincha'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'R','Los Ríos'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'R','Los Ríos'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'S','Morona-Santiago'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'T','Tungurahua'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'U','Sucumbíos'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'W','Galápagos'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'U','Sucumbíos'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'W','Galápagos'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'X','Cotopaxi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'Y','Pastaza'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (62,'Z','Zamora-Chinchipe'); INSERT INTO lc_countries VALUES (63,'Egypt','EG','EGY',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'ALX','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'ASN','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'AST','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'BA','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'BH','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'BNS','??? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'C','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'DK','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'DT','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'FYM','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'GH','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'GZ','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'IS','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'JS','???? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'KB','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'KFS','??? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'KN','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'MN','?????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'MNF','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'MT','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'PTS','?????? ??? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'SHG','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'SHR','???????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'SIN','???? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'SUZ','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'WAD','?????? ??????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'ALX','الإسكندرية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'ASN','أسوان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'AST','أسيوط'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'BA','البحر الأحمر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'BH','البحيرة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'BNS','بني سويÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'C','القاهرة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'DK','الدقهلية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'DT','دمياط'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'FYM','الÙيوم'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'GH','الغربية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'GZ','الجيزة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'IS','الإسماعيلية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'JS','جنوب سيناء'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'KB','القليوبية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'KFS','ÙƒÙر الشيخ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'KN','قنا'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'MN','محاÙظة المنيا'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'MNF','المنوÙية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'MT','مطروح'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'PTS','محاÙظة بور سعيد'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'SHG','محاÙظة سوهاج'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'SHR','المحاÙظة الشرقيّة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'SIN','شمال سيناء'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'SUZ','السويس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (63,'WAD','الوادى الجديد'); INSERT INTO lc_countries VALUES (64,'El Salvador','SV','SLV',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'AH','Ahuachapán'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'CA','Cabañas'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'AH','Ahuachapán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'CA','Cabañas'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'CH','Chalatenango'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'CU','Cuscatlán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'CU','Cuscatlán'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'LI','La Libertad'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'MO','Morazán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'MO','Morazán'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'PA','La Paz'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'SA','Santa Ana'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'SM','San Miguel'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'SO','Sonsonate'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'SS','San Salvador'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'SV','San Vicente'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'UN','La Unión'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'US','Usulután'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'UN','La Unión'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (64,'US','Usulután'); INSERT INTO lc_countries VALUES (65,'Equatorial Guinea','GQ','GNQ',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (65,'AN','Annobón'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (65,'AN','Annobón'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (65,'BN','Bioko Norte'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (65,'BS','Bioko Sur'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (65,'CS','Centro Sur'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (65,'KN','Kié-Ntem'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (65,'KN','Kié-Ntem'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (65,'LI','Litoral'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (65,'WN','Wele-Nzas'); @@ -2442,32 +2442,32 @@ INSERT INTO lc_countries VALUES (67,'Estonia','EE','EST',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'37','Harju maakond'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'39','Hiiu maakond'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'44','Ida-Viru maakond'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'49','Jõgeva maakond'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'51','Järva maakond'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'57','Lääne maakond'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'59','Lääne-Viru maakond'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'65','Põlva maakond'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'67','Pärnu maakond'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'49','Jõgeva maakond'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'51','Järva maakond'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'57','Lääne maakond'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'59','Lääne-Viru maakond'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'65','Põlva maakond'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'67','Pärnu maakond'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'70','Rapla maakond'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'74','Saare maakond'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'78','Tartu maakond'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'82','Valga maakond'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'84','Viljandi maakond'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'86','Võru maakond'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (67,'86','Võru maakond'); INSERT INTO lc_countries VALUES (68,'Ethiopia','ET','ETH',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'AA','??? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'AF','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'AH','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'BG','??????-???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'DD','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'GB','???? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'HR','??? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'OR','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'SM','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'SN','??? ???? ??????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'TG','????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'AA','አዲስ አበባ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'AF','አá‹áˆ­'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'AH','አማራ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'BG','ቤንሻንጉáˆ-ጉáˆá‹'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'DD','ድሬዳዋ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'GB','ጋáˆá‰¤áˆ‹ ሕá‹á‰¦á‰½'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'HR','ሀረሪ ሕá‹á‰¥'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'OR','ኦሮሚያ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'SM','ሶማሌ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'SN','ደቡብ ብሔሮች ብሔረሰቦችና ሕá‹á‰¦á‰½'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (68,'TG','ትáŒáˆ«á‹­'); INSERT INTO lc_countries VALUES (69,'Falkland Islands (Malvinas)','FK','FLK',''); INSERT INTO lc_countries VALUES (70,'Faroe Islands','FO','FRO',''); @@ -2483,11 +2483,11 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (71,'W','Wes INSERT INTO lc_countries VALUES (72,'Finland','FI','FIN',":name\n:street_address\nFIN-:postcode :city\n:country"); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'AL','Ahvenanmaan maakunta'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'ES','Etelä-Suomen lääni'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'IS','Itä-Suomen lääni'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'LL','Lapin lääni'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'LS','Länsi-Suomen lääni'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'OL','Oulun lääni'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'ES','Etelä-Suomen lääni'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'IS','Itä-Suomen lääni'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'LL','Lapin lääni'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'LS','Länsi-Suomen lääni'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (72,'OL','Oulun lääni'); INSERT INTO lc_countries VALUES (73,'France','FR','FRA',":name\n:street_address\n:postcode :city\n:country"); @@ -2497,39 +2497,39 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'03','Al INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'04','Alpes-de-Haute-Provence'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'05','Hautes-Alpes'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'06','Alpes-Maritimes'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'07','Ardèche'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'07','Ardèche'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'08','Ardennes'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'09','Ariège'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'09','Ariège'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'10','Aube'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'11','Aude'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'12','Aveyron'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'13','Bouches-du-Rhône'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'13','Bouches-du-Rhône'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'14','Calvados'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'15','Cantal'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'16','Charente'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'17','Charente-Maritime'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'18','Cher'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'19','Corrèze'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'21','Côte-d\'Or'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'22','Côtes-d\'Armor'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'19','Corrèze'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'21','Côte-d\'Or'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'22','Côtes-d\'Armor'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'23','Creuse'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'24','Dordogne'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'25','Doubs'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'26','Drôme'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'26','Drôme'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'27','Eure'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'28','Eure-et-Loir'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'29','Finistère'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'29','Finistère'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'2A','Corse-du-Sud'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'2B','Haute-Corse'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'30','Gard'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'31','Haute-Garonne'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'32','Gers'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'33','Gironde'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'34','Hérault'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'34','Hérault'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'35','Ille-et-Vilaine'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'36','Indre'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'37','Indre-et-Loire'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'38','Isère'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'38','Isère'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'39','Jura'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'40','Landes'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'41','Loir-et-Cher'); @@ -2539,7 +2539,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'44','Lo INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'45','Loiret'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'46','Lot'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'47','Lot-et-Garonne'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'48','Lozère'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'48','Lozère'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'49','Maine-et-Loire'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'50','Manche'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'51','Marne'); @@ -2549,20 +2549,20 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'54','Me INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'55','Meuse'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'56','Morbihan'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'57','Moselle'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'58','Nièvre'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'58','Nièvre'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'59','Nord'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'60','Oise'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'61','Orne'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'62','Pas-de-Calais'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'63','Puy-de-Dôme'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'64','Pyrénées-Atlantiques'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'65','Hautes-Pyrénées'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'66','Pyrénées-Orientales'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'63','Puy-de-Dôme'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'64','Pyrénées-Atlantiques'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'65','Hautes-Pyrénées'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'66','Pyrénées-Orientales'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'67','Bas-Rhin'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'68','Haut-Rhin'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'69','Rhône'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'70','Haute-Saône'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'71','Saône-et-Loire'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'69','Rhône'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'70','Haute-Saône'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'71','Saône-et-Loire'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'72','Sarthe'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'73','Savoie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'74','Haute-Savoie'); @@ -2570,13 +2570,13 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'75','Pa INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'76','Seine-Maritime'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'77','Seine-et-Marne'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'78','Yvelines'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'79','Deux-Sèvres'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'79','Deux-Sèvres'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'80','Somme'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'81','Tarn'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'82','Tarn-et-Garonne'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'83','Var'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'84','Vaucluse'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'85','Vendée'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'85','Vendée'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'86','Vienne'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'87','Haute-Vienne'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'88','Vosges'); @@ -2587,12 +2587,12 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'92','Ha INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'93','Seine-Saint-Denis'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'94','Val-de-Marne'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'95','Val-d\'Oise'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'NC','Territoire des Nouvelle-Calédonie et Dependances'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'PF','Polynésie Française'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'NC','Territoire des Nouvelle-Calédonie et Dependances'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'PF','Polynésie Française'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'PM','Saint-Pierre et Miquelon'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'TF','Terres australes et antarctiques françaises'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'TF','Terres australes et antarctiques françaises'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'YT','Mayotte'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'WF','Territoire des îles Wallis et Futuna'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (73,'WF','Territoire des îles Wallis et Futuna'); INSERT INTO lc_countries VALUES (74,'France, Metropolitan','FX','FXX',":name\n:street_address\n:postcode :city\n:country"); INSERT INTO lc_countries VALUES (75,'French Guiana','GF','GUF',":name\n:street_address\n:postcode :city\n:country"); @@ -2639,24 +2639,24 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (79,'WP','We INSERT INTO lc_countries VALUES (80,'Georgia','GE','GEO',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'AB','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'AJ','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'GU','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'IM','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'KA','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'KK','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'MM','??????-????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'RL','????-??????? ?? ????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'SJ','??????-????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'SK','???? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'SZ','?????????-???? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'TB','???????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'AB','áƒáƒ¤áƒ®áƒáƒ–ეთი'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'AJ','áƒáƒ­áƒáƒ áƒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'GU','გურიáƒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'IM','იმერეთი'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'KA','კáƒáƒ®áƒ”თი'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'KK','ქვემრქáƒáƒ áƒ—ლი'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'MM','მცხეთáƒ-მთიáƒáƒœáƒ”თი'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'RL','რáƒáƒ­áƒ-ლეჩხუმი დრქვემრსვáƒáƒœáƒ”თი'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'SJ','სáƒáƒ›áƒªáƒ®áƒ”-ჯáƒáƒ•áƒáƒ®áƒ”თი'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'SK','შიდრქáƒáƒ áƒ—ლი'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'SZ','სáƒáƒ›áƒ”გრელáƒ-ზემრსვáƒáƒœáƒ”თი'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (80,'TB','თბილისი'); INSERT INTO lc_countries VALUES (81,'Germany','DE','DEU',":name\n:street_address\nD-:postcode :city\n:country"); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'BE','Berlin'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'BR','Brandenburg'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'BW','Baden-Württemberg'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'BW','Baden-Württemberg'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'BY','Bayern'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'HB','Bremen'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'HE','Hessen'); @@ -2669,7 +2669,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'SH','Sc INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'SL','Saarland'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'SN','Sachsen'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'ST','Sachsen-Anhalt'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'TH','Thüringen'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (81,'TH','Thüringen'); INSERT INTO lc_countries VALUES (82,'Ghana','GH','GHA',''); @@ -2688,58 +2688,58 @@ INSERT INTO lc_countries VALUES (83,'Gibraltar','GI','GIB',''); INSERT INTO lc_countries VALUES (84,'Greece','GR','GRC',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'01','??t???a?a??a??a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'03','????t?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'04','??ß??a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'05','????ta??a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'06','F???t?da'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'07','F???da'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'11','??????da'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'12','???ad?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'13','??a?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'14','??e?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'15','???????a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'16','?a????a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'17','?ess???a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'21','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'22','??????a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'23','?efa??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'24','?e???da'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'31','??ta'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'32','Tesp??t?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'33','???????a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'34','??eße?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'41','?a?d?tsa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'42','????sa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'43','?a???s?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'44','????a?a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'51','G?eße??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'52','???µa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'53','?µa??a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'54','Tessa??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'55','?aß??a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'56','?ast????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'57','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'58','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'59','????a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'61','??e??a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'62','Se????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'63','F?????a'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'64','?a???d???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'69','???? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'71','?ß???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'72','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'73','??d?p?'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'81','??de????sa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'82','?????de?'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'83','??sß??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'84','S?µ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'85','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'91','?????e??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'92','?as???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'93','?e??µ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'94','?a????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'A1','?tt???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'01','ΑιτωλοακαÏνανία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'03','Βοιωτία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'04','ΕÏβοια'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'05','ΕυÏυτανία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'06','Φθιώτιδα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'07','Φωκίδα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'11','ΑÏγολίδα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'12','ΑÏκαδία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'13','ἈχαÎα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'14','Ηλεία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'15','ΚοÏινθία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'16','Λακωνία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'17','Μεσσηνία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'21','Ζάκυνθος'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'22','ΚέÏκυÏα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'23','Κεφαλλονιά'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'24','Λευκάδα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'31','ΆÏτα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'32','ΘεσπÏωτία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'33','Ιωάννινα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'34','ΠÏεβεζα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'41','ΚαÏδίτσα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'42','ΛάÏισα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'43','Μαγνησία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'44','ΤÏίκαλα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'51','ΓÏεβενά'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'52','ΔÏάμα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'53','Ημαθία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'54','Θεσσαλονίκη'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'55','Καβάλα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'56','ΚαστοÏιά'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'57','Κιλκίς'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'58','Κοζάνη'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'59','Πέλλα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'61','ΠιεÏία'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'62','ΣεÏÏών'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'63','ΦλώÏινα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'64','Χαλκιδική'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'69','ÎŒÏος Άθως'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'71','ΈβÏος'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'72','Ξάνθη'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'73','Ροδόπη'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'81','Δωδεκάνησα'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'82','Κυκλάδες'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'83','Λέσβου'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'84','Σάμος'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'85','Χίος'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'91','ΗÏάκλειο'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'92','Λασίθι'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'93','ΡεθÏμνο'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'94','Χανίων'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (84,'A1','Αττική'); INSERT INTO lc_countries VALUES (85,'Greenland','GL','GRL',":name\n:street_address\nDK-:postcode :city\n:country"); @@ -2771,53 +2771,53 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'HU','Hu INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'IZ','Izabal'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'JA','Jalapa'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'JU','Jutiapa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'PE','El Petén'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'PE','El Petén'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'PR','El Progreso'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'QC','El Quiché'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'QC','El Quiché'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'QZ','Quetzaltenango'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'RE','Retalhuleu'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'SA','Sacatepéquez'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'SA','Sacatepéquez'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'SM','San Marcos'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'SO','Sololá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'SO','Sololá'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'SR','Santa Rosa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'SU','Suchitepéquez'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'TO','Totonicapán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'SU','Suchitepéquez'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'TO','Totonicapán'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (89,'ZA','Zacapa'); INSERT INTO lc_countries VALUES (90,'Guinea','GN','GIN',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'BE','Beyla'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'BF','Boffa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'BK','Boké'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'BK','Boké'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'CO','Coyah'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'DB','Dabola'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'DI','Dinguiraye'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'DL','Dalaba'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'DU','Dubréka'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'DU','Dubréka'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'FA','Faranah'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'FO','Forécariah'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'FO','Forécariah'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'FR','Fria'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'GA','Gaoual'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'GU','Guékédou'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'GU','Guékédou'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'KA','Kankan'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'KB','Koubia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'KD','Kindia'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'KE','Kérouané'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'KE','Kérouané'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'KN','Koundara'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'KO','Kouroussa'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'KS','Kissidougou'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'LA','Labé'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'LE','Lélouma'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'LA','Labé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'LE','Lélouma'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'LO','Lola'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'MC','Macenta'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'MD','Mandiana'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'ML','Mali'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'MM','Mamou'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'NZ','Nzérékoré'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'NZ','Nzérékoré'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'PI','Pita'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'SI','Siguiri'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'TE','Télimélé'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'TO','Tougué'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'TE','Télimélé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'TO','Tougué'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (90,'YO','Yomou'); INSERT INTO lc_countries VALUES (91,'Guinea-Bissau','GW','GNB',''); @@ -2867,139 +2867,139 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (94,'H','Hea INSERT INTO lc_countries VALUES (95,'Honduras','HN','HND',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'AT','Atlántida'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'AT','Atlántida'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'CH','Choluteca'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'CL','Colón'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'CL','Colón'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'CM','Comayagua'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'CP','Copán'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'CR','Cortés'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'EP','El Paraíso'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'FM','Francisco Morazán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'CP','Copán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'CR','Cortés'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'EP','El Paraíso'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'FM','Francisco Morazán'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'GD','Gracias a Dios'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'IB','Islas de la Bahía'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'IN','Intibucá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'IB','Islas de la Bahía'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'IN','Intibucá'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'LE','Lempira'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'LP','La Paz'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'OC','Ocotepeque'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'OL','Olancho'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'SB','Santa Bárbara'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'SB','Santa Bárbara'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'VA','Valle'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (95,'YO','Yoro'); INSERT INTO lc_countries VALUES (96,'Hong Kong','HK','HKG',":name\n:street_address\n:city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'HCW','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'HEA','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'HSO','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'HWC','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KKC','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KKT','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KSS','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KWT','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KYT','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NIS','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NKT','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NNO','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NSK','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NST','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NTP','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NTW','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NTM','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NYL','???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'HCW','中西å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'HEA','æ±å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'HSO','å—å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'HWC','ç£ä»”å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KKC','ä¹é¾åŸŽå€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KKT','觀塘å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KSS','深水埗å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KWT','黃大仙å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'KYT','油尖旺å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NIS','離島å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NKT','葵é’å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NNO','北å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NSK','西貢å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NST','沙田å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NTP','大埔å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NTW','èƒç£å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NTM','屯門å€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (96,'NYL','元朗å€'); INSERT INTO lc_countries VALUES (97,'Hungary','HU','HUN',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BA','Baranya megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BC','Békéscsaba'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BE','Békés megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BK','Bács-Kiskun megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BC','Békéscsaba'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BE','Békés megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BK','Bács-Kiskun megye'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BU','Budapest'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BZ','Borsod-Abaúj-Zemplén megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'CS','Csongrád megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'BZ','Borsod-Abaúj-Zemplén megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'CS','Csongrád megye'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'DE','Debrecen'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'DU','Dunaújváros'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'DU','Dunaújváros'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'EG','Eger'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'FE','Fejér megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'GS','Gyor-Moson-Sopron megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'GY','Gyor'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'HB','Hajdú-Bihar megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'FE','Fejér megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'GS','GyÅ‘r-Moson-Sopron megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'GY','GyÅ‘r'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'HB','Hajdú-Bihar megye'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'HE','Heves megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'HV','Hódmezovásárhely'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'JN','Jász-Nagykun-Szolnok megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'KE','Komárom-Esztergom megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'KM','Kecskemét'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'KV','Kaposvár'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'HV','HódmezÅ‘vásárhely'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'JN','Jász-Nagykun-Szolnok megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'KE','Komárom-Esztergom megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'KM','Kecskemét'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'KV','Kaposvár'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'MI','Miskolc'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'NK','Nagykanizsa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'NO','Nógrád megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'NY','Nyíregyháza'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'NO','Nógrád megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'NY','Nyíregyháza'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'PE','Pest megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'PS','Pécs'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'PS','Pécs'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SD','Szeged'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SF','Székesfehérvár'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SF','Székesfehérvár'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SH','Szombathely'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SK','Szolnok'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SN','Sopron'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SO','Somogy megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SS','Szekszárd'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'ST','Salgótarján'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SZ','Szabolcs-Szatmár-Bereg megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'TB','Tatabánya'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SS','Szekszárd'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'ST','Salgótarján'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'SZ','Szabolcs-Szatmár-Bereg megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'TB','Tatabánya'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'TO','Tolna megye'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'VA','Vas megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'VE','Veszprém megye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'VM','Veszprém'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'VE','Veszprém megye'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'VM','Veszprém'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'ZA','Zala megye'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (97,'ZE','Zalaegerszeg'); INSERT INTO lc_countries VALUES (98,'Iceland','IS','ISL',":name\n:street_address\nIS:postcode :city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'1','Höfuðborgarsvæðið'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'2','Suðurnes'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'1','Höfuðborgarsvæðið'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'2','Suðurnes'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'3','Vesturland'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'4','Vestfirðir'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'5','Norðurland vestra'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'6','Norðurland eystra'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'7','Austfirðir'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'8','Suðurland'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'4','Vestfirðir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'5','Norðurland vestra'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'6','Norðurland eystra'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'7','Austfirðir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (98,'8','Suðurland'); INSERT INTO lc_countries VALUES (99,'India','IN','IND',":name\n:street_address\n:city-:postcode\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-AN','?????? ?? ??????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-AP','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-AR','??????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-AS','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-BR','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-CH','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-CT','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-DD','??? ??? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-DL','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-DN','????? ??? ??? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-GA','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-GJ','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-HP','?????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-HR','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-JH','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-JK','????? ?? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-KA','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-KL','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-LD','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-ML','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-MH','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-MN','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-MP','???? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-MZ','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-NL','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-OR','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-PB','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-PY','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-RJ','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-SK','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-TN','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-TR','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-UL','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-UP','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-WB','??????????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-AN','अंडमान और निकोबार दà¥à¤µà¥€à¤ª'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-AP','ఆంధà±à°° à°ªà±à°°à°¦à±‡à°¶à±'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-AR','अरà¥à¤£à¤¾à¤šà¤² पà¥à¤°à¤¦à¥‡à¤¶'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-AS','অসম'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-BR','बिहार'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-CH','चंडीगढ़'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-CT','छतà¥à¤¤à¥€à¤¸à¤—ढ़'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-DD','દમણ અને દિવ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-DL','दिलà¥à¤²à¥€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-DN','દાદરા અને નગર હવેલી'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-GA','गोंय'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-GJ','ગà«àªœàª°àª¾àª¤'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-HP','हिमाचल पà¥à¤°à¤¦à¥‡à¤¶'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-HR','हरियाणा'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-JH','à¤à¤¾à¤°à¤–ंड'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-JK','जमà¥à¤®à¥‚ और कशà¥à¤®à¥€à¤°'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-KA','ಕನಾ೯ಟಕ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-KL','കേരളം'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-LD','ലകàµà´·à´¦àµà´µàµ€à´ªàµ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-ML','मेघालय'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-MH','महाराषà¥à¤Ÿà¥à¤°'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-MN','मणिपà¥à¤°'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-MP','मधà¥à¤¯ पà¥à¤°à¤¦à¥‡à¤¶'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-MZ','मिज़ोरम'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-NL','नागालैंड'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-OR','उड़ीसा'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-PB','ਪੰਜਾਬ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-PY','பà¯à®¤à¯à®šà¯à®šà¯‡à®°à®¿'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-RJ','राजसà¥à¤¥à¤¾à¤¨'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-SK','सिकà¥à¤•à¤¿à¤®'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-TN','தமிழ௠நாடà¯'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-TR','তà§à¦°à¦¿à¦ªà§à¦°à¦¾'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-UL','उतà¥à¤¤à¤°à¤¾à¤‚चल'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-UP','उतà¥à¤¤à¤° पà¥à¤°à¤¦à¥‡à¤¶'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (99,'IN-WB','পশà§à¦šà¦¿à¦®à¦¬à¦™à§à¦—'); INSERT INTO lc_countries VALUES (100,'Indonesia','ID','IDN',":name\n:street_address\n:city :postcode\n:country"); @@ -3036,93 +3036,93 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (100,'YO','Y INSERT INTO lc_countries VALUES (101,'Iran','IR','IRN',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'01','?????? ????????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'02','?????? ????????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'03','?????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'04','?????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'05','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'06','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'07','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'08','?????? ??????? ? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'09','?????? ?????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'10','?????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'11','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'12','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'13','?????? ?????? ??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'14','?????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'15','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'16','?????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'17','?????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'18','?????? ???????? ? ???? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'19','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'20','?????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'21','?????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'22','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'23','?????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'24','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'25','?????? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'26','?????? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'27','?????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'28','?????? ?????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'01','محاÙظة آذربایجان شرقي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'02','محاÙظة آذربایجان غربي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'03','محاÙظة اردبیل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'04','محاÙظة اصÙهان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'05','محاÙظة ایلام'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'06','محاÙظة بوشهر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'07','محاÙظة طهران'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'08','محاÙظة چهارمحل Ùˆ بختیاري'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'09','محاÙظة خراسان رضوي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'10','محاÙظة خوزستان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'11','محاÙظة زنجان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'12','محاÙظة سمنان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'13','محاÙظة سيستان وبلوتشستان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'14','محاÙظة Ùارس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'15','محاÙظة کرمان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'16','محاÙظة کردستان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'17','محاÙظة کرمانشاه'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'18','محاÙظة کهکیلویه Ùˆ بویر أحمد'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'19','محاÙظة گیلان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'20','محاÙظة لرستان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'21','محاÙظة مازندران'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'22','محاÙظة مرکزي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'23','محاÙظة هرمزگان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'24','محاÙظة همدان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'25','محاÙظة یزد'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'26','محاÙظة قم'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'27','محاÙظة گلستان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (101,'28','محاÙظة قزوين'); INSERT INTO lc_countries VALUES (102,'Iraq','IQ','IRQ',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'AN','?????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'AR','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'BA','?????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'BB','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'BG','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'DA','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'DI','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'DQ','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'KA','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'MA','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'MU','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'NA','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'NI','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'QA','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'SD','???? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'SW','?????? ??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'TS','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'WA','????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'AN','محاÙظة الأنبار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'AR','أربيل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'BA','محاÙظة البصرة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'BB','بابل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'BG','محاÙظة بغداد'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'DA','دهوك'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'DI','ديالى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'DQ','ذي قار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'KA','كربلاء'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'MA','ميسان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'MU','المثنى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'NA','النجÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'NI','نینوى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'QA','القادسية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'SD','صلاح الدين'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'SW','محاÙظة السليمانية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'TS','التأمیم'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (102,'WA','واسط'); INSERT INTO lc_countries VALUES (103,'Ireland','IE','IRL',":name\n:street_address\nIE-:city\n:country"); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'C','Corcaigh'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'CE','Contae an Chláir'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'CN','An Cabhán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'CE','Contae an Chláir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'CN','An Cabhán'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'CW','Ceatharlach'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'D','Baile Átha Cliath'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'DL','Dún na nGall'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'D','Baile Ãtha Cliath'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'DL','Dún na nGall'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'G','Gaillimh'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'KE','Cill Dara'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'KK','Cill Chainnigh'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'KY','Contae Chiarraí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'KY','Contae Chiarraí'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'LD','An Longfort'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'LH','Contae Lú'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'LH','Contae Lú'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'LK','Luimneach'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'LM','Contae Liatroma'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'LS','Contae Laoise'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'MH','Contae na Mí'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'MN','Muineachán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'MH','Contae na Mí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'MN','Muineachán'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'MO','Contae Mhaigh Eo'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'OY','Contae Uíbh Fhailí'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'RN','Ros Comáin'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'OY','Contae Uíbh Fhailí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'RN','Ros Comáin'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'SO','Sligeach'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'TA','Tiobraid Árann'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'TA','Tiobraid Ãrann'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'WD','Port Lairge'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'WH','Contae na hIarmhí'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'WW','Cill Mhantáin'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'WH','Contae na hIarmhí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'WW','Cill Mhantáin'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (103,'WX','Loch Garman'); INSERT INTO lc_countries VALUES (104,'Israel','IL','ISR',":name\n:street_address\n:postcode :city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'D ','???? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'HA','???? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'JM','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'M ','???? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'TA','?? ????-???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'Z ','???? ?????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'D ','מחוז הדרו×'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'HA','מחוז חיפה'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'JM','ירושלי×'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'M ','מחוז המרכז'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'TA','תל ×ביב-יפו'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (104,'Z ','מחוז הצפון'); INSERT INTO lc_countries VALUES (105,'Italy','IT','ITA',":name\n:street_address\n:postcode-:city :state_code\n:country"); @@ -3162,7 +3162,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (105,'FE','F INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (105,'FG','Foggia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (105,'FI','Firenze'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (105,'FM','Fermo'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (105,'FO','Forlì-Cesena'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (105,'FO','Forlì-Cesena'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (105,'FR','Frosinone'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (105,'GE','Genova'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (105,'GO','Gorizia'); @@ -3256,88 +3256,88 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (106,'14','S INSERT INTO lc_countries VALUES (107,'Japan','JP','JPN',":name\n:street_address, :suburb\n:city :postcode\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'01','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'02','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'03','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'04','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'05','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'06','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'07','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'08','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'09','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'10','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'11','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'12','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'13','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'14','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'15','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'16','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'17','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'18','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'19','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'20','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'21','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'22','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'23','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'24','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'25','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'26','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'27','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'28','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'29','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'30','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'31','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'32','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'33','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'34','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'35','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'36','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'37','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'38','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'39','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'40','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'41','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'42','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'43','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'44','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'45','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'46','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'47','??'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'01','北海é“'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'02','é’森'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'03','岩手'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'04','宮城'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'05','秋田'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'06','山形'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'07','ç¦å³¶'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'08','茨城'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'09','栃木'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'10','群馬'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'11','埼玉'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'12','åƒè‘‰'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'13','æ±äº¬'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'14','神奈å·'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'15','新潟'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'16','富山'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'17','石å·'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'18','ç¦äº•'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'19','山梨'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'20','長野'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'21','å²é˜œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'22','é™å²¡'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'23','愛知'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'24','三é‡'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'25','滋賀'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'26','京都'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'27','大阪'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'28','兵庫'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'29','奈良'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'30','和歌山'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'31','é³¥å–'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'32','島根'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'33','岡山'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'34','広島'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'35','å±±å£'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'36','徳島'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'37','香å·'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'38','愛媛'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'39','高知'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'40','ç¦å²¡'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'41','ä½è³€'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'42','é•·å´Ž'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'43','熊本'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'44','大分'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'45','宮崎'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'46','鹿å…島'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (107,'47','沖縄'); INSERT INTO lc_countries VALUES (108,'Jordan','JO','JOR',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AJ','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AM','?????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AQ','?????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AT','?????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AZ','?????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'BA','?????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'JA','?????? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'JR','?????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'KA','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'MA','?????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'MD','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'MN','?????? ????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AJ','محاÙظة عجلون'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AM','محاÙظة العاصمة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AQ','محاÙظة العقبة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AT','محاÙظة الطÙيلة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'AZ','محاÙظة الزرقاء'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'BA','محاÙظة البلقاء'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'JA','محاÙظة جرش'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'JR','محاÙظة إربد'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'KA','محاÙظة الكرك'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'MA','محاÙظة المÙرق'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'MD','محاÙظة مادبا'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (108,'MN','محاÙظة معان'); INSERT INTO lc_countries VALUES (109,'Kazakhstan','KZ','KAZ',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AL','??????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AL','Ðлматы'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AC','Almaty City'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AM','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AQ','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AS','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AT','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'BA','????? ?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'BY','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'MA','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'ON','???????? ?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'PA','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'QA','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'QO','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'QY','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'SH','????? ?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'SO','????????? ?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'ZH','??????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AM','Ðқмола'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AQ','Ðқтөбе'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AS','ÐÑтана'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'AT','Ðтырау'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'BA','Ð‘Ð°Ñ‚Ñ‹Ñ ÒšÐ°Ð·Ð°Ò›Ñтан'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'BY','Байқоңыр'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'MA','МаңғыÑтау'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'ON','ОңтүÑтік ҚазақÑтан'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'PA','Павлодар'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'QA','Қарағанды'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'QO','ҚоÑтанай'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'QY','Қызылорда'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'SH','Ð¨Ñ‹Ò“Ñ‹Ñ ÒšÐ°Ð·Ð°Ò›Ñтан'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'SO','СолтүÑтік ҚазақÑтан'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (109,'ZH','Жамбыл'); INSERT INTO lc_countries VALUES (110,'Kenya','KE','KEN',''); @@ -3358,108 +3358,108 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (111,'P','Ph INSERT INTO lc_countries VALUES (112,'Korea, North','KP','PRK',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'CHA','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'HAB','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'HAN','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'HWB','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'HWN','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'KAN','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'KAE','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'NAJ','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'NAM','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'PYB','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'PYN','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'PYO','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'YAN','???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'CHA','ìžê°•ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'HAB','함경 ë¶ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'HAN','함경 남ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'HWB','황해 ë¶ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'HWN','황해 남ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'KAN','ê°•ì›ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'KAE','개성시'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'NAJ','ë¼ì„  ì§í• ì‹œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'NAM','ë‚¨í¬ íŠ¹ê¸‰ì‹œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'PYB','í‰ì•ˆ ë¶ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'PYN','í‰ì•ˆ 남ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'PYO','í‰ì–‘ ì§í• ì‹œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (112,'YAN','량강ë„'); INSERT INTO lc_countries VALUES (113,'Korea, South','KR','KOR',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'11','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'26','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'27','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'28','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'29','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'30','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'31','?? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'41','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'42','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'43','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'44','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'45','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'46','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'47','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'48','?? ??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'49','???????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'11','서울특별시'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'26','부산 ê´‘ì—­ì‹œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'27','대구 ê´‘ì—­ì‹œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'28','ì¸ì²œê´‘ì—­ì‹œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'29','광주 ê´‘ì—­ì‹œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'30','대전 ê´‘ì—­ì‹œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'31','울산 ê´‘ì—­ì‹œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'41','경기ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'42','ê°•ì›ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'43','충청 ë¶ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'44','충청 남ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'45','ì „ë¼ ë¶ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'46','ì „ë¼ ë‚¨ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'47','ê²½ìƒ ë¶ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'48','ê²½ìƒ ë‚¨ë„'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (113,'49','제주특별ìžì¹˜ë„'); INSERT INTO lc_countries VALUES (114,'Kuwait','KW','KWT',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'AH','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'FA','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'JA','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'KU','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'HW','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'MU','????? ??????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'AH','الاحمدي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'FA','الÙروانية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'JA','الجهراء'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'KU','ألعاصمه'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'HW','حولي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (114,'MU','مبارك الكبير'); INSERT INTO lc_countries VALUES (115,'Kyrgyzstan','KG','KGZ',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'B','?????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'C','??? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'GB','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'J','?????-???? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'N','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'O','?? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'T','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'Y','????-??? ???????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'B','Баткен облаÑÑ‚Ñ‹'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'C','Чүй облаÑÑ‚Ñ‹'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'GB','Бишкек'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'J','Жалал-Ðбад облаÑÑ‚Ñ‹'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'N','Ðарын облаÑÑ‚Ñ‹'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'O','Ош облаÑÑ‚Ñ‹'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'T','Ð¢Ð°Ð»Ð°Ñ Ð¾Ð±Ð»Ð°ÑÑ‚Ñ‹'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (115,'Y','ЫÑык-Көл облаÑÑ‚Ñ‹'); INSERT INTO lc_countries VALUES (116,'Laos','LA','LAO',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'AT','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'BK','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'BL','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'CH','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'HO','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'KH','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'LM','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'LP','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'OU','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'PH','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'SL','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'SV','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'VI','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'VT','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'XA','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'XE','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'XI','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'XN','????????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'AT','ອັດຕະປື'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'BK','ບà»à»ˆà»àºà»‰àº§'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'BL','ບà»àº¥àº´àº„à»àº²à»„ຊ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'CH','ຈà»àº²àº›àº²àºªàº±àº'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'HO','ຫົວພັນ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'KH','ຄà»àº²àº¡à»ˆàº§àº™'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'LM','ຫລວງນà»à»‰àº²àº—າ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'LP','ຫລວງພະບາງ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'OU','ອຸດົມໄຊ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'PH','ຜົງສາລີ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'SL','ສາລະວັນ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'SV','ສະຫວັນນະເຂດ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'VI','ວຽງຈັນ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'VT','ວຽງຈັນ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'XA','ໄຊàºàº°àºšàº¹àº¥àºµ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'XE','ເຊàºàº­àº‡'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'XI','ຊຽງຂວາງ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (116,'XN','ໄຊສົມບູນ'); INSERT INTO lc_countries VALUES (117,'Latvia','LV','LVA',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'AI','Aizkraukles rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'AL','Aluksnes rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'AL','AlÅ«ksnes rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'BL','Balvu rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'BU','Bauskas rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'CE','Cesu rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'CE','CÄ“su rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'DA','Daugavpils rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'DGV','Daugpilis'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'DO','Dobeles rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'GU','Gulbenes rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'JEL','Jelgava'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'JK','Jekabpils rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'JK','JÄ“kabpils rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'JL','Jelgavas rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'JUR','Jurmala'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'KR','Kraslavas rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'KU','Kuldigas rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'LE','Liepajas rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'LM','Limbažu rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'JUR','JÅ«rmala'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'KR','KrÄslavas rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'KU','KuldÄ«gas rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'LE','LiepÄjas rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'LM','Limbažu rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'LPX','Liepoja'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'LU','Ludzas rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'MA','Madonas rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'OG','Ogres rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'PR','Preilu rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'RE','Rezeknes rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'REZ','Rezekne'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'RI','Rigas rajons'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'RIX','Riga'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'PR','Preiļu rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'RE','RÄ“zeknes rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'REZ','RÄ“zekne'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'RI','RÄ«gas rajons'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'RIX','RÄ«ga'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'SA','Saldus rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'TA','Talsu rajons'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (117,'TU','Tukuma rajons'); @@ -3503,40 +3503,40 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (120,'SI','S INSERT INTO lc_countries VALUES (121,'Libyan Arab Jamahiriya','LY','LBY',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'AJ','Ajdabiya'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'BA','Banghazi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'BU','Al Butnan'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'BW','Bani Walid'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'AJ','AjdÄbiyÄ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'BA','BanghÄzÄ«'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'BU','Al BuÅ£nÄn'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'BW','BanÄ« WalÄ«d'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'DR','Darnah'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'GD','Ghadamis'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'GR','Gharyan'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'GT','Ghat'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'HZ','Al ?izam al Akh?ar'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'JA','Al Jabal al Akh?ar'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'JB','Jaghbub'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'JI','Al Jifarah'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'GD','GhadÄmis'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'GR','GharyÄn'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'GT','GhÄt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'HZ','Al ḨizÄm al Akhḑar'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'JA','Al Jabal al Akhḑar'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'JB','JaghbÅ«b'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'JI','Al JifÄrah'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'JU','Al Jufrah'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'KF','Al Kufrah'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'MB','Al Marqab'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'MI','Misratah'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'MI','MiÅŸrÄtah'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'MJ','Al Marj'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'MQ','Murzuq'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'MZ','Mizdah'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'NL','Nalut'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'NQ','An Nuqat al Khams'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'NL','NÄlÅ«t'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'NQ','An NuqaÅ£ al Khams'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'QB','Al Qubbah'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'QT','Al Qatrun'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'SB','Sabha'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'SH','Ash Shati'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'QT','Al QaÅ£rÅ«n'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'SB','SabhÄ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'SH','Ash ShÄÅ£i'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'SR','Surt'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'SS','Sabratah Surman'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'TB','Tarabulus'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'TM','Tarhunah-Masallatah'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'TN','Tajura wa an Nawa?i al Arba?'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'WA','Al Wa?ah'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'WD','Wadi al ?ayat'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'YJ','Yafran-Jadu'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'ZA','Az Zawiyah'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'SS','ÅžabrÄtah ÅžurmÄn'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'TB','Å¢arÄbulus'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'TM','TarhÅ«nah-MasallÄtah'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'TN','TÄjÅ«rÄ wa an NawÄḩī al ArbÄÊ»'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'WA','Al WÄḩah'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'WD','WÄdÄ« al ḨayÄt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'YJ','Yafran-JÄdÅ«'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (121,'ZA','Az ZÄwiyah'); INSERT INTO lc_countries VALUES (122,'Liechtenstein','LI','LIE',''); @@ -3555,13 +3555,13 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (122,'V','Va INSERT INTO lc_countries VALUES (123,'Lithuania','LT','LTU',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'AL','Alytaus Apskritis'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'KL','Klaipedos Apskritis'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'KL','KlaipÄ—dos Apskritis'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'KU','Kauno Apskritis'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'MR','Marijampoles Apskritis'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'PN','Panevežio Apskritis'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'SA','Šiauliu Apskritis'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'TA','Taurages Apskritis'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'TE','Telšiu Apskritis'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'MR','MarijampolÄ—s Apskritis'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'PN','Panevėžio Apskritis'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'SA','Å iaulių Apskritis'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'TA','TauragÄ—s Apskritis'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'TE','TelÅ¡ių Apskritis'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'UT','Utenos Apskritis'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (123,'VL','Vilniaus Apskritis'); @@ -3573,95 +3573,95 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (124,'L','Lu INSERT INTO lc_countries VALUES (125,'Macau','MO','MAC',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (125,'I','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (125,'M','???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (125,'I','海島市'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (125,'M','澳門市'); INSERT INTO lc_countries VALUES (126,'Macedonia','MK','MKD',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'BR','Berovo'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CH','????????-????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DL','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KB','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'OC','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'LO','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'MK','?????????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PH','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PT','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ST','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SL','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NI','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ZR','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KY','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KZ','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'UM','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'LI','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RN','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NA','????? ??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'TL','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DM','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DE','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KG','????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KS','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'MG','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NV','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PP','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RE','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VJ','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'BN','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GT','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'JG','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'MR','??????? ? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'TR','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ET','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VH','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ZE','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'AD','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'AR','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'BU','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CI','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CE','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CS','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GB','???? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GP','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'IL','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KX','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VD','?????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PE','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'AJ','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SS','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SU','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SO','???? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ZK','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'BG','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'BS','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GV','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KN','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NS','???? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RV','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SD','???? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RU','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VA','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VL','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CZ','?????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DB','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DA','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DR','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KH','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'MD','?????????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'OD','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'OS','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PN','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'UG','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VV','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VC','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ZA','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CA','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DK','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GR','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'AV','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NG','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RM','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VE','?????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CH','Чешиново-Облешево'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DL','Делчево'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KB','Карбинци'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'OC','Кочани'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'LO','Лозово'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'MK','МакедонÑка каменица'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PH','Пехчево'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PT','Пробиштип'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ST','Штип'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SL','Свети Ðиколе'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NI','Виница'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ZR','Зрновци'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KY','Кратово'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KZ','Крива Паланка'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'UM','Куманово'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'LI','Липково'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RN','Ранковце'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NA','Старо Ðагоричане'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'TL','Битола'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DM','Демир ХиÑар'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DE','Долнени'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KG','Кривогаштани'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KS','Крушево'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'MG','Могила'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NV','Ðоваци'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PP','Прилеп'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RE','РеÑен'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VJ','Боговиње'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'BN','Брвеница'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GT','ГоÑтивар'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'JG','Јегуновце'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'MR','Маврово и РоÑтуша'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'TR','Теарце'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ET','Тетово'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VH','Врапчиште'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ZE','Желино'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'AD','Ðеродром'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'AR','Ðрачиново'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'BU','Бутел'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CI','Чаир'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CE','Центар'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CS','Чучер Сандево'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GB','Гази Баба'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GP','Ѓорче Петров'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'IL','Илинден'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KX','Карпош'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VD','КиÑела Вода'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PE','Петровец'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'AJ','Сарај'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SS','Сопиште'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SU','Студеничани'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SO','Шуто Оризари'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ZK','Зелениково'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'BG','Богданци'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'BS','БоÑилово'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GV','Гевгелија'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KN','Конче'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NS','Ðово Село'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RV','Радовиш'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'SD','Стар Дојран'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RU','Струмица'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VA','Валандово'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VL','ВаÑилево'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CZ','Центар Жупа'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DB','Дебар'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DA','Дебарца'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DR','Другово'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'KH','Кичево'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'MD','МакедонÑки Брод'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'OD','Охрид'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'OS','ОÑломеј'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'PN','ПлаÑница'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'UG','Струга'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VV','Вевчани'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VC','Вранештица'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'ZA','ЗајаÑ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'CA','Чашка'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'DK','Демир Капија'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'GR','ГрадÑко'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'AV','Кавадарци'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'NG','Ðеготино'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'RM','РоÑоман'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (126,'VE','ВелеÑ'); INSERT INTO lc_countries VALUES (127,'Madagascar','MG','MDG',''); @@ -3752,7 +3752,7 @@ INSERT INTO lc_countries VALUES (131,'Mali','ML','MLI',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (131,'1','Kayes'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (131,'2','Koulikoro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (131,'3','Sikasso'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (131,'4','Ségou'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (131,'4','Ségou'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (131,'5','Mopti'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (131,'6','Tombouctou'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (131,'7','Gao'); @@ -3862,19 +3862,19 @@ INSERT INTO lc_countries VALUES (134,'Martinique','MQ','MTQ',''); INSERT INTO lc_countries VALUES (135,'Mauritania','MR','MRT',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'01','????? ????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'02','????? ????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'03','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'04','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'05','????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'06','????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'07','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'08','????? ????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'09','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'10','????? ???? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'11','????? ???? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'12','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'NKC','???????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'01','ولاية الحوض الشرقي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'02','ولاية الحوض الغربي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'03','ولاية العصابة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'04','ولاية كركول'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'05','ولاية البراكنة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'06','ولاية الترارزة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'07','ولاية آدرار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'08','ولاية داخلت نواذيبو'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'09','ولاية تكانت'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'10','ولاية كيدي ماغة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'11','ولاية تيرس زمور'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'12','ولاية إينشيري'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (135,'NKC','نواكشوط'); INSERT INTO lc_countries VALUES (136,'Mauritius','MU','MUS',''); @@ -3915,16 +3915,16 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'GUA',' INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'HID','Hidalgo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'JAL','Jalisco'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'MEX','Mexico'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'MIC','Michoacán'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'MIC','Michoacán'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'MOR','Morelos'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'NAY','Nayarit'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'NLE','Nuevo León'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'NLE','Nuevo León'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'OAX','Oaxaca'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'PUE','Puebla'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'QUE','Querétaro'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'QUE','Querétaro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'ROO','Quintana Roo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'SIN','Sinaloa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'SLP','San Luis Potosí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'SLP','San Luis Potosí'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'SON','Sonora'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'TAB','Tabasco'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (138,'TAM','Tamaulipas'); @@ -3942,14 +3942,14 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (139,'YAP',' INSERT INTO lc_countries VALUES (140,'Moldova','MD','MDA',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'BA','Balti'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'BA','BălÅ£i'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'CA','Cahul'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'CU','Chisinau'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'ED','Edinet'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'GA','Gagauzia'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'LA','Lapusna'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'CU','ChiÅŸinău'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'ED','EdineÅ£'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'GA','Găgăuzia'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'LA','LăpuÅŸna'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'OR','Orhei'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'SN','Stânga Nistrului'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'SN','Stânga Nistrului'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'SO','Soroca'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'TI','Tighina'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (140,'UN','Ungheni'); @@ -3963,34 +3963,34 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (141,'MV','M INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (141,'SM','Saint Michel'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (141,'CO','Condamine'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (141,'LC','La Colle'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (141,'RE','Les Révoires'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (141,'RE','Les Révoires'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (141,'MO','Moneghetti'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (141,'FV','Fontvieille'); INSERT INTO lc_countries VALUES (142,'Mongolia','MN','MNG',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'1','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'035','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'037','??????-??? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'039','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'041','??????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'043','???? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'046','??? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'047','??? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'049','??????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'051','????????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'053','???????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'055','?????????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'057','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'059','???????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'061','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'063','????????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'064','?????????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'065','????-????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'067','?????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'069','?????????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'071','???? ????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'073','???????? ?????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'1','Улаанбаатар'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'035','Орхон аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'037','Дархан-Уул аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'039','Ð¥Ñнтий аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'041','ХөвÑгөл аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'043','Ховд аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'046','Ð£Ð²Ñ Ð°Ð¹Ð¼Ð°Ð³'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'047','Төв аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'049','СÑлÑÐ½Ð³Ñ Ð°Ð¹Ð¼Ð°Ð³'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'051','Сүхбаатар аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'053','Өмнөговь аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'055','Өвөрхангай аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'057','Завхан аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'059','Дундговь аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'061','Дорнод аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'063','Дорноговь аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'064','ГовьÑүмбÑÑ€ аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'065','Говь-Ðлтай аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'067','Булган аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'069','БаÑнхонгор аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'071','БаÑн Өлгий аймаг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (142,'073','Ðрхангай аймаг'); INSERT INTO lc_countries VALUES (143,'Montserrat','MS','MSR',''); @@ -4010,26 +4010,26 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (145,'L','Ma INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (145,'MPM','Maputo cidade'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (145,'N','Nampula'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (145,'P','Cabo Delgado'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (145,'Q','Zambézia'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (145,'Q','Zambézia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (145,'S','Sofala'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (145,'T','Tete'); INSERT INTO lc_countries VALUES (146,'Myanmar','MM','MMR',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'AY','?????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'BG','????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'MG','?????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'MD','??????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'SG','???????????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'TN','???????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'YG','????????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'CH','?????????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'KC','?????????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'KH','???????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'KN','????????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'MN','????????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'RK','?????????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'SH','????????????????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'AY','ဧရာá€á€á€®á€á€­á€¯á€„္‌း'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'BG','ပဲá€á€°á€¸á€á€¯á€­á€„္‌း'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'MG','မကေ္á€á€¸á€á€­á€¯á€„္‌း'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'MD','မန္á€á€œá€±á€¸á€á€¯á€­á€„္‌း'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'SG','စစ္‌ကုိင္‌း‌á€á€¯á€­á€„္‌း'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'TN','á€á€”င္သာရိá€á€¯á€­á€„္‌း'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'YG','ရန္‌ကုန္‌á€á€¯á€­á€„္‌း'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'CH','á€á€¹á€šá€„္‌းပ္ရည္‌နယ္‌'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'KC','ကá€á€¹á€šá€„္‌ပ္ရည္‌နယ္‌'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'KH','ကယား‌ပ္ရည္‌နယ္‌'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'KN','ကရင္‌‌ပ္ရည္‌နယ္‌'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'MN','မ္á€á€”္‌ပ္ရည္‌နယ္‌'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'RK','ရá€á€¯á€­á€„္‌ပ္ရည္‌နယ္‌'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (146,'SH','ရုမ္‌းပ္ရည္‌နယ္‌'); INSERT INTO lc_countries VALUES (147,'Namibia','NA','NAM',''); @@ -4100,7 +4100,7 @@ INSERT INTO lc_countries VALUES (151,'Netherlands Antilles','AN','ANT',":name\n: INSERT INTO lc_countries VALUES (152,'New Caledonia','NC','NCL',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (152,'L','Province des Îles'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (152,'L','Province des ÃŽles'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (152,'N','Province Nord'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (152,'S','Province Sud'); @@ -4125,23 +4125,23 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (153,'WTC',' INSERT INTO lc_countries VALUES (154,'Nicaragua','NI','NIC',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'AN','Atlántico Norte'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'AS','Atlántico Sur'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'AN','Atlántico Norte'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'AS','Atlántico Sur'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'BO','Boaco'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'CA','Carazo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'CI','Chinandega'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'CO','Chontales'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'ES','Estelí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'ES','Estelí'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'GR','Granada'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'JI','Jinotega'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'LE','León'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'LE','León'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'MD','Madriz'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'MN','Managua'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'MS','Masaya'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'MT','Matagalpa'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'NS','Nueva Segovia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'RI','Rivas'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'SJ','Río San Juan'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (154,'SJ','Río San Juan'); INSERT INTO lc_countries VALUES (155,'Niger','NE','NER',''); @@ -4150,7 +4150,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (155,'2','Da INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (155,'3','Dosso'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (155,'4','Maradi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (155,'5','Tahoua'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (155,'6','Tillabéry'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (155,'6','Tillabéry'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (155,'7','Zinder'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (155,'8','Niamey'); @@ -4204,7 +4204,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (159,'T','Ti INSERT INTO lc_countries VALUES (160,'Norway','NO','NOR',":name\n:street_address\nNO-:postcode :city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'01','Østfold fylke'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'01','Østfold fylke'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'02','Akershus fylke'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'03','Oslo fylke'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'04','Hedmark fylke'); @@ -4217,34 +4217,34 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'10','V INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'11','Rogaland fylke'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'12','Hordaland fylke'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'14','Sogn og Fjordane fylke'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'15','Møre og Romsdal fylke'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'16','Sør-Trøndelag fylke'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'17','Nord-Trøndelag fylke'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'15','Møre og Romsdal fylke'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'16','Sør-Trøndelag fylke'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'17','Nord-Trøndelag fylke'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'18','Nordland fylke'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'19','Troms fylke'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (160,'20','Finnmark fylke'); INSERT INTO lc_countries VALUES (161,'Oman','OM','OMN',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'BA','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'DA','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'DH','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'MA','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'MU','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'SH','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'WU','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'ZA','???????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'BA','الباطنة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'DA','الداخلية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'DH','ظÙار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'MA','مسقط'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'MU','مسندم'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'SH','الشرقية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'WU','الوسطى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (161,'ZA','الظاهرة'); INSERT INTO lc_countries VALUES (162,'Pakistan','PK','PAK',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'BA','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'IS','????? ??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'JK','???? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'NA','????? ????? ???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'NW','???? ????? ????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'PB','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'SD','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'TA','????? ?????? ????? ???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'BA','بلوچستان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'IS','ÙˆÙاقی دارالحکومت'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'JK','آزاد کشمیر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'NA','شمالی Ø¹Ù„Ø§Ù‚Û Ø¬Ø§Øª'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'NW','شمال مغربی سرحدی صوبÛ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'PB','پنجاب'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'SD','سندھ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (162,'TA','ÙˆÙاقی قبائلی Ø¹Ù„Ø§Ù‚Û Ø¬Ø§Øª'); INSERT INTO lc_countries VALUES (163,'Palau','PW','PLW',''); @@ -4268,13 +4268,13 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (163,'SO','S INSERT INTO lc_countries VALUES (164,'Panama','PA','PAN',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'1','Bocas del Toro'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'2','Coclé'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'3','Colón'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'4','Chiriquí'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'5','Darién'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'2','Coclé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'3','Colón'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'4','Chiriquí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'5','Darién'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'6','Herrera'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'7','Los Santos'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'8','Panamá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'8','Panamá'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'9','Veraguas'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (164,'Q','Kuna Yala'); @@ -4303,39 +4303,39 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (165,'WPD',' INSERT INTO lc_countries VALUES (166,'Paraguay','PY','PRY',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'1','Concepción'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'1','Concepción'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'2','San Pedro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'3','Cordillera'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'4','Guairá'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'5','Caaguazú'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'6','Caazapá'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'7','Itapúa'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'4','Guairá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'5','Caaguazú'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'6','Caazapá'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'7','Itapúa'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'8','Misiones'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'9','Paraguarí'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'10','Alto Paraná'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'9','Paraguarí'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'10','Alto Paraná'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'11','Central'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'12','Ñeembucú'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'12','Ñeembucú'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'13','Amambay'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'14','Canindeyú'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'14','Canindeyú'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'15','Presidente Hayes'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'16','Alto Paraguay'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'19','Boquerón'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'ASU','Asunción'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'19','Boquerón'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (166,'ASU','Asunción'); INSERT INTO lc_countries VALUES (167,'Peru','PE','PER',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'AMA','Amazonas'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'ANC','Ancash'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'APU','Apurímac'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'APU','Apurímac'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'ARE','Arequipa'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'AYA','Ayacucho'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'CAJ','Cajamarca'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'CAL','Callao'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'CUS','Cuzco'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'HUC','Huánuco'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'HUC','Huánuco'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'HUV','Huancavelica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'ICA','Ica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'JUN','Junín'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'JUN','Junín'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'LAL','La Libertad'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'LAM','Lambayeque'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'LIM','Lima'); @@ -4345,7 +4345,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'MOQ',' INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'PAS','Pasco'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'PIU','Piura'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'PUN','Puno'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'SAM','San Martín'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'SAM','San Martín'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'TAC','Tacna'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'TUM','Tumbes'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (167,'UCA','Ucayali'); @@ -4436,20 +4436,20 @@ INSERT INTO lc_countries VALUES (169,'Pitcairn','PN','PCN',''); INSERT INTO lc_countries VALUES (170,'Poland','PL','POL',":name\n:street_address\n:postcode :city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'DS','Dolnoslaskie'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'DS','DolnoÅ›lÄ…skie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'KP','Kujawsko-Pomorskie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'LU','Lubelskie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'LB','Lubuskie'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'LD','Lódzkie'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'MA','Malopolskie'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'LD','Åódzkie'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'MA','MaÅ‚opolskie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'MZ','Mazowieckie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'OP','Opolskie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'PK','Podkarpackie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'PD','Podlaskie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'PM','Pomorskie'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'SL','Slaskie'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'SK','Swietokrzyskie'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'WN','Warminsko-Mazurskie'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'SL','ÅšlÄ…skie'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'SK','ÅšwiÄ™tokrzyskie'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'WN','WarmiÅ„sko-Mazurskie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'WP','Wielkopolskie'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (170,'ZP','Zachodniopomorskie'); @@ -4458,176 +4458,176 @@ INSERT INTO lc_countries VALUES (171,'Portugal','PT','PRT',":name\n:street_addre INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'01','Aveiro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'02','Beja'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'03','Braga'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'04','Bragança'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'04','Bragança'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'05','Castelo Branco'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'06','Coimbra'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'07','Évora'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'07','Évora'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'08','Faro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'09','Guarda'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'10','Leiria'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'11','Lisboa'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'12','Portalegre'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'13','Porto'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'14','Santarém'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'15','Setúbal'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'14','Santarém'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'15','Setúbal'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'16','Viana do Castelo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'17','Vila Real'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'18','Viseu'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'20','Região Autónoma dos Açores'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'30','Região Autónoma da Madeira'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'20','Região Autónoma dos Açores'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (171,'30','Região Autónoma da Madeira'); INSERT INTO lc_countries VALUES (172,'Puerto Rico','PR','PRI',''); INSERT INTO lc_countries VALUES (173,'Qatar','QA','QAT',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'DA','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'GH','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'JB','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'JU','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'KH','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'ME','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'MS','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'RA','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'US','?? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'WA','??????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'DA','الدوحة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'GH','الغويرية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'JB','جريان الباطنة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'JU','الجميلية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'KH','الخور'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'ME','مسيعيد'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'MS','الشمال'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'RA','الريان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'US','أم صلال'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (173,'WA','الوكرة'); INSERT INTO lc_countries VALUES (174,'Reunion','RE','REU',''); INSERT INTO lc_countries VALUES (175,'Romania','RO','ROM',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'AB','Alba'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'AG','Arges'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'AG','ArgeÅŸ'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'AR','Arad'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'B','Bucuresti'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BC','Bacau'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'B','BucureÅŸti'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BC','Bacău'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BH','Bihor'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BN','Bistrita-Nasaud'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BR','Braila'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BT','Botosani'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BV','Brasov'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BZ','Buzau'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BN','BistriÅ£a-Năsăud'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BR','Brăila'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BT','BotoÅŸani'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BV','BraÅŸov'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'BZ','Buzău'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'CJ','Cluj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'CL','Calarasi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'CS','Caras-Severin'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'CT','Constanta'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'CL','CălăraÅŸi'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'CS','CaraÅŸ-Severin'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'CT','ConstanÅ£a'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'CV','Covasna'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'DB','Dâmbovita'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'DB','DâmboviÅ£a'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'DJ','Dolj'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'GJ','Gorj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'GL','Galati'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'GL','GalaÅ£i'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'GR','Giurgiu'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'HD','Hunedoara'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'HG','Harghita'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'IF','Ilfov'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'IL','Ialomita'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'IS','Iasi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'MH','Mehedinti'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'MM','Maramures'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'MS','Mures'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'NT','Neamt'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'IL','IalomiÅ£a'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'IS','IaÅŸi'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'MH','MehedinÅ£i'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'MM','MaramureÅŸ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'MS','MureÅŸ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'NT','NeamÅ£'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'OT','Olt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'PH','Prahova'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'SB','Sibiu'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'SJ','Salaj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'SJ','Sălaj'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'SM','Satu Mare'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'SV','Suceava'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'TL','Tulcea'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'TM','Timis'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'TM','TimiÅŸ'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'TR','Teleorman'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'VL','Vâlcea'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'VL','Vâlcea'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'VN','Vrancea'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (175,'VS','Vaslui'); INSERT INTO lc_countries VALUES (176,'Russia','RU','RUS',":name\n:street_address\n:postcode :city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AD','?????´? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AGB','???´?????-????´????? ??????´???? ?´????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AL','????´? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ALT','????´????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AMU','???´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ARK','????´????????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AST','???????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'BA','???????????´? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'BEL','???????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'BRY','???´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'BU','????´??? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CE','????´????? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CHE','????´??????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CHI','????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CHU','????´????? ??????´???? ?´????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CU','????´????? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'DA','???????´? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'EVE','??????´????? ??????´???? ?´????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'IN','??????´??? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'IRK','????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'IVA','???´??????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KAM','?????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KB','???????´??-?????´????? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KC','??????´???-?????´????? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KDA','????????´????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KEM','??´????????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KGD','??????????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KGN','?????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KHA','????´??????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KHM','??´???-?????´????? ??????´???? ?´????—????´'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KIA','???????´????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KIR','??´??????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KK','????´???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KL','?????´??? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KLU','????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KO','??´?? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KOR','????´????? ??????´???? ?´????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KOS','??????????´? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KR','????´??? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KRS','??´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'LEN','????????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'LIP','??´?????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MAG','??????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ME','????´? ?? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MO','?????´??? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MOS','?????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MOW','??????´'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MUR','??´???????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'NEN','????´???? ??????´???? ?´????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'NGR','???????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'NIZ','????????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'NVS','????????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'OMS','?´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ORE','??????´?????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ORL','????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'PNZ','??´???????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'PRI','?????´????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'PSK','????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ROS','?????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'RYA','????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SA','????´ (???´???) ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SAK','??????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SAM','????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SAR','????´??????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SE','??´?????? ???´???–???´??? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SMO','????´?????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SPE','?????-???????´??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'STA','????????´?????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SVE','???????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TA','?????´????? ????????´?'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TAM','?????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TAY','?????´????? ??????´???? ?´????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TOM','??´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TUL','??´?????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TVE','???????´? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TY','????´ ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TYU','????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'UD','????´?????? ?????´?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ULY','????´??????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'UOB','????-????´????? ????´????? ??????´???? ?´????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'VGG','????????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'VLA','?????´??????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'VLG','??????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'VOR','????´??????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'XXX','??´?????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'YAN','???´??-????´???? ??????´???? ?´????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'YAR','??????´????? ?´??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'YEV','????´????? ??????´???? ?´??????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AD','ÐдыгеÌÑ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AGB','ÐгиÌнÑкий-БурÑÌÑ‚Ñкий автоноÌмный оÌкруг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AL','ÐлтаÌй РеÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ALT','ÐлтаÌйÑкий край'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AMU','ÐмуÌÑ€ÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ARK','ÐрхаÌнгельÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'AST','ÐÑтрахаÌнÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'BA','БашкортоÑтаÌн РеÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'BEL','БелгороÌдÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'BRY','БрÑÌнÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'BU','БурÑÌÑ‚Ð¸Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CE','ЧечеÌнÑÐºÐ°Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CHE','ЧелÑÌбинÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CHI','ЧитиÌнÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CHU','ЧукоÌÑ‚Ñкий автоноÌмный оÌкруг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'CU','ЧуваÌшÑÐºÐ°Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'DA','ДагеÑтаÌн РеÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'EVE','ЭвенкиÌйÑкий автоноÌмный оÌкруг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'IN','ИнгушеÌÑ‚Ð¸Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'IRK','ИркуÌÑ‚ÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'IVA','ИваÌновÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KAM','КамчаÌÑ‚ÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KB','КабардиÌно-БалкаÌÑ€ÑÐºÐ°Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KC','КарачаÌево-ЧеркеÌÑÑÐºÐ°Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KDA','КраÑнодаÌÑ€Ñкий край'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KEM','КеÌмеровÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KGD','КалининграÌдÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KGN','КургаÌнÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KHA','ХабаÌровÑкий край'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KHM','ХаÌнты-МанÑиÌйÑкий автоноÌмный оÌкруг—ЮграÌ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KIA','КраÑноÑÌÑ€Ñкий край'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KIR','КиÌровÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KK','ХакаÌÑиÑ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KL','КалмыÌÐºÐ¸Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KLU','КалуÌжÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KO','КоÌми РеÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KOR','КорÑÌкÑкий автоноÌмный оÌкруг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KOS','КоÑтромÑкаÌÑ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KR','КареÌÐ»Ð¸Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'KRS','КуÌÑ€ÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'LEN','ЛенинграÌдÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'LIP','ЛиÌÐ¿ÐµÑ†ÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MAG','МагадаÌнÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ME','МариÌй Эл РеÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MO','МордоÌÐ²Ð¸Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MOS','МоÑкоÌвÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MOW','МоÑкваÌ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'MUR','МуÌрманÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'NEN','ÐенеÌцкий автоноÌмный оÌкруг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'NGR','ÐовгороÌдÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'NIZ','ÐижегороÌдÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'NVS','ÐовоÑибиÌÑ€ÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'OMS','ОÌмÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ORE','ОренбуÌргÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ORL','ОрлоÌвÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'PNZ','ПеÌнзенÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'PRI','ПримоÌÑ€Ñкий край'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'PSK','ПÑкоÌвÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ROS','РоÑтоÌвÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'RYA','РÑзаÌнÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SA','Ð¡Ð°Ñ…Ð°Ì (ЯкуÌтиÑ) РеÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SAK','СахалиÌнÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SAM','СамаÌÑ€ÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SAR','СараÌтовÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SE','СеÌÐ²ÐµÑ€Ð½Ð°Ñ ÐžÑеÌтиÑ–ÐлаÌÐ½Ð¸Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SMO','СмолÌенÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SPE','Санкт-ПетербуÌрг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'STA','СтавропоÌльÑкий край'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'SVE','СвердлоÌвÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TA','РеÑпуÌблика ТатарÑтаÌн'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TAM','ТамбоÌвÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TAY','ТаймыÌÑ€Ñкий автоноÌмный оÌкруг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TOM','ТоÌмÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TUL','ТуÌльÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TVE','ТверÑкаÌÑ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TY','Ð¢Ñ‹Ð²Ð°Ì Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'TYU','ТюмеÌнÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'UD','УдмуÌртÑÐºÐ°Ñ Ð ÐµÑпуÌблика'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'ULY','УльÑÌновÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'UOB','УÑÑ‚ÑŒ-ОрдыÌнÑкий БурÑÌÑ‚Ñкий автоноÌмный оÌкруг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'VGG','ВолгограÌдÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'VLA','ВладиÌмирÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'VLG','ВологоÌдÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'VOR','ВороÌнежÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'XXX','ПеÌрмÑкий край'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'YAN','ЯмаÌло-ÐенеÌцкий автоноÌмный оÌкруг'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'YAR','ЯроÑлаÌвÑÐºÐ°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (176,'YEV','ЕвреÌйÑÐºÐ°Ñ Ð°Ð²Ñ‚Ð¾Ð½Ð¾ÌÐ¼Ð½Ð°Ñ Ð¾ÌблаÑÑ‚ÑŒ'); INSERT INTO lc_countries VALUES (177,'Rwanda','RW','RWA',''); @@ -4693,24 +4693,24 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (182,'SE','S INSERT INTO lc_countries VALUES (183,'Sao Tome and Principe','ST','STP',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (183,'P','Príncipe'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (183,'S','São Tomé'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (183,'P','Príncipe'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (183,'S','São Tomé'); INSERT INTO lc_countries VALUES (184,'Saudi Arabia','SA','SAU',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'01','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'02','??? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'03','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'04','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'05','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'06','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'07','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'08','?????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'09','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'10','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'11','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'12','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'14','????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'01','الرياض'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'02','مكة المكرمة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'03','المدينه'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'04','الشرقية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'05','القصيم'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'06','حائل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'07','تبوك'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'08','الحدود الشمالية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'09','جيزان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'10','نجران'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'11','الباحة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'12','الجوÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (184,'14','عسير'); INSERT INTO lc_countries VALUES (185,'Senegal','SN','SEN',''); @@ -4763,18 +4763,18 @@ INSERT INTO lc_countries VALUES (188,'Singapore','SG','SGP', ":name\n:street_add INSERT INTO lc_countries VALUES (189,'Slovakia','SK','SVK',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'BC','Banskobystrický kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'BL','Bratislavský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'KI','Košický kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'NJ','Nitrianský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'PV','Prešovský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'TA','Trnavský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'TC','Trencianský kraj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'ZI','Žilinský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'BC','Banskobystrický kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'BL','Bratislavský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'KI','KoÅ¡ický kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'NJ','Nitrianský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'PV','PreÅ¡ovský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'TA','Trnavský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'TC','TrenÄianský kraj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (189,'ZI','Žilinský kraj'); INSERT INTO lc_countries VALUES (190,'Slovenia','SI','SVN',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'001','Ajdovšcina'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'001','AjdovÅ¡Äina'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'002','Beltinci'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'003','Bled'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'004','Bohinj'); @@ -4782,55 +4782,55 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'005',' INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'006','Bovec'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'007','Brda'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'008','Brezovica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'009','Brežice'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'010','Tišina'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'009','Brežice'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'010','TiÅ¡ina'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'011','Celje'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'012','Cerklje na Gorenjskem'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'013','Cerknica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'014','Cerkno'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'015','Crenšovci'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'016','Crna na Koroškem'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'017','Crnomelj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'015','ÄŒrenÅ¡ovci'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'016','ÄŒrna na KoroÅ¡kem'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'017','ÄŒrnomelj'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'018','Destrnik'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'019','Divaca'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'019','DivaÄa'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'020','Dobrepolje'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'021','Dobrova-Polhov Gradec'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'022','Dol pri Ljubljani'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'023','Domžale'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'023','Domžale'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'024','Dornava'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'025','Dravograd'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'026','Duplek'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'027','Gorenja vas-Poljane'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'028','Gorišnica'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'028','GoriÅ¡nica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'029','Gornja Radgona'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'030','Gornji Grad'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'031','Gornji Petrovci'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'032','Grosuplje'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'033','Šalovci'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'033','Å alovci'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'034','Hrastnik'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'035','Hrpelje-Kozina'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'036','Idrija'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'037','Ig'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'038','Ilirska Bistrica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'039','Ivancna Gorica'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'039','IvanÄna Gorica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'040','Izola'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'041','Jesenice'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'042','Juršinci'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'042','JurÅ¡inci'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'043','Kamnik'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'044','Kanal ob Soci'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'045','Kidricevo'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'044','Kanal ob SoÄi'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'045','KidriÄevo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'046','Kobarid'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'047','Kobilje'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'048','Kocevje'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'048','KoÄevje'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'049','Komen'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'050','Koper'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'051','Kozje'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'052','Kranj'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'053','Kranjska Gora'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'054','Krško'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'054','KrÅ¡ko'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'055','Kungota'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'056','Kuzma'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'057','Laško'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'057','LaÅ¡ko'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'058','Lenart'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'059','Lendava'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'060','Litija'); @@ -4838,19 +4838,19 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'061',' INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'062','Ljubno'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'063','Ljutomer'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'064','Logatec'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'065','Loška Dolina'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'066','Loški Potok'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'067','Luce'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'065','LoÅ¡ka Dolina'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'066','LoÅ¡ki Potok'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'067','LuÄe'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'068','Lukovica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'069','Majšperk'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'069','MajÅ¡perk'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'070','Maribor'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'071','Medvode'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'072','Mengeš'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'072','MengeÅ¡'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'073','Metlika'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'074','Mežica'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'074','Mežica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'075','Miren-Kostanjevica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'076','Mislinja'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'077','Moravce'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'077','MoravÄe'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'078','Moravske Toplice'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'079','Mozirje'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'080','Murska Sobota'); @@ -4860,54 +4860,54 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'083',' INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'084','Nova Gorica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'085','Novo mesto'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'086','Odranci'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'087','Ormož'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'087','Ormož'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'088','Osilnica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'089','Pesnica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'090','Piran'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'091','Pivka'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'092','Podcetrtek'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'092','PodÄetrtek'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'093','Podvelka'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'094','Postojna'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'095','Preddvor'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'096','Ptuj'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'097','Puconci'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'098','Race-Fram'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'099','Radece'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'098','RaÄe-Fram'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'099','RadeÄe'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'100','Radenci'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'101','Radlje ob Dravi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'102','Radovljica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'103','Ravne na Koroškem'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'103','Ravne na KoroÅ¡kem'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'104','Ribnica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'106','Rogaška Slatina'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'105','Rogašovci'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'106','RogaÅ¡ka Slatina'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'105','RogaÅ¡ovci'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'107','Rogatec'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'108','Ruše'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'109','Semic'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'108','RuÅ¡e'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'109','SemiÄ'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'110','Sevnica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'111','Sežana'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'111','Sežana'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'112','Slovenj Gradec'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'113','Slovenska Bistrica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'114','Slovenske Konjice'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'115','Starše'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'115','StarÅ¡e'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'116','Sveti Jurij'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'117','Šencur'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'118','Šentilj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'119','Šentjernej'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'120','Šentjur pri Celju'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'121','Škocjan'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'122','Škofja Loka'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'123','Škofljica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'124','Šmarje pri Jelšah'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'125','Šmartno ob Paki'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'126','Šoštanj'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'127','Štore'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'117','Å enÄur'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'118','Å entilj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'119','Å entjernej'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'120','Å entjur pri Celju'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'121','Å kocjan'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'122','Å kofja Loka'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'123','Å kofljica'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'124','Å marje pri JelÅ¡ah'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'125','Å martno ob Paki'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'126','Å oÅ¡tanj'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'127','Å tore'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'128','Tolmin'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'129','Trbovlje'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'130','Trebnje'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'131','Tržic'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'132','Turnišce'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'131','TržiÄ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'132','TurniÅ¡Äe'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'133','Velenje'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'134','Velike Lašce'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'134','Velike LaÅ¡Äe'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'135','Videm'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'136','Vipava'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'137','Vitanje'); @@ -4916,14 +4916,14 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'139',' INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'140','Vrhnika'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'141','Vuzenica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'142','Zagorje ob Savi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'143','Zavrc'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'144','Zrece'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'146','Železniki'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'147','Žiri'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'143','ZavrÄ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'144','ZreÄe'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'146','Železniki'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'147','Žiri'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'148','Benedikt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'149','Bistrica ob Sotli'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'150','Bloke'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'151','Braslovce'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'151','BraslovÄe'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'152','Cankova'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'153','Cerkvenjak'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'154','Dobje'); @@ -4932,41 +4932,41 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'156',' INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'157','Dolenjske Toplice'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'158','Grad'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'159','Hajdina'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'160','Hoce-Slivnica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'161','Hodoš'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'160','HoÄe-Slivnica'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'161','HodoÅ¡'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'162','Horjul'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'163','Jezersko'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'164','Komenda'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'165','Kostel'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'166','Križevci'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'166','Križevci'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'167','Lovrenc na Pohorju'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'168','Markovci'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'169','Miklavž na Dravskem polju'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'170','Mirna Pec'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'169','Miklavž na Dravskem polju'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'170','Mirna PeÄ'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'171','Oplotnica'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'172','Podlehnik'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'173','Polzela'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'174','Prebold'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'175','Prevalje'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'176','Razkrižje'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'176','Razkrižje'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'177','Ribnica na Pohorju'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'178','Selnica ob Dravi'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'179','Sodražica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'180','Solcava'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'179','Sodražica'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'180','SolÄava'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'181','Sveta Ana'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'182','Sveti Andraž v Slovenskih goricah'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'183','Šempeter-Vrtojba'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'182','Sveti Andraž v Slovenskih goricah'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'183','Å empeter-Vrtojba'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'184','Tabor'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'185','Trnovska vas'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'186','Trzin'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'187','Velika Polana'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'188','Veržej'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'188','Veržej'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'189','Vransko'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'190','Žalec'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'191','Žetale'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'192','Žirovnica'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'193','Žužemberk'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'194','Šmartno pri Litiji'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'190','Žalec'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'191','Žetale'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'192','Žirovnica'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'193','Žužemberk'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (190,'194','Å martno pri Litiji'); INSERT INTO lc_countries VALUES (191,'Solomon Islands','SB','SLB',''); @@ -5018,27 +5018,27 @@ INSERT INTO lc_countries VALUES (194,'South Georgia and the South Sandwich Islan INSERT INTO lc_countries VALUES (195,'Spain','ES','ESP',":name\n:street_address\n:postcode :city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AN','Andalucía'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AR','Aragón'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AN','Andalucía'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AR','Aragón'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'A','Alicante'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AB','Albacete'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AL','Almería'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AN','Andalucía'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AV','Ávila'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AL','Almería'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AN','Andalucía'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'AV','Ãvila'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'B','Barcelona'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'BA','Badajoz'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'BI','Vizcaya'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'BU','Burgos'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'C','A Coruña'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CA','Cádiz'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CC','Cáceres'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'C','A Coruña'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CA','Cádiz'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CC','Cáceres'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CE','Ceuta'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CL','Castilla y León'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CL','Castilla y León'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CM','Castilla-La Mancha'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CN','Islas Canarias'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CO','Córdoba'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CO','Córdoba'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CR','Ciudad Real'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CS','Castellón'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CS','Castellón'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CT','Catalonia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'CU','Cuenca'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'EX','Extremadura'); @@ -5050,13 +5050,13 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'GU','G INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'H','Huelva'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'HU','Huesca'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'IB','Islas Baleares'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'J','Jaén'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'J','Jaén'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'L','Lleida'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'LE','León'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'LE','León'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'LO','La Rioja'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'LU','Lugo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'M','Madrid'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'MA','Málaga'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'MA','Málaga'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'ML','Melilla'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'MU','Murcia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'NA','Navarre'); @@ -5071,14 +5071,14 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'SA','S INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'SE','Seville'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'SG','Segovia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'SO','Soria'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'SS','Guipúzcoa'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'SS','Guipúzcoa'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'T','Tarragona'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'TE','Teruel'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'TF','Santa Cruz De Tenerife'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'TO','Toledo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'V','Valencia'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'VA','Valladolid'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'VI','Álava'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'VI','Ãlava'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'Z','Zaragoza'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (195,'ZA','Zamora'); @@ -5099,32 +5099,32 @@ INSERT INTO lc_countries VALUES (198,'St. Pierre and Miquelon','PM','SPM',''); INSERT INTO lc_countries VALUES (199,'Sudan','SD','SDN',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'ANL','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'BAM','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'BRT','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'JZR','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'KRT','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'QDR','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'WDH','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'ANB','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'ANZ','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'ASH','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'BJA','?????????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'GIS','??? ??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'GBG','??? ??? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'GDA','??? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'GKU','??? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'JDA','???? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'JKU','???? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'JQL','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'KSL','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'NNL','????? ??? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SBG','???? ??? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SDA','???? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SKU','???? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SIS','??? ??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SNR','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'WRB','?????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'ANL','أعالي النيل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'BAM','البحر الأحمر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'BRT','البحيرات'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'JZR','ولاية الجزيرة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'KRT','الخرطوم'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'QDR','القضارÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'WDH','الوحدة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'ANB','النيل الأبيض'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'ANZ','النيل الأزرق'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'ASH','الشمالية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'BJA','الاستوائية الوسطى'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'GIS','غرب الاستوائية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'GBG','غرب بحر الغزال'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'GDA','غرب دارÙور'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'GKU','غرب كردÙان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'JDA','جنوب دارÙور'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'JKU','جنوب كردÙان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'JQL','جونقلي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'KSL','كسلا'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'NNL','ولاية نهر النيل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SBG','شمال بحر الغزال'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SDA','شمال دارÙور'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SKU','شمال كردÙان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SIS','شرق الاستوائية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'SNR','سنار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (199,'WRB','واراب'); INSERT INTO lc_countries VALUES (200,'Suriname','SR','SUR',''); @@ -5150,31 +5150,31 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (202,'SH','S INSERT INTO lc_countries VALUES (203,'Sweden','SE','SWE',":name\n:street_address\n:postcode :city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'AB','Stockholms län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'C','Uppsala län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'D','Södermanlands län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'E','Östergötlands län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'F','Jönköpings län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'G','Kronobergs län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'H','Kalmar län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'I','Gotlands län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'K','Blekinge län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'M','Skåne län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'N','Hallands län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'O','Västra Götalands län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'S','Värmlands län;'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'T','Örebro län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'U','Västmanlands län;'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'W','Dalarnas län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'X','Gävleborgs län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'Y','Västernorrlands län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'Z','Jämtlands län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'AC','Västerbottens län'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'BD','Norrbottens län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'AB','Stockholms län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'C','Uppsala län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'D','Södermanlands län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'E','Östergötlands län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'F','Jönköpings län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'G','Kronobergs län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'H','Kalmar län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'I','Gotlands län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'K','Blekinge län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'M','SkÃ¥ne län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'N','Hallands län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'O','Västra Götalands län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'S','Värmlands län;'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'T','Örebro län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'U','Västmanlands län;'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'W','Dalarnas län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'X','Gävleborgs län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'Y','Västernorrlands län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'Z','Jämtlands län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'AC','Västerbottens län'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (203,'BD','Norrbottens län'); INSERT INTO lc_countries VALUES (204,'Switzerland','CH','CHE',":name\n:street_address\n:postcode :city\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'ZH','Zürich'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'ZH','Zürich'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'BE','Bern'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'LU','Luzern'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'UR','Uri'); @@ -5191,64 +5191,64 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'SH','S INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'AR','Appenzell Ausserrhoden'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'AI','Appenzell Innerrhoden'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'SG','Saint Gallen'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'GR','Graubünden'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'GR','Graubünden'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'AG','Aargau'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'TG','Thurgau'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'TI','Ticino'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'VD','Vaud'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'VS','Valais'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'NE','Nuechâtel'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'GE','Genève'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'NE','Nuechâtel'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'GE','Genève'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (204,'JU','Jura'); INSERT INTO lc_countries VALUES (205,'Syrian Arab Republic','SY','SYR',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'DI','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'DR','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'DZ','??? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'HA','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'HI','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'HL','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'HM','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'ID','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'LA','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'QU','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'RA','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'RD','??? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'SU','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'TA','?????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'DI','دمشق'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'DR','درعا'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'DZ','دير الزور'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'HA','الحسكة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'HI','حمص'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'HL','حلب'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'HM','حماه'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'ID','ادلب'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'LA','اللاذقية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'QU','القنيطرة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'RA','الرقة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'RD','ری٠دمشق'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'SU','السويداء'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (205,'TA','طرطوس'); INSERT INTO lc_countries VALUES (206,'Taiwan','TW','TWN',":name\n:street_address\n:city :postcode\n:country"); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'CHA','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'CYI','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'CYQ','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'HSQ','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'HSZ','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'HUA','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'ILA','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'KEE','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'KHH','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'KHQ','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'MIA','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'NAN','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'PEN','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'PIF','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TAO','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TNN','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TNQ','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TPE','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TPQ','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TTT','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TXG','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TXQ','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'YUN','???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'CHA','彰化縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'CYI','嘉義市'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'CYQ','嘉義縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'HSQ','新竹縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'HSZ','新竹市'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'HUA','花蓮縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'ILA','宜蘭縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'KEE','基隆市'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'KHH','高雄市'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'KHQ','高雄縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'MIA','苗栗縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'NAN','å—投縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'PEN','澎湖縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'PIF','å±æ±ç¸£'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TAO','桃æºåŽ¿'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TNN','å°å—市'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TNQ','å°å—縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TPE','臺北市'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TPQ','臺北縣'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TTT','å°æ±ç¸£'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TXG','å°ä¸­å¸‚'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'TXQ','å°ä¸­ç¸£'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (206,'YUN','雲林縣'); INSERT INTO lc_countries VALUES (207,'Tajikistan','TJ','TJK',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (207,'GB','??????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (207,'KT','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (207,'SU','???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (207,'GB','کوهستان بدخشان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (207,'KT','ختلان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (207,'SU','سغد'); INSERT INTO lc_countries VALUES (208,'Tanzania','TZ','TZA',''); @@ -5266,7 +5266,7 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'11','Z INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'12','Lindi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'13','Mara'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'14','Mbeya'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'15','Zanzibar Západ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'15','Zanzibar Západ'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'16','Morogoro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'17','Mtwara'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'18','Mwanza'); @@ -5281,80 +5281,80 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (208,'26','M INSERT INTO lc_countries VALUES (209,'Thailand','TH','THA',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-10','?????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-11','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-12','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-13','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-14','???????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-15','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-16','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-17','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-18','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-19','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-20','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-21','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-22','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-23','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-24','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-25','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-26','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-27','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-30','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-31','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-32','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-33','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-34','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-35','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-36','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-37','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-39','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-40','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-41','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-42','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-43','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-44','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-45','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-46','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-47','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-48','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-49','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-50','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-51','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-52','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-53','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-55','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-56','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-57','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-58','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-60','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-61','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-62','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-63','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-64','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-66','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-67','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-70','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-71','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-72','??????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-73','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-74','?????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-75','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-76','????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-77','???????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-80','?????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-81','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-82','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-83','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-84','????????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-85','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-86','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-90','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-91','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-92','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-93','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-94','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-95','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-96','????????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-10','à¸à¸£à¸¸à¸‡à¹€à¸—พมหานคร'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-11','สมุทรปราà¸à¸²à¸£'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-12','นนทบุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-13','ปทุมธานี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-14','พระนครศรีอยุธยา'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-15','อ่างทอง'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-16','ลพบุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-17','สิงห์บุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-18','ชัยนาท'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-19','สระบุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-20','ชลบุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-21','ระยอง'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-22','จันทบุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-23','ตราด'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-24','ฉะเชิงเทรา'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-25','ปราจีนบุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-26','นครนายà¸'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-27','สระà¹à¸à¹‰à¸§'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-30','นครราชสีมา'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-31','บุรีรัมย์'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-32','สุรินทร์'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-33','ศรีสะเà¸à¸©'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-34','อุบลราชธานี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-35','ยโสธร'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-36','ชัยภูมิ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-37','อำนาจเจริà¸'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-39','หนองบัวลำภู'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-40','ขอนà¹à¸à¹ˆà¸™'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-41','อุดรธานี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-42','เลย'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-43','หนองคาย'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-44','มหาสารคาม'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-45','ร้อยเอ็ด'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-46','à¸à¸²à¸¬à¸ªà¸´à¸™à¸˜à¸¸à¹Œ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-47','สà¸à¸¥à¸™à¸„ร'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-48','นครพนม'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-49','มุà¸à¸”าหาร'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-50','เชียงใหม่'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-51','ลำพูน'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-52','ลำปาง'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-53','อุตรดิตถ์'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-55','น่าน'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-56','พะเยา'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-57','เชียงราย'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-58','à¹à¸¡à¹ˆà¸®à¹ˆà¸­à¸‡à¸ªà¸­à¸™'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-60','นครสวรรค์'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-61','อุทัยธานี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-62','à¸à¸³à¹à¸žà¸‡à¹€à¸žà¸Šà¸£'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-63','ตาà¸'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-64','สุโขทัย'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-66','ชุมพร'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-67','พิจิตร'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-70','ราชบุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-71','à¸à¸²à¸à¸ˆà¸™à¸šà¸¸à¸£à¸µ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-72','สุพรรณบุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-73','นครปà¸à¸¡'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-74','สมุทรสาคร'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-75','สมุทรสงคราม'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-76','เพชรบุรี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-77','ประจวบคีรีขันธ์'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-80','นครศรีธรรมราช'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-81','à¸à¸£à¸°à¸šà¸µà¹ˆ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-82','พังงา'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-83','ภูเà¸à¹‡à¸•'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-84','สุราษฎร์ธานี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-85','ระนอง'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-86','ชุมพร'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-90','สงขลา'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-91','สตูล'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-92','ตรัง'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-93','พัทลุง'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-94','ปัตตานี'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-95','ยะลา'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (209,'TH-96','นราธิวาส'); INSERT INTO lc_countries VALUES (210,'Togo','TG','TGO',''); @@ -5397,84 +5397,84 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (213,'WTO',' INSERT INTO lc_countries VALUES (214,'Tunisia','TN','TUN',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'11','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'12','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'13','????? ?? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'14','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'21','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'22','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'23','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'31','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'32','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'33','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'34','????? ??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'41','????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'42','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'43','????? ???? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'51','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'52','????? ????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'53','????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'61','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'71','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'72','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'73','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'81','????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'82','????? ?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'83','????? ??????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'11','ولاية تونس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'12','ولاية أريانة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'13','ولاية بن عروس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'14','ولاية منوبة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'21','ولاية نابل'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'22','ولاية زغوان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'23','ولاية بنزرت'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'31','ولاية باجة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'32','ولاية جندوبة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'33','ولاية الكاÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'34','ولاية سليانة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'41','ولاية القيروان'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'42','ولاية القصرين'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'43','ولاية سيدي بوزيد'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'51','ولاية سوسة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'52','ولاية المنستير'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'53','ولاية المهدية'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'61','ولاية صÙاقس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'71','ولاية Ù‚Ùصة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'72','ولاية توزر'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'73','ولاية قبلي'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'81','ولاية قابس'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'82','ولاية مدنين'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (214,'83','ولاية تطاوين'); INSERT INTO lc_countries VALUES (215,'Turkey','TR','TUR',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'01','Adana'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'02','Adiyaman'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'02','Adıyaman'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'03','Afyonkarahisar'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'04','Agri'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'04','AÄŸrı'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'05','Amasya'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'06','Ankara'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'07','Antalya'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'08','Artvin'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'09','Aydin'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'10','Balikesir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'09','Aydın'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'10','Balıkesir'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'11','Bilecik'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'12','Bingöl'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'12','Bingöl'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'13','Bitlis'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'14','Bolu'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'15','Burdur'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'16','Bursa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'17','Çanakkale'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'18','Çankiri'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'19','Çorum'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'17','Çanakkale'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'18','Çankırı'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'19','Çorum'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'20','Denizli'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'21','Diyarbakir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'21','Diyarbakır'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'22','Edirne'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'23','Elazig'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'23','Elazığ'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'24','Erzincan'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'25','Erzurum'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'26','Eskisehir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'26','EskiÅŸehir'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'27','Gaziantep'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'28','Giresun'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'29','Gümüshane'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'29','Gümüşhane'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'30','Hakkari'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'31','Hatay'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'32','Isparta'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'33','Mersin'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'34','Istanbul'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'35','Izmir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'34','Ä°stanbul'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'35','Ä°zmir'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'36','Kars'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'37','Kastamonu'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'38','Kayseri'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'39','Kirklareli'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'40','Kirsehir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'39','Kırklareli'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'40','KırÅŸehir'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'41','Kocaeli'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'42','Konya'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'43','Kütahya'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'43','Kütahya'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'44','Malatya'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'45','Manisa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'46','Kahramanmaras'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'46','KahramanmaraÅŸ'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'47','Mardin'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'48','Mugla'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'49','Mus'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'50','Nevsehir'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'51','Nigde'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'48','MuÄŸla'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'49','MuÅŸ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'50','NevÅŸehir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'51','NiÄŸde'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'52','Ordu'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'53','Rize'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'54','Sakarya'); @@ -5482,37 +5482,37 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'55','S INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'56','Siirt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'57','Sinop'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'58','Sivas'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'59','Tekirdag'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'59','TekirdaÄŸ'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'60','Tokat'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'61','Trabzon'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'62','Tunceli'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'63','Sanliurfa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'64','Usak'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'63','Åžanlıurfa'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'64','UÅŸak'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'65','Van'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'66','Yozgat'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'67','Zonguldak'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'68','Aksaray'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'69','Bayburt'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'70','Karaman'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'71','Kirikkale'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'71','Kırıkkale'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'72','Batman'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'73','Sirnak'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'74','Bartin'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'73','Şırnak'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'74','Bartın'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'75','Ardahan'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'76','Igdir'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'76','IÄŸdır'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'77','Yalova'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'78','Karabük'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'78','Karabük'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'79','Kilis'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'80','Osmaniye'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'81','Düzce'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (215,'81','Düzce'); INSERT INTO lc_countries VALUES (216,'Turkmenistan','TM','TKM',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'A','Ahal welaýaty'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'B','Balkan welaýaty'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'D','Dasoguz welaýaty'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'L','Lebap welaýaty'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'M','Mary welaýaty'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'A','Ahal welaýaty'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'B','Balkan welaýaty'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'D','DaÅŸoguz welaýaty'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'L','Lebap welaýaty'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (216,'M','Mary welaýaty'); INSERT INTO lc_countries VALUES (217,'Turks and Caicos Islands','TC','TCA',''); @@ -5603,33 +5603,33 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (219,'415',' INSERT INTO lc_countries VALUES (220,'Ukraine','UA','UKR',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'05','????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'07','????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'09','????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'12','???????????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'14','???????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'18','??????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'19','?????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'21','???????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'23','?????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'26','?????-??????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'30','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'32','???????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'35','?????????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'40','???????????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'43','?????????? ?????????? ????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'46','????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'48','???????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'51','??????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'53','?????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'59','??????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'61','????????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'63','?????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'65','?????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'68','??????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'71','????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'74','???????????? ???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'77','??????????? ???????'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'05','Вінницька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'07','ВолинÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'09','ЛуганÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'12','ДніпропетровÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'14','Донецька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'18','ЖитомирÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'19','РівненÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'21','ЗакарпатÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'23','Запорізька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'26','Івано-ФранківÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'30','Київ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'32','КиївÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'35','КіровоградÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'40','СеваÑтополь'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'43','ÐÐ²Ñ‚Ð¾Ð½Ð¾Ð¼Ð½Ð°Ñ Ð ÐµÑпублика Крым'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'46','ЛьвівÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'48','МиколаївÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'51','ОдеÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'53','ПолтавÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'59','СумÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'61','ТернопільÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'63','ХарківÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'65','ХерÑонÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'68','Хмельницька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'71','ЧеркаÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'74','ЧернігівÑька облаÑÑ‚ÑŒ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (220,'77','Чернівецька облаÑÑ‚ÑŒ'); INSERT INTO lc_countries VALUES (221,'United Arab Emirates','AE','ARE',''); @@ -5953,13 +5953,13 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'LA','L INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'MA','Maldonado'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'MO','Montevideo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'PA','Paysandu'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'RN','Río Negro'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'RN','Río Negro'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'RO','Rocha'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'RV','Rivera'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'SA','Salto'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'SJ','San José'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'SJ','San José'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'SO','Soriano'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'TA','Tacuarembó'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'TA','Tacuarembó'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (225,'TT','Treinta y Tres'); INSERT INTO lc_countries VALUES (226,'Uzbekistan','UZ','UZB',''); @@ -5982,10 +5982,10 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (226,'XO','X INSERT INTO lc_countries VALUES (227,'Vanuatu','VU','VUT',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (227,'MAP','Malampa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (227,'PAM','Pénama'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (227,'PAM','Pénama'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (227,'SAM','Sanma'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (227,'SEE','Shéfa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (227,'TAE','Taféa'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (227,'SEE','Shéfa'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (227,'TAE','Taféa'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (227,'TOB','Torba'); INSERT INTO lc_countries VALUES (228,'Vatican City State (Holy See)','VA','VAT',''); @@ -5993,17 +5993,17 @@ INSERT INTO lc_countries VALUES (228,'Vatican City State (Holy See)','VA','VAT', INSERT INTO lc_countries VALUES (229,'Venezuela','VE','VEN',''); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'A','Distrito Capital'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'B','Anzoátegui'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'B','Anzoátegui'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'C','Apure'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'D','Aragua'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'E','Barinas'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'F','Bolívar'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'F','Bolívar'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'G','Carabobo'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'H','Cojedes'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'I','Falcón'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'J','Guárico'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'I','Falcón'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'J','Guárico'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'K','Lara'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'L','Mérida'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'L','Mérida'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'M','Miranda'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'N','Monagas'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'O','Nueva Esparta'); @@ -6020,70 +6020,70 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (229,'Z','Am INSERT INTO lc_countries VALUES (230,'Vietnam','VN','VNM',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'01','Lai Châu'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'02','Lào Cai'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'03','Hà Giang'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'04','Cao B?ng'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'05','Son La'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'06','Yên Bái'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'07','Tuyên Quang'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'09','L?ng Son'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'13','Qu?ng Ninh'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'14','Hòa Bình'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'15','Hà Tây'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'18','Ninh Bình'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'20','Thái Bình'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'21','Thanh Hóa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'22','Ngh? An'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'23','Hà Tinh'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'24','Qu?ng Bình'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'25','Qu?ng Tr?'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'26','Th?a Thiên-Hu?'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'27','Qu?ng Nam'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'01','Lai Châu'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'02','Lào Cai'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'03','Hà Giang'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'04','Cao Bằng'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'05','SÆ¡n La'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'06','Yên Bái'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'07','Tuyên Quang'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'09','Lạng SÆ¡n'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'13','Quảng Ninh'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'14','Hòa Bình'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'15','Hà Tây'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'18','Ninh Bình'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'20','Thái Bình'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'21','Thanh Hóa'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'22','Nghệ An'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'23','Hà TÄ©nh'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'24','Quảng Bình'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'25','Quảng Trị'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'26','Thừa Thiên-Huế'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'27','Quảng Nam'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'28','Kon Tum'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'29','Qu?ng Ngãi'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'29','Quảng Ngãi'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'30','Gia Lai'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'31','Bình Ð?nh'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'32','Phú Yên'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'33','Ð?k L?k'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'34','Khánh Hòa'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'35','Lâm Ð?ng'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'36','Ninh Thu?n'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'37','Tây Ninh'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'39','Ð?ng Nai'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'40','Bình Thu?n'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'31','Bình Äịnh'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'32','Phú Yên'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'33','Äắk Lắk'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'34','Khánh Hòa'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'35','Lâm Äồng'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'36','Ninh Thuận'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'37','Tây Ninh'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'39','Äồng Nai'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'40','Bình Thuận'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'41','Long An'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'43','Bà R?a-Vung Tàu'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'43','Bà Rịa-VÅ©ng Tàu'); INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'44','An Giang'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'45','Ð?ng Tháp'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'46','Ti?n Giang'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'47','Kiên Giang'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'48','C?n Tho'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'49','Vinh Long'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'50','B?n Tre'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'51','Trà Vinh'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'52','Sóc Trang'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'53','B?c K?n'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'54','B?c Giang'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'55','B?c Liêu'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'56','B?c Ninh'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'57','Bình Duong'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'58','Bình Phu?c'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'59','Cà Mau'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'60','Ðà N?ng'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'61','H?i Duong'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'62','H?i Phòng'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'63','Hà Nam'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'64','Hà N?i'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'65','Sài Gòn'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'66','Hung Yên'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'67','Nam Ð?nh'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'68','Phú Th?'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'69','Thái Nguyên'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'70','Vinh Phúc'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'71','Ði?n Biên'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'72','Ð?k Nông'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'73','H?u Giang'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'45','Äồng Tháp'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'46','Tiá»n Giang'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'47','Kiên Giang'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'48','Cần ThÆ¡'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'49','VÄ©nh Long'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'50','Bến Tre'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'51','Trà Vinh'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'52','Sóc Trăng'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'53','Bắc Kạn'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'54','Bắc Giang'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'55','Bạc Liêu'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'56','Bắc Ninh'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'57','Bình DÆ°Æ¡ng'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'58','Bình PhÆ°á»›c'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'59','Cà Mau'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'60','Äà Nẵng'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'61','Hải DÆ°Æ¡ng'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'62','Hải Phòng'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'63','Hà Nam'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'64','Hà Ná»™i'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'65','Sài Gòn'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'66','HÆ°ng Yên'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'67','Nam Äịnh'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'68','Phú Thá»'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'69','Thái Nguyên'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'70','VÄ©nh Phúc'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'71','Äiện Biên'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'72','Äắk Nông'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (230,'73','Hậu Giang'); INSERT INTO lc_countries VALUES (231,'Virgin Islands (British)','VG','VGB',''); INSERT INTO lc_countries VALUES (232,'Virgin Islands (U.S.)','VI','VIR',''); @@ -6101,25 +6101,25 @@ INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (233,'W','Wa INSERT INTO lc_countries VALUES (234,'Western Sahara','EH','ESH',''); INSERT INTO lc_countries VALUES (235,'Yemen','YE','YEM',''); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'AB','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'AD','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'AM','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'BA','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'DA','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'DH','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'HD','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'HJ','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'HU','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'IB','??'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'JA','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'LA','???'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'MA','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'MR','??????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'MW','???????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'SD','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'SN','?????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'SH','????'); -INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'TA','???'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'AB','أبين‎'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'AD','عدن'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'AM','عمران'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'BA','البيضاء'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'DA','الضالع'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'DH','ذمار'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'HD','حضرموت'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'HJ','حجة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'HU','الحديدة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'IB','إب'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'JA','الجوÙ'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'LA','لحج'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'MA','مأرب'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'MR','المهرة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'MW','المحويت'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'SD','صعدة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'SN','صنعاء'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'SH','شبوة'); +INSERT INTO lc_zones (zone_country_id, zone_code, zone_name) VALUES (235,'TA','تعز'); INSERT INTO lc_countries VALUES (236,'Yugoslavia','YU','YUG',''); INSERT INTO lc_countries VALUES (237,'Zaire','ZR','ZAR',''); @@ -6189,9 +6189,6 @@ INSERT INTO lc_currencies (currencies_id, title, code, symbol_left, symbol_right INSERT INTO lc_currencies (currencies_id, title, code, symbol_left, symbol_right, decimal_places, value, last_updated) VALUES(2, 'Euro', 'EUR', '€', '', '2', 0.726579, '2014-03-03 09:59:23'); INSERT INTO lc_currencies (currencies_id, title, code, symbol_left, symbol_right, decimal_places, value, last_updated) VALUES(3, 'British Pounds', 'GBP', '£', '', '2', 0.598311, '2014-03-03 09:59:23'); -INSERT INTO lc_customers_access (id, level, status) VALUES(1, 'Guest', 1); -INSERT INTO lc_customers_access (id, level, status) VALUES(2, 'Registered', 1); - INSERT INTO lc_customers_groups (customers_group_id, language_id, customers_group_name) VALUES(1, 1, 'Registered'); INSERT INTO lc_customers_groups (customers_group_id, language_id, customers_group_name) VALUES(2, 1, 'Wholesale'); diff --git a/catalog/templates/core.php b/catalog/templates/core.php index 4d24e9a9a..6ce51824c 100644 --- a/catalog/templates/core.php +++ b/catalog/templates/core.php @@ -263,7 +263,7 @@ if (file_exists('includes/javascript/general.js.php')) { $lC_Template->addJavascriptPhpFilename('includes/javascript/general.js.php'); } - // template specific js + // template specific js if (file_exists('templates/' . $lC_Template->getCode() . '/javascript/general.js.php')) { $lC_Template->addJavascriptPhpFilename('templates/' . $lC_Template->getCode() . '/javascript/general.js.php'); } diff --git a/catalog/templates/core/content/products/info.php b/catalog/templates/core/content/products/info.php index 385112681..b2ea7af83 100644 --- a/catalog/templates/core/content/products/info.php +++ b/catalog/templates/core/content/products/info.php @@ -79,9 +79,9 @@ hasSubProducts($lC_Product->getID()) === false) { ?> -
    - getPriceFormated(true); ?> - +
    + getPriceFormated(true); ?> +
    Date: Fri, 11 Jul 2014 10:20:48 -0400 Subject: [PATCH 045/168] merge work --- catalog/includes/classes/utility.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/catalog/includes/classes/utility.php b/catalog/includes/classes/utility.php index c32d0cd44..4d58e6be2 100644 --- a/catalog/includes/classes/utility.php +++ b/catalog/includes/classes/utility.php @@ -469,8 +469,7 @@ public static function isPro() { $Qcheck->freeResult(); - //if ($isPro && file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/controller.php')) { - if ($isPro) { + if ($isPro && file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/controller.php')) { return true; } From 18add9331b149889010b13ce962a358466bc272c Mon Sep 17 00:00:00 2001 From: datazen Date: Fri, 11 Jul 2014 11:17:24 -0400 Subject: [PATCH 046/168] merge work --- .../categories/classes/categories.php | 145 +++ .../classes/product_classes.php | 219 +++++ .../product_classes/classes/rpc.php | 78 ++ .../product_classes/js/product_classes.js.php | 39 + .../product_classes/modal/delete.php | 94 ++ .../product_classes/modal/edit.php | 117 +++ .../product_classes/modal/new.php | 115 +++ .../product_classes/pages/main.php | 60 ++ .../product_classes/product_classes.php | 28 + .../products/classes/products.php | 871 ++++++++++++++++++ .../applications/products/classes/rpc.php | 30 + .../products/modal/addComboOption.php | 603 ++++++++++++ .../pages/tabs/options_subproducts.inc.php | 347 +++++++ .../products/pages/tabs/pricing_qpb.inc.php | 127 +++ .../admin/hooks/categories_save.xml | 13 + .../admin/hooks/customers_listing.xml | 13 + .../admin/hooks/database_tables.xml | 13 + .../admin/hooks/product_actions_save.xml | 17 + .../admin/hooks/product_classes.xml | 28 + .../admin/hooks/product_edit_data.xml | 17 + .../admin/hooks/product_edit_images.xml | 17 + .../admin/hooks/product_edit_options.xml | 26 + .../admin/hooks/product_edit_pricing.xml | 17 + .../admin/hooks/products_class.xml | 21 + .../Loaded_7_Pro/admin/hooks/store_class.xml | 13 + .../en_US/modules/access/product_classes.php | 12 + .../product_attributes/product_classes.php | 12 + .../admin/languages/en_US/product_classes.php | 38 + .../product_attributes/product_classes.php | 45 + .../content/account/login.inc.php | 67 ++ catalog/addons/Loaded_7_Pro/controller.php | 287 ++++++ .../hooks/content_account_login.xml | 13 + .../Loaded_7_Pro/images/loaded7_pro.png | Bin 0 -> 3708 bytes .../addons/Loaded_7_Pro/languages/en_US.xml | 20 + 34 files changed, 3562 insertions(+) create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php create mode 100644 catalog/addons/Loaded_7_Pro/content/account/login.inc.php create mode 100644 catalog/addons/Loaded_7_Pro/controller.php create mode 100644 catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml create mode 100644 catalog/addons/Loaded_7_Pro/images/loaded7_pro.png create mode 100644 catalog/addons/Loaded_7_Pro/languages/en_US.xml diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php b/catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php new file mode 100644 index 000000000..d8b7bcfd3 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php @@ -0,0 +1,145 @@ +modCheck(DIR_FS_ADMIN . 'includes/applications/categories/classes/categories.php')); +include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/classes/category_tree.php')); + +class lC_Categories_Admin_Pro extends lC_Categories_Admin { + /* + * Save the category record + * + * @param integer $id The category id on update, null on insert + * @param array $data The category information + * @access public + * @return boolean + */ + public static function save($id = null, $data) { + global $lC_Database, $lC_Language; + + $category_id = parent::save($id, $data); + + $error = false; + + $lC_Database->startTransaction(); + + $levels = '1'; + + $Qcat = $lC_Database->query('update :table_categories set `access_levels` = :access_levels'); + $Qcat->bindTable(':table_categories', TABLE_CATEGORIES); + $Qcat->bindValue(':access_levels', $levels); + $Qcat->setLogging($_SESSION['module'], $category_id); + $Qcat->execute(); + + if ( !$lC_Database->isError() ) { + $lC_Database->commitTransaction(); + lC_Cache::clear('categories'); + + return $category_id; // used for the save_close buttons + } + + $lC_Database->rollbackTransaction(); + + return false; + } + /* + * Get related products/categories html + * + * @access public + * @return string + */ + public static function getProductRelatedHtml($cid = '') { + global $lC_Language; + + $lC_Language->loadIniFile('categories.php'); + + $pData = self::_getProductsRelated($cid); + + $html = '' . + '
    ' . + ' ' . $lC_Language->get('field_products_related') . '' . + '
    ' . + '
    ' . + '
    ' . + '
    ' . number_format($pData['products_in_category'], 0) . '
    ' . + '
    ' . $lC_Language->get('field_products_in_category') . '
    ' . + '
    ' . + '
    ' . + '
    ' . number_format($pData['number_of_sub_categories'], 0) . '
    ' . + '
    ' . $lC_Language->get('field_sub_categories') . '
    ' . + '
    ' . + '
    ' . + '
    ' . number_format($pData['products_in_sub_categories'], 0) . '
    ' . + '
    ' . $lC_Language->get('field_products_in_sub_categories') . '
    ' . + '
    ' . + '
    ' . + '
    ' . number_format($pData['total_products'], 0) . '
    ' . + '
    ' . $lC_Language->get('field_total_products') . '
    ' . + '
    ' . + '
    ' . + '
    ' . + '
    '; + + return $html; + } + + protected static function _getProductsRelated($cid) { + global $lC_Database, $lC_CategoryTree; + + $total = 0; + $pData = array(); + if (!is_numeric($cid)) return false; + + // get number of products in this category + $Qp2c = $lC_Database->query('select count(*) as total from :table_products_to_categories where `categories_id` = :categories_id'); + $Qp2c->bindTable(':table_products_to_categories', TABLE_PRODUCTS_TO_CATEGORIES); + $Qp2c->bindInt(':categories_id', $cid); + $Qp2c->execute(); + + $pData['products_in_category'] = $Qp2c->valueInt('total'); + $total = (int)$total + $Qp2c->valueInt('total'); + + // get the number of sub categories under this category + $lC_CategoryTree = new lC_CategoryTree_Admin(); + $catArr = $lC_CategoryTree->getArray($cid); + $pData['number_of_sub_categories'] = count($catArr); + + $pCnt = 0; + foreach ($catArr as $value) { + $catID = end(explode('_', $value['id'])); + $pCnt = (int)$pCnt + self::_numberofProducts($catID); + } + $pData['products_in_sub_categories'] = $pCnt; + $total = (int)$total + $pCnt; + + $pData['total_products'] = $total; + + return $pData; + } + + protected static function _numberofProducts($cid) { + global $lC_Database; + + // get number of products in this category + $Qp2c = $lC_Database->query('select count(*) as total from :table_products_to_categories where `categories_id` = :categories_id'); + $Qp2c->bindTable(':table_products_to_categories', TABLE_PRODUCTS_TO_CATEGORIES); + $Qp2c->bindInt(':categories_id', $cid); + $Qp2c->execute(); + + $total = $Qp2c->valueInt('total'); + + $Qp2c->freeResult(); + + return (int)$total; + } +} \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php new file mode 100644 index 000000000..7e8bf8374 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php @@ -0,0 +1,219 @@ +query('select * from :table_product_classes where language_id = :language_id order by name'); + $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qclasses->bindInt(':language_id', $lC_Language->getID()); + $Qclasses->execute(); + + $result = array('aaData' => array()); + while ( $Qclasses->next() ) { + $name = $Qclasses->value('name'); + if ( $Qclasses->valueInt('id') == DEFAULT_PRODUCT_CLASSES_ID ) { + $name .= '' . $lC_Language->get('default_entry') . ''; + } + + $title = '
    		' . $name . '' . $Qclasses->value('comment') . '  + ' . (($media === 'mobile-portrait' || $media === 'mobile-landscape') ? NULL : $lC_Language->get('icon_edit')) . ' + +
    + + + + + + + + + + + + + + + +
    get('table_heading_name'); ?>get('table_heading_comment'); ?>get('table_heading_usage'); ?>  get('table_heading_action'); ?>
     
    + +
    + +
    +
    +loadModal($lC_Template->getModule()); ?> + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php new file mode 100644 index 000000000..fa1be3dfe --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php @@ -0,0 +1,28 @@ +_page_title = $lC_Language->get('heading_title'); + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php new file mode 100644 index 000000000..a1fff3fab --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php @@ -0,0 +1,871 @@ +modCheck(DIR_FS_ADMIN . 'includes/applications/products/classes/products.php')); +include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/applications/customer_groups/classes/customer_groups.php')); + +class lC_Products_Admin_Pro extends lC_Products_Admin { + /* + * Save the product + * + * @param integer $id The products id to update, null on insert + * @param array $data The products information + * @access public + * @return boolean + */ + public static function save($id = null, $data) { + global $lC_Database, $lC_Language, $lC_Image; + + $error = false; + + $products_id = parent::save($id, $data); + + $group = (defined('DEFAULT_CUSTOMERS_GROUP_ID') && DEFAULT_CUSTOMERS_GROUP_ID != null) ? (int)DEFAULT_CUSTOMERS_GROUP_ID : 1; + + // qty price breaks + if (is_array($data['products_qty_break_point'][$group]) && $data['products_qty_break_point'][$group][1] != null) { + if ($products_id != null) { + + $lC_Database->startTransaction(); + + // remove any old pricing records + $Qpricing = $lC_Database->query('delete from :table_products_pricing where products_id = :products_id'); + $Qpricing->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qpricing->bindInt(':products_id', $products_id); + $Qpricing->setLogging($_SESSION['module'], $products_id); + $Qpricing->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + } else { + // add the new records + + foreach($data['products_qty_break_point'][$group] as $key => $val) { + + if ($data['products_qty_break_point'][$group][$key] == null) continue; + if ($data['products_qty_break_point'][$group][$key] == '1') continue; + + $Qpb = $lC_Database->query('insert into :table_products_pricing (products_id, group_id, tax_class_id, qty_break, price_break, date_added) values (:products_id, :group_id, :tax_class_id, :qty_break, :price_break, :date_added)'); + $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qpb->bindInt(':products_id', $products_id ); + $Qpb->bindInt(':group_id', $group); + $Qpb->bindInt(':tax_class_id', $data['tax_class_id'] ); + $Qpb->bindValue(':qty_break', $data['products_qty_break_point'][$group][$key] ); + $Qpb->bindValue(':price_break', $data['products_qty_break_price'][$group][$key] ); + $Qpb->bindRaw(':date_added', 'now()'); + $Qpb->setLogging($_SESSION['module'], $products_id); + $Qpb->execute(); + } + } + + if ( $error === false ) { + $lC_Database->commitTransaction(); + } + + $lC_Database->rollbackTransaction(); + } + } + + // subproducts + if ( $error === false ) { + if (isset($data['sub_products_name'])) { + + if (is_numeric($id)) { + // first delete the subproducts that have been removed and not in the post data + $Qchk = $lC_Database->query('select products_id from :table_products where parent_id = :parent_id'); + $Qchk->bindTable(':table_products', TABLE_PRODUCTS); + $Qchk->bindInt(':parent_id', $products_id); + $Qchk->execute(); + + while( $Qchk->next() ) { + if (! @in_array($Qchk->valueInt('products_id'), $data['sub_products_id'])) { + self::delete($Qchk->valueInt('products_id')); + } + } + } else { + // delete any possible ghosts for sanity + $Qdel = $lC_Database->query('delete from :table_products where parent_id = :products_id and is_subproduct = :is_subproduct'); + $Qdel->bindTable(':table_products', TABLE_PRODUCTS); + $Qdel->bindInt(':parent_id', $products_id); + $Qdel->bindInt(':is_subproduct', 1); + $Qdel->execute(); + } + + for ($i=0; $i < sizeof($data['sub_products_name']); $i++) { + if ($data['sub_products_name'][$i] == '') continue; + + if (is_numeric($id) && @in_array($data['sub_products_id'][$i], $data['sub_products_id'])) { + // update the subproduct record + $Qsubproduct = $lC_Database->query('update :table_products set products_quantity = :products_quantity, products_cost = :products_cost, products_price = :products_price, products_sku = :products_sku, products_weight = :products_weight, products_weight_class = :products_weight_class, products_status = :products_status, products_tax_class_id = :products_tax_class_id, products_date_added = :products_date_added, is_subproduct = :is_subproduct where parent_id = :parent_id and products_id = :products_id'); + $Qsubproduct->bindInt(':products_id', $data['sub_products_id'][$i]); + } else { + // add new subproduct record + $Qsubproduct = $lC_Database->query('insert into :table_products (parent_id, products_quantity, products_cost, products_price, products_sku, products_weight, products_weight_class, products_status, products_tax_class_id, products_ordered, products_date_added, is_subproduct) values (:parent_id, :products_quantity, :products_cost, :products_price, :products_sku, :products_weight, :products_weight_class, :products_status, :products_tax_class_id, :products_ordered, :products_date_added, :is_subproduct)'); + $Qsubproduct->bindInt(':products_ordered', $data['products_ordered'][$i]); + } + + $Qsubproduct->bindTable(':table_products', TABLE_PRODUCTS); + $Qsubproduct->bindInt(':parent_id', $products_id); + $Qsubproduct->bindInt(':products_quantity', $data['sub_products_qoh'][$i]); + $Qsubproduct->bindFloat(':products_cost', preg_replace('/[^0-9]\./', '', $data['sub_products_cost'][$i])); + $Qsubproduct->bindFloat(':products_price', preg_replace('/[^0-9]\./', '', $data['sub_products_price'][1][$i])); // retail group - other prices go into pricing table + $Qsubproduct->bindValue(':products_sku', $data['sub_products_sku'][$i]); + $Qsubproduct->bindFloat(':products_weight', $data['sub_products_weight'][$i]); + $Qsubproduct->bindInt(':products_weight_class', $data['weight_class']); + $Qsubproduct->bindInt(':products_status', $data['sub_products_status'][$i]); + $Qsubproduct->bindInt(':products_tax_class_id', $data['tax_class_id']); + $Qsubproduct->bindRaw(':products_date_added', 'now()'); + $Qsubproduct->bindInt(':is_subproduct', ($data['sub_products_default'][$i] == '1' || sizeof($data['sub_products_name']) == 2) ? 2 : 1); + $Qsubproduct->setLogging($_SESSION['module'], $products_id); + $Qsubproduct->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + } else { + if ( is_numeric($id) && @in_array($data['sub_products_id'][$i], $data['sub_products_id']) ) { + $sub_products_id = $data['sub_products_id'][$i]; + } else { + $sub_products_id = self::_getLastID(); + } + // subproduct description + foreach ($lC_Language->getAll() as $l) { + if (is_numeric($id) && @in_array($data['sub_products_id'][$i], $data['sub_products_id'])) { + $Qpd = $lC_Database->query('update :table_products_description set products_name = :products_name where products_id = :products_id and language_id = :language_id'); + } else { + $Qpd = $lC_Database->query('insert into :table_products_description (products_id, language_id, products_name) values (:products_id, :language_id, :products_name)'); + } + $Qpd->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION); + $Qpd->bindInt(':products_id', $sub_products_id); + $Qpd->bindInt(':language_id', $l['id']); + $Qpd->bindValue(':products_name', $data['sub_products_name'][$i]); + $Qpd->setLogging($_SESSION['module'], $sub_products_id); + $Qpd->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + break; + } + } + } + + //subproduct images + if ( $error === false ) { + if (empty($_FILES['sub_products_image']['name'][$i]) === false) { + $images = array(); + $file = array('name' => $_FILES['sub_products_image']['name'][$i], + 'type' => $_FILES['sub_products_image']['type'][$i], + 'size' => $_FILES['sub_products_image']['size'][$i], + 'tmp_name' => $_FILES['sub_products_image']['tmp_name'][$i]); + + $products_image = new upload($file); + + $products_image->set_extensions(array('gif', 'jpg', 'jpeg', 'png')); + + if ( $products_image->exists() ) { + $products_image->set_destination(realpath('../images/products/originals')); + + if ( $products_image->parse() && $products_image->save() ) { + $images[] = $products_image->filename; + } + } + + $default_flag = 1; + + foreach ($images as $image) { + $Qimage = $lC_Database->query('insert into :table_products_images (products_id, image, default_flag, sort_order, date_added) values (:products_id, :image, :default_flag, :sort_order, :date_added)'); + $Qimage->bindTable(':table_products_images', TABLE_PRODUCTS_IMAGES); + $Qimage->bindInt(':products_id', $sub_products_id); + $Qimage->bindValue(':image', $image); + $Qimage->bindInt(':default_flag', $default_flag); + $Qimage->bindInt(':sort_order', 0); + $Qimage->bindRaw(':date_added', 'now()'); + $Qimage->setLogging($_SESSION['module'], $products_id); + $Qimage->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + } else { + foreach ($lC_Image->getGroups() as $group) { + if ($group['id'] != '1') { + $lC_Image->resize($image, $group['id']); + } + } + } + $default_flag = 0; + } + } + } + } + } + } + + // combo variants + if ( $error === false ) { + $variants_array = array(); + $default_variant_combo = null; + + if ( isset($data['variants']) && !empty($data['variants']) ) { + foreach ( $data['variants'] as $key => $combo ) { + if (isset($data['variants'][$key]['product_id']) && $data['variants'][$key]['product_id'] != 0) { + $Qsubproduct = $lC_Database->query('update :table_products set products_quantity = :products_quantity, products_cost = :products_cost, products_price = :products_price, products_msrp = :products_msrp, products_model = :products_model, products_sku = :products_sku, products_weight = :products_weight, products_weight_class = :products_weight_class, products_status = :products_status, products_tax_class_id = :products_tax_class_id where products_id = :products_id'); + $Qsubproduct->bindInt(':products_id', $data['variants'][$key]['product_id']); + } else { + $Qsubproduct = $lC_Database->query('insert into :table_products (parent_id, products_quantity, products_cost, products_price, products_msrp, products_model, products_sku, products_weight, products_weight_class, products_status, products_tax_class_id, products_date_added) values (:parent_id, :products_quantity, :products_cost, :products_price, :products_msrp, :products_model, :products_sku, :products_weight, :products_weight_class, :products_status, :products_tax_class_id, :products_date_added)'); + $Qsubproduct->bindInt(':parent_id', $products_id); + $Qsubproduct->bindRaw(':products_date_added', 'now()'); + } + + $price = 0.00; + if (is_array($data['variants'][$key]['price'])) $price = $data['variants'][$key]['price'][0]; + + $Qsubproduct->bindTable(':table_products', TABLE_PRODUCTS); + $Qsubproduct->bindInt(':products_quantity', $data['variants'][$key]['qoh']); + $Qsubproduct->bindFloat(':products_cost', $data['variants'][$key]['cost']); + $Qsubproduct->bindFloat(':products_price', $price); + $Qsubproduct->bindFloat(':products_msrp', $data['variants'][$key]['msrp']); + $Qsubproduct->bindValue(':products_model', $data['variants'][$key]['model']); + $Qsubproduct->bindValue(':products_sku', $data['variants'][$key]['sku']); + $Qsubproduct->bindFloat(':products_weight', $data['variants'][$key]['weight']); + $Qsubproduct->bindInt(':products_weight_class', $data['weight_class']); + $Qsubproduct->bindInt(':products_status', $data['variants'][$key]['status']); + $Qsubproduct->bindInt(':products_tax_class_id', $data['tax_class_id']); + $Qsubproduct->setLogging($_SESSION['module'], $products_id); + $Qsubproduct->execute(); + + if ( isset($data['variants'][$key]['product_id']) && $data['variants'][$key]['product_id'] != '0') { + $subproduct_id = $data['variants'][$key]['product_id']; + } else { + $Qnext = $lC_Database->query('select max(products_id) as maxID from :table_products'); + $Qnext->bindTable(':table_products', TABLE_PRODUCTS); + $Qnext->execute(); + $subproduct_id = $Qnext->valueInt('maxID'); + $Qnext->freeResult(); + } + + if ( $data['variants'][$key]['default_combo'] == 1) { + $default_variant_combo = $subproduct_id; + } + + foreach ( $data['variants'][$key]['values'] as $values_id => $values_text ) { + + $variants_array[$subproduct_id][] = $values_id; + + $check_combos_array[] = $values_id; + + $Qcheck = $lC_Database->query('select products_id from :table_products_variants where products_id = :products_id and products_variants_values_id = :products_variants_values_id'); + $Qcheck->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qcheck->bindInt(':products_id', $subproduct_id); + $Qcheck->bindInt(':products_variants_values_id', $values_id); + $Qcheck->execute(); + + if ( $Qcheck->numberOfRows() < 1 ) { + + $Qvcombo = $lC_Database->query('insert into :table_products_variants (products_id, products_variants_values_id) values (:products_id, :products_variants_values_id)'); + $Qvcombo->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qvcombo->bindInt(':products_id', $subproduct_id); + $Qvcombo->bindInt(':products_variants_values_id', $values_id); + $Qvcombo->setLogging($_SESSION['module'], $products_id); + $Qvcombo->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + break 2; + } + } + } + + } + } + + if ( $error === false ) { + if ( empty($variants_array) ) { + $Qcheck = $lC_Database->query('select pv.* from :table_products p, :table_products_variants pv where p.parent_id = :parent_id and p.products_id = pv.products_id'); + $Qcheck->bindTable(':table_products', TABLE_PRODUCTS); + $Qcheck->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qcheck->bindInt(':parent_id', $products_id); + $Qcheck->execute(); + + while ( $Qcheck->next() ) { + $Qdel = $lC_Database->query('delete from :table_products_variants where products_id = :products_id'); + $Qdel->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); + $Qdel->execute(); + + $Qdel = $lC_Database->query('delete from :table_products where products_id = :products_id'); + $Qdel->bindTable(':table_products', TABLE_PRODUCTS); + $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); + $Qdel->execute(); + + } + } else { + $Qcheck = $lC_Database->query('select pv.* from :table_products p, :table_products_variants pv where p.parent_id = :parent_id and p.products_id = pv.products_id and pv.products_id not in (":products_id")'); + $Qcheck->bindTable(':table_products', TABLE_PRODUCTS); + $Qcheck->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qcheck->bindInt(':parent_id', $products_id); + $Qcheck->bindRaw(':products_id', implode('", "', array_keys($variants_array))); + $Qcheck->execute(); + + while ( $Qcheck->next() ) { + $Qdel = $lC_Database->query('delete from :table_products_variants where products_id = :products_id and products_variants_values_id = :products_variants_values_id'); + $Qdel->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); + $Qdel->bindInt(':products_variants_values_id', $Qcheck->valueInt('products_variants_values_id')); + $Qdel->execute(); + + $Qdel = $lC_Database->query('delete from :table_products where products_id = :products_id'); + $Qdel->bindTable(':table_products', TABLE_PRODUCTS); + $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); + $Qdel->execute(); + + } + + foreach ( $variants_array as $key => $values ) { + $Qdel = $lC_Database->query('delete from :table_products_variants where products_id = :products_id and products_variants_values_id not in (":products_variants_values_id")'); + $Qdel->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qdel->bindInt(':products_id', $key); + $Qdel->bindRaw(':products_variants_values_id', implode('", "', $values)); + $Qdel->execute(); + } + } + } + + $Qupdate = $lC_Database->query('update :table_products set has_children = :has_children where products_id = :products_id'); + $Qupdate->bindTable(':table_products', TABLE_PRODUCTS); + $Qupdate->bindInt(':has_children', (empty($variants_array)) ? 0 : 1); + $Qupdate->bindInt(':products_id', $products_id); + $Qupdate->execute(); + + } + + if ( $error === false ) { + $Qupdate = $lC_Database->query('update :table_products_variants set default_combo = :default_combo where products_id in (":products_id")'); + $Qupdate->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qupdate->bindInt(':default_combo', 0); + $Qupdate->bindRaw(':products_id', implode('", "', array_keys($variants_array))); + $Qupdate->execute(); + + if ( is_numeric($default_variant_combo) ) { + $Qupdate = $lC_Database->query('update :table_products_variants set default_combo = :default_combo where products_id = :products_id'); + $Qupdate->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qupdate->bindInt(':default_combo', 1); + $Qupdate->bindInt(':products_id', $default_variant_combo); + $Qupdate->execute(); + } + } + + // customer access levels (B2B) + if ( $error === false ) { + $levels = ''; + if (is_array($data['access_levels'])) { + foreach($data['access_levels'] as $key => $val) { + $levels .= $key . ';'; + } + $levels = substr($levels, 0, -1); + } + + $Qupdate = $lC_Database->query('update :table_products set access_levels = :access_levels where products_id = :products_id'); + $Qupdate->bindTable(':table_products', TABLE_PRODUCTS); + $Qupdate->bindValue(':access_levels', $levels); + $Qupdate->bindInt(':products_id', $products_id); + $Qupdate->execute(); + } + + return $products_id; // Return the products id for use with the save_close buttons + + } + /* + * Return the product simple options accordian price listing content + * + * @access public + * @return array + */ + public static function getOptionsPricingContent() { + global $lC_Language, $pInfo; + + $content = ''; + $groups = lC_Customer_groups_Admin::getAll(); + foreach($groups['entries'] as $key => $value) { + $content .= '
    ' . $value['customers_group_name'] . '
    ' . + '
    ' . + '
    '; + + if (isset($pInfo) && is_array($pInfo->get('simple_options'))) { + $content .= '
    ' . + '
    ' . $lC_Language->get('text_simple_options') . '
    ' . + ' ' . + ' ' . lC_Products_Admin::getSimpleOptionsPricingTbody($pInfo->get('simple_options'), $value['customers_group_id']) . '' . + '
    ' . + '
    '; + + } + + if (isset($pInfo) && $pInfo->get('has_subproducts') == '1') { + $content .= '
    ' . + '
    ' . $lC_Language->get('text_sub_products') . '
    ' . + ' ' . + ' ' . lC_Products_Admin_Pro::getSubProductsPricingTbody($pInfo, $value['customers_group_id']) . '' . + '
    ' . + '
    '; + + } + + if (isset($pInfo) && $pInfo->get('has_children') == '1') { + $content .= '
    ' . + '
    ' . $lC_Language->get('text_combo_options') . '
    ' . + ' ' . + ' ' . lC_Products_Admin_Pro::getComboOptionsPricingTbody($pInfo, $value['customers_group_id']) . '' . + '
    ' . + '
    '; + } + + if ( (!isset($pInfo)) || (isset($pInfo) && $pInfo->get('has_subproducts') != '1' && $pInfo->get('has_children') != '1' && !is_array($pInfo->get('simple_options'))) ) { + $content .= '
    ' . $lC_Language->get('text_no_options_defined') . '
    '; + } + + $content .= '
    ' . + '
    '; + } + + return $content; + } + + /* + * Returns the icons used in the product listing + * + * @param integer $id The products id + * @access public + * @return string + */ + public static function getlistingIcons($products_id) { + global $lC_Language; + + $icons = parent::getlistingIcons($products_id); + + if (self::hasSubProducts($products_id)) { + $icons .= ''; + } + if (self::hasComboOptions($products_id)) { + $icons .= ''; + } + + return $icons; + } + /* + * Returns the price info used in the product listing + * + * @param integer $data The product data array + * @access public + * @return string + */ + public function getProductsListingPrice($data) { + global $lC_Database, $lC_Language, $lC_Currencies; + + if (self::hasSubProducts($data['products_id']) === false && self::hasComboOptions($data['products_id']) === false) { + $price = parent::getProductsListingPrice($data); + } else { + $mm = self::getMinMaxPrice($data['products_id']); + $price = ($mm['min'] == $mm['max']) ? $lC_Currencies->format($mm['min']) : '(' . $lC_Currencies->format($mm['min']) . ' - ' . $lC_Currencies->format($mm['max']) . ')'; + } + + return $price; + } + /* + * Returns the min/max price used in the product listing + * + * @param integer $id The product id + * @access public + * @return string + */ + public static function getMinMaxPrice($id) { + global $lC_Database; + + $Qproducts = $lC_Database->query('select MAX(products_price) as max, MIN(products_price) as min from :table_products where parent_id = :parent_id'); + $Qproducts->bindTable(':table_products', TABLE_PRODUCTS); + $Qproducts->bindInt(':parent_id', $id); + $Qproducts->execute(); + + $result = $Qproducts->toArray(); + + $Qproducts->freeResult(); + + return $result; + } + /* + * Returns the price info used in the product listing + * + * @param integer $data The product data array + * @access public + * @return string + */ + public function getProductsListingQty($data) { + global $lC_Database; + + if (self::hasSubProducts($data['products_id']) === false && self::hasComboOptions($data['products_id']) === false) { + $result = $data['products_quantity']; + } else { + $Qproducts = $lC_Database->query('select SUM(products_quantity) as total from :table_products where parent_id = :parent_id'); + $Qproducts->bindTable(':table_products', TABLE_PRODUCTS); + $Qproducts->bindInt(':parent_id', $data['products_id']); + $Qproducts->execute(); + + $result = '(' . $Qproducts->valueInt('total') . ')'; + + $Qproducts->freeResult(); + } + + return $result; + } + + /* + * Determine if product has qty price breaks + * + * @param integer $id The product id + * @access public + * @return boolean + */ + public static function hasQPBPricing($id) { + global $lC_Database; + + $Qpb = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id limit 1'); + $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qpb->bindInt(':products_id', $id); + $Qpb->execute(); + + $rows = $Qpb->numberOfRows(); + + $Qpb->freeResult(); + + if ( $rows > 0 ) { + return true; + } + + return false; + } + /* + * Retrieve qty price breaks + * + * @param integer $id The product id + * @param integer $group The customer group id + * @access public + * @return array + */ + public static function getQPBPricing($id, $group = null) { + global $lC_Database; + + if ($group == null) $group = (defined('DEFAULT_CUSTOMERS_GROUP_ID') && DEFAULT_CUSTOMERS_GROUP_ID != null) ? (int)DEFAULT_CUSTOMERS_GROUP_ID : 1; + + $Qpb = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id and group_id = :group_id order by qty_break asc'); + $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qpb->bindInt(':products_id', $id); + $Qpb->bindInt(':group_id', $group); + $Qpb->execute(); + + $data = array(); + while($Qpb->next()) { + $data[] = $Qpb->toArray(); + } + + $Qpb->freeResult(); + + return $data; + } + /* + * Return the qty price breaks listing content + * + * @access public + * @return array + */ + public static function getQPBPricingContent() { + global $lC_Language, $lC_Currencies, $pInfo; + + $content = ''; + $groups = lC_Customer_groups_Admin::getAll(); + foreach($groups['entries'] as $key => $value) { + + if ($value['customers_group_id'] == DEFAULT_CUSTOMERS_GROUP_ID) { // locked to default for Pro + + $base = (isset($pInfo)) ? (float)$pInfo->get('products_price') : 0.00; + $special = (isset($pInfo)) ? (float)$pInfo->get('products_special_price') : 0.00; + + $content .= '' . + + '
    ' . + '
    ' . + '
    ' . + ' #' . + ' ' . + '
    ' . + ' Qty' . + '
    ' . + ' ' . $lC_Currencies->getSymbolLeft() . '' . + ' ' . + '
    ' . + ' Price' . + '
    '; + + + if ( isset($pInfo) && self::hasQPBPricing($pInfo->get('products_id')) ) { + + $qpbData = self::getQPBPricing($pInfo->get('products_id'), $value['customers_group_id']); + + $cnt = 0; + foreach ($qpbData as $key => $val) { + $content .= self::_getNewQPBPricingRow($val['group_id'], $key+1, $val); + $cnt = $key+1; + } + // add a new row + $content .= self::_getNewQPBPricingRow($value['customers_group_id'], $cnt+1); + } else { // no qpb recorded, setup new + $content .= self::_getNewQPBPricingRow($value['customers_group_id'], 1); + } + + $content .= '
    '; + } + } + + return $content; + } + /* + * Generate qty price break row + * + * @param integer $group The customer group id + * @param integer $cnt The product id + * @param array $data The product data + * @access private + * @return string + */ + private static function _getNewQPBPricingRow($group, $cnt, $data = array()) { + global $lC_Currencies; + + $content = '
    ' . + '
    ' . + ' #' . + ' ' . + '
    ' . + ' Qty' . + '
    ' . + ' ' . $lC_Currencies->getSymbolLeft() . '' . + ' ' . + '
    ' . + ' Price' . + '
    '; + + return $content; + } + /* + * Determine if the product has combo options + * + * @param integer $id The product id + * @access public + * @return boolean + */ + public static function hasComboOptions($id) { + global $lC_Database; + + $Qchk = $lC_Database->query('select has_children from :table_products where parent_id = :parent_id and products_id = :products_id limit 1'); + $Qchk->bindTable(':table_products', TABLE_PRODUCTS); + $Qchk->bindInt(':parent_id', 0); + $Qchk->bindInt(':products_id', $id); + $Qchk->execute(); + + return ( $Qchk->valueInt('has_children') === 1 ); + } + /* + * Return the combo options listing content + * + * @param array $options The multi sku options array + * @access public + * @return array + */ + public static function getComboOptionsContent($options = array()) { + $content = ''; + + $content .= self::_getComboOptionsTbody($options); + + return $content; + } + /* + * Return the combo options pricing content + * + * @param array $data The product data object + * @access public + * @return string + */ + public static function getComboOptionsPricingTbody($pInfo, $customers_group_id) { + global $lC_Currencies; + + if ($customers_group_id == '') return false; + $ok = (defined('ADDONS_SYSTEM_LOADED_7_PRO_STATUS') && ADDONS_SYSTEM_LOADED_7_PRO_STATUS == '1') ? true : false; + + $tbody = ''; + $cnt = 0; + if (isset($pInfo) && $pInfo->get('has_children') == '1') { + + foreach ($pInfo->get('variants') as $product_id => $val) { + $title = ''; + if (is_array($val['values'])) { + foreach ($val['values'] as $group_id => $value_id) { + foreach ($value_id as $value) { + $title .= $value['value_title'] . ', '; + } + } + } + if (strstr($title, ',')) $title = substr($title, 0, -2); + + if ((isset($title) && $title != NULL)) { + $tbody .= '' . + ' ' . $title . '' . + ' ' . + '
    ' . + ' ' . $lC_Currencies->getSymbolLeft() . '' . + ' ' . + '
    ' . + ' ' . + ''; + $cnt++; + } + } + } + + return $tbody; + } + /* + * Return the product simple options tbody content + * + * @param array $options The product simple options array + * @access public + * @return string + */ + private static function _getComboOptionsTbody($options) { + global $lC_Currencies, $lC_Language; + + $tbody = ''; + $sort = 10; + $cnt = 0; + if (isset($options) && !empty($options)) { + foreach ($options as $product_id => $mso) { + $combo = ''; + $default = ''; + $module = ''; + $comboInput = ''; + if (is_array($mso['values'])) { + foreach ($mso['values'] as $group_id => $value_id) { + foreach ($value_id as $key => $data) { + $combo .= $data['value_title'] . ', '; + $module = $data['module']; + $default = $data['default']; + $default_visual = $data['default_visual']; + $comboInput .= ''; + $comboInput .= ''; + } + } + if (strstr($combo, ',')) $combo = substr($combo, 0, -2); + + $statusIcon = (isset($mso['data']['status']) && $mso['data']['status'] == '1') ? '' : ''; + $defaultIcon = (isset($default) && $default == '1') ? '' : ''; + + $tbody .= '' . $comboInput . + ' ' . + ' ' . $combo . '' . + ' ' . $defaultIcon . '' . + ' +
    + + ' . lC_Weight::getCode(SHIPPING_WEIGHT_UNIT) . ' +
    + ' . + ' ' . + ' ' . + ' +
    + ' . $lC_Currencies->getSymbolLeft() . ' + +
    + ' . + ' ' . + ' ' . + ' ' . + ' ' . + ' ' . $statusIcon . '' . + ' + + + ' . + ''; + } + $sort = ($sort + 10); + $cnt++; + } + } + + return $tbody; + } + /* + * Determine if the product has subproducts + * + * @param integer $id The product id + * @access public + * @return boolean + */ + public static function hasSubProducts($id) { + global $lC_Database; + + $Qchk = $lC_Database->query('select products_id from :table_products where parent_id = :parent_id and is_subproduct > :is_subproduct limit 1'); + $Qchk->bindTable(':table_products', TABLE_PRODUCTS); + $Qchk->bindInt(':parent_id', $id); + $Qchk->bindInt(':is_subproduct', 0); + $Qchk->execute(); + + if ( $Qchk->numberOfRows() === 1 ) { + return true; + } + + return false; + } + /* + * Return the sub products pricing content + * + * @param array $data The product data object + * @access public + * @return string + */ + public static function getSubProductsPricingTbody($pInfo, $customers_group_id) { + global $lC_Currencies; + + if ($customers_group_id == '') return false; + $ok = (defined('ADDONS_SYSTEM_LOADED_7_PRO_STATUS') && ADDONS_SYSTEM_LOADED_7_PRO_STATUS == '1') ? true : false; + + $tbody = ''; + $cnt = 0; + if (isset($pInfo) && $pInfo->get('has_subproducts') == '1') { + foreach ($pInfo->get('subproducts') as $key => $sub) { + if ((isset($sub['products_name']) && $sub['products_name'] != NULL)) { + + $tbody .= '' . + ' ' . $sub['products_name'] . '' . + ' ' . + '
    ' . + ' ' . $lC_Currencies->getSymbolLeft() . '' . + ' ' . + '
    ' . + ' ' . + ''; + $cnt++; + } + } + } + + return $tbody; + } +} \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php new file mode 100644 index 000000000..2bcc09fa5 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php @@ -0,0 +1,30 @@ + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php new file mode 100644 index 000000000..8ede8347c --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php @@ -0,0 +1,603 @@ + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php new file mode 100644 index 000000000..1e422071d --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php @@ -0,0 +1,347 @@ + +
    + + +
    + +
    + get('button_setup'); ?> + + + + + + + + + + + + + + + + get('variants')) : null); ?> +
     get('table_heading_option_set_name'); ?> get('table_heading_weight'); ?>get('table_heading_sku'); ?>get('table_heading_qoh'); ?>get('table_heading_price'); ?>get('table_heading_img'); ?>get('table_heading_status'); ?>get('table_heading_action'); ?>
    +
    + +
    + + + + + + + + + + + + + + +
    get('table_heading_name'); ?>get('table_heading_status'); ?>get('table_heading_weight'); ?>get('table_heading_sku'); ?>get('table_heading_qoh'); ?>get('table_heading_base_price'); ?>get('table_heading_img'); ?>get('table_heading_action'); ?>
    +
    + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php new file mode 100644 index 000000000..ef5d17571 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php @@ -0,0 +1,127 @@ + +
    + + get('info_bubble_pricing_qty_price_breaks'), null, 'info-spot on-left grey margin-left'); ?> + +
    +     +
    + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml new file mode 100644 index 000000000..7e88038b0 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml @@ -0,0 +1,13 @@ + + + Categories Save + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php')); $id = lC_Categories_Admin_Pro::save((isset($_GET['categories']) && is_numeric($_GET['categories']) ? $_GET['categories'] : null), $data);]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml new file mode 100644 index 000000000..496b547ae --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml @@ -0,0 +1,13 @@ + + + Modify Customers Listing Page + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('icon_login_as_customer') . ' (PRO)">]]> + value('customers_email_address')) . '" class="button icon-monitor with-tooltip' . ((int)($_SESSION['admin']['access'][$_module] < 4) ? ' disabled' : NULL) . '" title="' . $lC_Language->get('icon_login_as_customer') . '">]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml new file mode 100644 index 000000000..41ee6411f --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml @@ -0,0 +1,13 @@ + + + Add Pro DB Tables + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml new file mode 100644 index 000000000..e8ff53932 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml @@ -0,0 +1,17 @@ + + + extend products save() + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php'));]]> + + + + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml new file mode 100644 index 000000000..38c0134f4 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml @@ -0,0 +1,28 @@ + + + After Image Groups, add Product Classes + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + loadIniFile(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php', null, null, true);]]> + $lC_Template->setSubOf('product_settings'); + + + + '?image_groups'),]]> + 'classes.png', + 'title' => $lC_Language->get('access_product_classes_title'), + 'identifier' => '?product_classes'), ]]> + + + + + 0) { $ok = TRUE;]]> + 0) { $ok = TRUE;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml new file mode 100644 index 000000000..4ea50ef92 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml @@ -0,0 +1,17 @@ + + + Enable Multi SKU Inv Control + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('text_multi_sku'); ?>" upselldesc="get('text_multi_sku_desc'); ?>" for="ic_radio_2" class="upsellinfo disabled oicb button red-activegetInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> + getInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> + + + get('text_multi_sku') . '' . lc_go_pro() . ''; ?>]]> + get('text_multi_sku'); ?>]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml new file mode 100644 index 000000000..f98547c16 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml @@ -0,0 +1,17 @@ + + + Enable Pro on Images Tab + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('text_additional_images'); ?>]]> + get('text_additional_images'); ?>]]> + + + ]]> +
    get('subsection_original_images'); ?>
    get('subsection_images'); ?>
    ]]>     +     +     +     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml new file mode 100644 index 000000000..22a99b369 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml @@ -0,0 +1,26 @@ + + + Enable Pro on Options Tab + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('text_multi_sku'); ?>" upselldesc="get('text_multi_sku_desc'); ?>" for="ioc_radio_2" class="upsellinfo disabled oicb button red-activegetInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> + getInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> + + + get('text_multi_sku') . '' . lc_go_pro() . ''; ?>]]> + get('text_multi_sku'); ?>]]> + + + ]]> + ]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml new file mode 100644 index 000000000..fceaf0693 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml @@ -0,0 +1,17 @@ + + + QPB Pricing + 1.0.0 + 2.3.2 + loadedcommerce.com + + + ]]> + ]]> + + + ]]> + ]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml new file mode 100644 index 000000000..634c312f3 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml @@ -0,0 +1,21 @@ + + + Products Class + 1.0.0 + 2.3.2 + loadedcommerce.com + + + valueInt('products_id'));]]> + valueInt('products_id'));]]> + + + toArray());]]> + toArray());]]> + + + toArray());]]> + toArray());]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml new file mode 100644 index 000000000..83959d3d1 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml @@ -0,0 +1,13 @@ + + + Hide Pro Template Pack + 1.0.0 + 2.3.2 + loadedcommerce.com + + + $type ) {]]> + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php new file mode 100644 index 000000000..7dc443b88 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php @@ -0,0 +1,12 @@ +# $Id: product_classes.php v1.0 2013-01-01 datazen $ +# +# LoadedCommerce, Innovative eCommerce Solutions +# http://www.loadedcommerce.com +# +# Copyright (c) 2013 Loaded Commerce, LLC +# +# @author LoadedCommerce Team +# @copyright (c) 2013 LoadedCommerce Team +# @license http://loadedcommerce.com/license.html + +access_product_classes_title = Product Classes \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php new file mode 100644 index 000000000..c0acd0786 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php @@ -0,0 +1,12 @@ +# $Id: product_classes.php v1.0 2013-01-01 datazen $ +# +# LoadedCommerce, Innovative eCommerce Solutions +# http://www.loadedcommerce.com +# +# Copyright (c) 2013 Loaded Commerce, LLC +# +# @author LoadedCommerce Team +# @copyright (c) 2013 LoadedCommerce Team +# @license http://loadedcommerce.com/license.html + +product_attributes_product_classes_title = Product Classes \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php new file mode 100644 index 000000000..c15fcc747 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php @@ -0,0 +1,38 @@ +# $Id: product_classes.php v1.0 2011-11-04 datazen $ +# +# LoadedCommerce, Innovative eCommerce Solutions +# http://www.loadedcommerce.com +# +# Copyright (c) 2011 LoadedCommerce.com +# +# @author LoadedCommerce Team +# @copyright (c) 2011 LoadedCommerce Team +# @license http://loadedcommerce.com/license.html + +heading_title = Product Classes + +access_product_classes_title = Product Classes + +table_heading_name = Name +table_heading_comment = Comment +table_heading_usage = Usage +table_heading_action = Action + +modal_heading_new_class = New Product Class +modal_heading_edit_class = Edit Product Class +modal_heading_delete_class = Delete Product Class + +field_name = Name: +field_comment = Comment: +field_status = Status: +field_set_as_default = Set as Default? + +button_new_class = New Class + +introduction_new_class = Please fill in the following information for the new class. +introduction_edit_class = Please make the necessary changes for this class. +introduction_delete_class = Please verify the removal of this classe. + +delete_error_class_prohibited = Error: The default class cannot be removed. +delete_error_class_in_use_1 = Error: This class is currently assigned to +delete_error_class_in_use_2 = product(s) and cannot be removed. \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php new file mode 100644 index 000000000..16087e42f --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php @@ -0,0 +1,45 @@ +_section = 'dataManagementSettings'; + } + + public function setFunction($value) { + global $lC_Database, $lC_Language; + + $string = ''; + + if (defined('ADDONS_SYSTEM_LOADED_7_PRO_STATUS') && ADDONS_SYSTEM_LOADED_7_PRO_STATUS == '1') { + $Qclass = $lC_Database->query('select id, name from :table_product_classes where language_id = :language_id order by name'); + $Qclass->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qclass->bindInt(':language_id', $lC_Language->getID()); + $Qclass->execute(); + + $classes = array(); + while ( $Qclass->next() ) { + $classes[] = array('id' => $Qclass->valueInt('id'), + 'text' => $Qclass->value('name')); + } + + if ( !empty($classes) ) { + $string = lc_draw_pull_down_menu('attributes[' . self::getID() . ']', $classes, $value, 'class="select full-width"'); + } + } + + return $string; + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/content/account/login.inc.php b/catalog/addons/Loaded_7_Pro/content/account/login.inc.php new file mode 100644 index 000000000..053cfed2d --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/content/account/login.inc.php @@ -0,0 +1,67 @@ +query('select user_password from :table_administrators'); + $Qadmin->bindTable(':table_administrators', TABLE_ADMINISTRATORS); + $Qadmin->execute(); + + $validated = false; + while ( $Qadmin->next()) { + if ( _validateAdminPassword($password, $Qadmin->value('user_password')) ) { + $validated = true; + break; + } + } + + return $validated; +} + +// check for admin session +if (isset($_SESSION['admin_login'])) unset($_SESSION['admin_login']); +if (validateAdminPassword($_POST['password'])) { + $_SESSION['admin_login'] = true; + } + } +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/controller.php b/catalog/addons/Loaded_7_Pro/controller.php new file mode 100644 index 000000000..5da87a474 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/controller.php @@ -0,0 +1,287 @@ +modCheck(DIR_FS_CATALOG . 'includes/classes/transport.php')); +include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php')); + +class Loaded_7_Pro extends lC_Addon { // your addon must extend lC_Addon + /* + * Class constructor + */ + public function Loaded_7_Pro() { + global $lC_Language, $lC_Database; + /** + * The addon type (category) + * valid types; payment, shipping, themes, checkout, catalog, admin, reports, connectors, other + */ + $this->_type = 'systems'; + /** + * The addon class name + */ + $this->_code = 'Loaded_7_Pro'; + /** + * The addon title used in the addons store listing + */ + $this->_title = $lC_Language->get('addon_system_pro_title'); + /** + * The addon description used in the addons store listing + */ + $this->_description = $lC_Language->get('addon_system_pro_description'); + /** + * The developers name + */ + $this->_author = 'Loaded Commerce, LLC'; + /** + * The developers web address + */ + $this->_authorWWW = 'http://www.loadedcommerce.com'; + /** + * The addon version + */ + $this->_version = '1.2.0'; + /** + * The Loaded 7 core compatibility version + */ + $this->_compatibility = '7.002.0.0'; // the addon is compatible with this core version and later + /** + * The base64 encoded addon image used in the addons store listing + */ + $this->_thumbnail = lc_image(DIR_WS_CATALOG . 'addons/' . $this->_code . '/images/loaded7_pro.png', $this->_title); + /** + * The addon enable/disable switch + */ + if (defined('INSTALLATION_ID') && INSTALLATION_ID != '') { + // if ($this->_timeToCheck() === true) { + // $this->_enabled = $this->_validateSerial(INSTALLATION_ID); + // if ($this->_enabled) $this->_updateLastChecked(); + // } else { + $this->_enabled = (defined('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS') && @constant('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS') == '1') ? true : false; + // } + // if (!$this->_enabled) { + // $lC_Database->simpleQuery("update " . TABLE_CONFIGURATION . " set configuration_value = '0' where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); + // } else { + // $lC_Database->simpleQuery("update " . TABLE_CONFIGURATION . " set configuration_value = '1' where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); + // } + } else { + $this->_enabled = false; + } + /** + * Automatically install the module + */ + $this->_auto_install = true; + } + /** + * Checks to see if the addon has been installed + * + * @access public + * @return boolean + */ + public function isInstalled() { + return (bool)defined('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); + } + /** + * Install the addon + * + * @access public + * @return void + */ + public function install() { + global $lC_Database; + + if (isset($_SESSION['remove_loaded_7_pro']) && $_SESSION['remove_loaded_7_pro'] == true) { + unset($_SESSION['remove_loaded_7_pro']); + $this->_clearCache(); + } else if (!$this->_checkStatus()) { + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Enable AddOn', 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS', '1', 'Do you want to enable this addon?', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())"); + $lC_Database->simpleQuery("delete from " . TABLE_TEMPLATES_BOXES . " where modules_group like '%Loaded_7_Pro%'"); + $lC_Database->simpleQuery("insert into " . TABLE_TEMPLATES_BOXES . " (title, code, author_name, author_www, modules_group) values ('Loaded 7 Pro', '" . $this->_type . "', '" . $this->_author . "','" . $this->_authorWWW . "', 'systems|Loaded_7_Pro')"); + // product classes + if (!defined('DEFAULT_PRODUCT_CLASSES_ID')) { + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'DEFAULT_PRODUCT_CLASSES_ID'"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'DEFAULT_PRODUCT_CLASSES_ID', '1', '', '6', '0', '', '', now())"); + $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . DB_TABLE_PREFIX . "product_classes` (id int(11) NOT NULL AUTO_INCREMENT,`name` varchar(128) NOT NULL DEFAULT '', `comment` varchar(255) DEFAULT NULL, `status` tinyint(1) NOT NULL DEFAULT '0', language_id int(11) NOT NULL DEFAULT '1', PRIMARY KEY (id)) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci AUTO_INCREMENT=2;"); + $lC_Database->simpleQuery("delete from `" . DB_TABLE_PREFIX . "product_classes` where id = '1'"); + $lC_Database->simpleQuery("insert into `" . DB_TABLE_PREFIX . "product_classes` (id, name, comment, status, language_id) VALUES ('1', 'Common', 'Common Class', 1, 1);"); + $lC_Database->simpleQuery("delete from " . TABLE_TEMPLATES_BOXES . " where code = 'product_classes'"); + $lC_Database->simpleQuery("insert into " . TABLE_TEMPLATES_BOXES . " (title, code, author_name, author_www, modules_group) VALUES ('Product Classes', 'product_classes', 'Loaded Commerce, LLC', 'http://www.loadedcommerce.com', 'product_attributes')"); + $lC_Database->simpleQuery("alter table " . TABLE_PRODUCTS . " ADD `is_subproduct` TINYINT( 1 ) NOT NULL DEFAULT '0'"); + } + // skip shipping + if (!defined('SKIP_CHECKOUT_SHIPPING_PAGE')) { + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'SKIP_CHECKOUT_SHIPPING_PAGE'"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Skip Shipping Page', 'SKIP_CHECKOUT_SHIPPING_PAGE', '-1', 'Bypass the checkout shipping page? No shipping will be charged.', 19, 0, NULL, now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); + } + // qty breaks config + if (!defined('PRODUCT_PRICING_QPB_FORMAT')) { + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'PRODUCT_PRICING_QPB_FORMAT'"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Price Break Format', 'PRODUCT_PRICING_QPB_FORMAT', 'Range', 'The price break format shown on the product listing pages.', 8, 11, NULL, now(), NULL, 'lc_cfg_set_boolean_value(array(''None'', ''Range'', ''Starts At'', ''Low As''))')"); + } + + $this->_clearCache(); + } + } + /** + * Return the configuration parameter keys an an array + * + * @access public + * @return array + */ + public function getKeys() { + global $lC_Database; + + if (!isset($this->_keys)) { + $this->_keys = array('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); + } + + return $this->_keys; + } + /** + * Remove the addon + * + * @access public + * @return void + */ + public function remove() { + global $lC_Database, $lC_Language; + + if ($this->hasKeys()) { + $Qdel = $lC_Database->query('delete from :table_configuration where configuration_key in (":configuration_key")'); + $Qdel->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qdel->bindRaw(':configuration_key', implode('", "', $this->getKeys())); + $Qdel->execute(); + } + + if (file_exists(DIR_FS_CATALOG . 'addons/' . $this->_code . '/languages/' . $lC_Language->getCode() . '.xml')) { + foreach ($lC_Language->extractAddonDefinitions(DIR_FS_CATALOG . 'addons/' . $this->_code . '/languages/' . $lC_Language->getCode() . '.xml') as $def) { + $Qdel = $lC_Database->query('delete from :table_languages_definitions where definition_key = :definition_key and content_group = :content_group'); + $Qdel->bindTable(':table_languages_definitions', TABLE_LANGUAGES_DEFINITIONS); + $Qdel->bindValue(':definition_key', $def['key']); + $Qdel->bindValue(':content_group', $def['group']); + $Qdel->execute(); + } + } + // product classes + $lC_Database->simpleQuery("DROP TABLE IF EXISTS `" . DB_TABLE_PREFIX . "product_classes`"); + $lC_Database->simpleQuery("alter table " . TABLE_PRODUCTS . " DROP COLUMN `is_subproduct`"); + $lC_Database->simpleQuery("delete from " . TABLE_TEMPLATES_BOXES . " where modules_group like '%Loaded_7_Pro%'"); + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'DEFAULT_PRODUCT_CLASSES_ID'"); + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'SKIP_CHECKOUT_SHIPPING_PAGE'"); + + $_SESSION['remove_loaded_7_pro'] = true; + + $this->_clearCache(); + } + /** + * Clear the cache + * + * @access public + * @return void + */ + private function _clearCache() { + lC_Cache::clear('configuration'); + lC_Cache::clear('languages'); + lC_Cache::clear('addons'); + lC_Cache::clear('vqmoda'); + } + /** + * Check the addon install status + * + * @access public + * @return void + */ + private function _checkStatus() { + $addons = ''; + if (file_exists('../includes/work/cache/addons.cache')) { + $addons = @file_get_contents('../includes/work/cache/addons.cache'); + } + + return (strstr($addons, 'Loaded_7_Pro/controller.php') != '') ? true : false; + } + /** + * Validate the serial is valid and active + * + * @access private + * @return boolean + */ + private function _validateSerial($serial) { + $result = array(); + $validateArr = array('serial' => $serial, + 'storeName' => STORE_NAME, + 'storeEmail' => STORE_OWNER_EMAIL_ADDRESS, + 'storeWWW' => HTTP_SERVER . DIR_WS_HTTP_CATALOG); + + $checksum = hash('sha256', json_encode($validateArr)); + $validateArr['checksum'] = $checksum; + + $resultXML = transport::getResponse(array('url' => 'https://api.loadedcommerce.com/1_0/check/serial/?product=pro', 'method' => 'post', 'parameters' => $validateArr)); + $result = utility::xml2arr($resultXML); + + if ($result['data']['error'] == '1') return false; + + return ($result['data']['valid'] == '1') ? true : false; + } + /** + * Check to see if it's time to re-check addon validity + * + * @access private + * @return boolean + */ + private function _timeToCheck() { + global $lC_Database; + + $itsTime = false; + + $today = substr(lC_DateTime::getShort(@date("Y-m-d H:m:s")), 3, 2); + + $instID = (defined('INSTALLATION_ID') && INSTALLATION_ID != '') ? INSTALLATION_ID : NULL; + if ($instID == NULL) return true; + + $last_checked = (isset($_SESSION['Loaded_7_Pro']['last_checked']) && $_SESSION['Loaded_7_Pro']['last_checked'] != NULL) ? $_SESSION['Loaded_7_Pro']['last_checked'] : NULL; + + if ($last_checked == NULL || $today != substr(lC_DateTime::getShort($last_checked), 3, 2)) { + + $itsTime = true; + + $Qcheck = $lC_Database->query('select last_modified from :table_configuration where configuration_key = :configuration_key'); + $Qcheck->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qcheck->bindValue(':configuration_key', 'ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); + $Qcheck->execute(); + + $last_checked = $Qcheck->value('last_modified'); + $_SESSION['Loaded_7_Pro']['last_checked'] = $last_checked; + + $Qcheck->freeResult(); + } + + return $itsTime; + } + /** + * Update the time last checked the install ID + * + * @access private + * @return void + */ + private function _updateLastChecked() { + global $lC_Database; + + $Qcheck = $lC_Database->query('update :table_configuration set last_modified = :last_modified where configuration_key = :configuration_key'); + $Qcheck->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qcheck->bindValue(':configuration_key', 'ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); + $Qcheck->bindRaw(':last_modified', 'now()'); + $Qcheck->execute(); + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml b/catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml new file mode 100644 index 000000000..832693dfd --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml @@ -0,0 +1,13 @@ + + + Admin Login as Customer + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/images/loaded7_pro.png b/catalog/addons/Loaded_7_Pro/images/loaded7_pro.png new file mode 100644 index 0000000000000000000000000000000000000000..5529704c677ed7ee1095f75c7e7b683aa705f6cf GIT binary patch literal 3708 zcmaJ^dpy(o{~xkkBT7iDxus!-O&@$2`wy)TdF^Z9zdU$56cpC}tEGhqQ~0RR9Xj5WvDaz-1@ zi{=AzzKhDbEY2XsFmYtqQQa5;cp3>{NTj-wKv*)~on%YG6EFF-kk9}C57^V*k>Q9t zfg(`J>i8XudLY@C!{&(T2m0a(-XsRdmE`V8(FM;}R)ayFL|yP{I8FoSYfSR+G!LSY z?1HT92|?ZjBoVBy2SNv;I09r60}l!$`%vhpKwa=JT@+`&vke7Uty zjHxsd2(GTBM$mx4KnR37OdF0sz*Iq+8Zb?$2IoPj!L(6u1WHo}^v?z6M57ViP_`J; ze`0Y~x?m3m!xsgG1_T7C2WY8NY3@)M5{cZ=(9~4pAk^rWC=7g{8ig+ZTLD9&6KI~k z3{NTrw4;c3rTQ~;!5pXmIRe@DUs($MpEPk21`WjfLSgC}J4gBr#NqybD4F~(n$EB# z{nzjRDNMJ&YUuu?8G&qyaP3#=u}ET1YK8{Fo^m zW`xny#F!W(eseKYfkwi45QOTfRM@D)6(TkzU zANBs>694GM(DaX7D8~$Rr?CI4(7(4h-Lo_Ow{1C#e;c1f;dDEV)7FjF#xVeZzycOy zXdgH*>->Xm*Smjf_`UiWN6iauUK)L>Sf1wwT`Ig?+BFJ1<=UMs&>#0>tt^he?@$QA zY#yj7$7QA=xWw*;E5w!(jm{WpGFahXP1i37q57S3c;xorgX@z&_Z>=<*-K?vQahWxi{vH3KX>FI;vi4 z2R3@$-n@n3Hbw6-uGXLb>=IOTrDE{@Ldu;>``V(LG~=;S$r+?a1z}$ww}j^IzTWw= z^0QuqUUG>k;LTT~6s0!_^e5*8XC|=53D+cY)_|F7D~2;)jh0&X=b%uTF;YC6guhyH zV;1+Y(L>jI`gwH+L>|97)bcj@{@;@-Ru2JQ#5+y*49~jVL-MR9NjN^lh2_4M^}@+s zs|9^8qU3m_Hbe-TyHpD3riU9Dw3_N4xwhW~$dz|YMzZWnvajAsckrf`FZXc8Ok~DS zp|~(6kt?Q$H;+9uk0*OPpO<`eJb<*wiPpLOm56G8tQ{5*rr z@BB8Y7C|umu{bwulGqd_tHb-vmBm9aK&ZUiEpN;lg#< z8*=^Zvy#4)3yf174%kZ1^9qcx(Qr@VU-b`lwDU`!0 zMtj*sVcVf|d~CK{XXG9DOi$f2k|39^r%k!X+MJ=hR7s4S^5HbWQy;h?CEaVSkflnO z0nsyd4(H7hLUT7@_l)MN!lt9dvmi-+{=Rx!$38+FY7nGW05AtT_b^20bHif!>cm@! zCvl-Y&D{B=IX5-zE2FmmrRcE#On4*GK|FHqHe~NsFPG!NgJVO*c+tQ``c&uI@a4!1 z-QBOMzhtZbtC%FQrprD1`>ig9B&4!vil5Iy^54^LU5w2V7vfMRZCG*}# z>p^{4&~5bDnQyq`5o3w8p#7&?MEx&kuFp&_)n}SCtGi$>OsOk8IWJe`-C$9{XVBSj z+X=eQHKmTV{Csb@8hD);g@Z8bGl4o8|U+&R3sAgN`c(S@7*V23u938)FCMyu#r78$(w!(jPS(RT( zP1tR2T2rc>*ZrM+$A2=#wQ*DOyfQ=ilW2 zHprA+qVCablzG6r{4nF&uAmn^BNwH0k3W@PuVsEgIU5#9tHkatieg5JxhZ>}3mtPi z*TL;rM`ESi!iu;I@$|_nsmy|vt+QrUbVRd*lE^Gudsy+)Tofv|+TTc5)n04rS>KOk zK3Nn?;kL`s2ui$WS*^d{Q@PL@C*ZwPIT)1^Su0T?nX+@a@r=yLZiO8B=xIM&ZLrWj z_L#Ud_u*g*qke14!-k(7;tS2E6RbM}z90E=nyF!}a+0EW1YP-b-hd^>3SkFzlRw&s z*1;`9`1ILD2}UXXsk779Bm`QA@SyEi+yQ*XV zc0qC-B>iTfNl@?*YS*pQYCr=v!Wui>#m#j`VN?6IaW3XXLx$Pw4S`^@7z1miyzzzX ziy!h+hsG9)2A{`Ojgk9fr+W{?c~qaiKuRSRA5ts3FQcpElzcwPudiTYcbYYt%goMh ztn85j%hpX|21Dyx2B{rt6V^k!DL2m}~ngM1TBnzVKMkf0JCBgZ5+ z?>TYxTZMCf^TF{mrIIU9YEzp2&%HzQ^AVL5{s5xa9Is&K!r(}a>2O@Z;TZ1pdxRkQ zpYL>;(l4t4Xw8vVo2&AMD;i}Ehvx9tUHsIXx5{R76Qv-R0r?`x8+!^Wf!I>5q03wR z2fjER^2|~sFeMvGpjFp)MbMOQlfIpO=Gs;8q%J)mbM#D=WJi)4W}qVyK{ukcQ*My2 z1moGbt}fil<#)|;#_urEE}u6S$6&?N3MT$2+T@44iK}1F#`0>p*jhk=uw|A)i{a+M zK^0hcef3g*>VuLdgwGFnd@UeI@27cw8vi|=`Z)J6)e1e@$6{hI`mE}tI-q|>X2-hyjD5XseQtMGq z_rUFkCNiKK86mRl?N`@ho?Qf6DLU6r;udV=fZ6*%uUs9GsujS`-BWQupG9?51}XILE=moj!LlK8y&Vtz=UE#=VDcEVBl4W#MC8+YNh z^eb9?<YStWW^1|4}sQRD#0^+3cE!cyXOEi>R>Y>z~Q zf>FAr=~EN2^sLGJ*fDKIZ)tsRpIJkb?Q+Ao1-scq&kEKl&`_5+R^`);@_y4Bx()*P zj_!O#w&hl~_m^k>yp2`yuum|qdLu=bjoT!|EV(qw>3m9Gs;E{6Q)rc6xHw+8)!GeR zBq6jn@*AzZan0gZJHSEY{JaR|V_v~VuB`;`E$=Mzw_nk@ZwOu~Fw4wsuj-ubMszK>VkMb$O+LcJDy5(7^ziVnB#uPO+ReXvkD zesq59Q;~&>zT1Y%jmK@k7@xOgu=P0|!agqTZCV`vXg05nPDx;=f-9|4Xv|EyPU*T5 z4-QZr(f;%7h7wOT3~*QUuF#bnz+Jw(*ol+O;& + + + + addon_system_pro_title + + checkout + + + addon_system_pro_description + + checkout + + + text_admin_session_active + + general + + + \ No newline at end of file From c7de08509b889d061467bf705fbb180768045dec Mon Sep 17 00:00:00 2001 From: datazen Date: Fri, 11 Jul 2014 11:28:40 -0400 Subject: [PATCH 047/168] merge work --- .../inc/modules_variants_file_upload.inc.php | 59 +++++++++++++++++++ ...ules_variants_multiple_file_upload.inc.php | 59 +++++++++++++++++++ .../hooks/modules_variants_file_upload.xml | 13 ++++ .../modules_variants_multiple_file_upload.xml | 13 ++++ 4 files changed, 144 insertions(+) create mode 100644 catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_file_upload.inc.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_multiple_file_upload.inc.php create mode 100644 catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml create mode 100644 catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml diff --git a/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_file_upload.inc.php b/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_file_upload.inc.php new file mode 100644 index 000000000..9187ab10e --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_file_upload.inc.php @@ -0,0 +1,59 @@ + $val) { + if (isset($val['group_title']) && empty($val['group_title']) === false) { + $group_title = $val['group_title']; + break; + } + } + + $string = '
    ' . + ' ' . + ' ' . + ' ' . + ' ' . + ' ' . + '
    '; + + reset($data); + $cnt = 0; + foreach($data as $key => $val) { + $price_ind = ((float)$val['price_modifier'] < 0.00) ? '-' : '+'; + $price_formatted = ((float)$val['price_modifier'] != 0.00) ? $price_ind . $lC_Currencies->format(number_format($val['price_modifier'], DECIMAL_PLACES), $lC_Currencies->getCode()) : null; + $options[$val['value_id']] = $val['price_modifier']; + $group_id = $val['group_id']; + $group_title = $val['group_title']; + + $string .= '
    ' . + ' ' . + '
    '; + $cnt++; + } + + $string .= '
    ' . + '
    '; + + } else { + + $string = '
    '; + $cnt = 0; + foreach ( $data['data'] as $field ) { + $string .= '
    ' . + ' ' . + ' ' . + ' ' . + ' ' . + '
    '; + $cnt++; + } + $string .= '
    '; + } +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_multiple_file_upload.inc.php b/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_multiple_file_upload.inc.php new file mode 100644 index 000000000..3b8400312 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_multiple_file_upload.inc.php @@ -0,0 +1,59 @@ + $val) { + if (isset($val['group_title']) && empty($val['group_title']) === false) { + $group_title = $val['group_title']; + break; + } + } + + $string = '
    ' . + ' ' . + ' ' . + ' ' . + ' ' . + ' ' . + '
    '; + + reset($data); + $cnt = 0; + foreach($data as $key => $val) { + $price_ind = ((float)$val['price_modifier'] < 0.00) ? '-' : '+'; + $price_formatted = ((float)$val['price_modifier'] != 0.00) ? $price_ind . $lC_Currencies->format(number_format($val['price_modifier'], DECIMAL_PLACES), $lC_Currencies->getCode()) : null; + $options[$val['value_id']] = $val['price_modifier']; + $group_id = $val['group_id']; + $group_title = $val['group_title']; + + $string .= '
    ' . + ' ' . + '
    '; + $cnt++; + } + + $string .= '
    ' . + '
    '; + + } else { + + $string = '
    '; + $cnt = 0; + foreach ( $data['data'] as $field ) { + $string .= '
    ' . + ' ' . + ' ' . + ' ' . + ' ' . + '
    '; + $cnt++; + } + $string .= '
    '; + } +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml b/catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml new file mode 100644 index 000000000..8d7f5eb9f --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml @@ -0,0 +1,13 @@ + + + File Upload + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml b/catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml new file mode 100644 index 000000000..25c762f68 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml @@ -0,0 +1,13 @@ + + + Multiple File Upload + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + + + + \ No newline at end of file From eb556b8ff36c992fd1a67a6a09e92d5067df3afa Mon Sep 17 00:00:00 2001 From: datazen Date: Fri, 11 Jul 2014 11:54:28 -0400 Subject: [PATCH 048/168] merge work --- .../hooks/modules_variants_file_upload.xml | 2 +- .../modules_variants_multiple_file_upload.xml | 2 +- catalog/includes/javascript/general.js.php | 74 +++++++++++++++++++ 3 files changed, 76 insertions(+), 2 deletions(-) diff --git a/catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml b/catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml index 8d7f5eb9f..73ae92ab2 100644 --- a/catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml +++ b/catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml b/catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml index 25c762f68..f276868ca 100644 --- a/catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml +++ b/catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/catalog/includes/javascript/general.js.php b/catalog/includes/javascript/general.js.php index 023ccb977..c79a708ee 100644 --- a/catalog/includes/javascript/general.js.php +++ b/catalog/includes/javascript/general.js.php @@ -186,6 +186,80 @@ function (data) { ); } +/* FILE UPLOAD VARIANT MODULE */ + +$(document).on('change', '.btn-file :file', function() { + var input = $(this), + numFiles = input.get(0).files ? input.get(0).files.length : 1, + label = input.val().replace(/\\/g, '/').replace(/.*\//, ''), + title = input.attr('default').replace(/\\/g, '/').replace(/.*\//, ''), + htitle = input.attr('htitle').replace(/\\/g, '/').replace(/.*\//, ''), + groupID = input.attr('group-id').replace(/\\/g, '/').replace(/.*\//, ''), + valueID = input.attr('value-id').replace(/\\/g, '/').replace(/.*\//, ''), + modifier = input.attr('modifier').replace(/\\/g, '/').replace(/.*\//, ''), + id = input.attr('id').replace(/\\/g, '/').replace(/.*\//, ''); + + newFileRow(numFiles, label, id, title, htitle, groupID, valueID, modifier); +}); + +$(document).ready( function() { + $('.file-inputs').bootstrapFileInput(); + $('.btn-file :file').on('fileselect', function(event, numFiles, label, id, title, htitle, groupID, valueID, modifier) { + newFileRow(numFiles, label, id, title, htitle, groupID, valueID, modifier) + }); +}); + +function newFileRow(numFiles, label, id, title, htitle, groupID, valueID, modifier) { + + if (id.indexOf("mupload") != -1) { // multiple file upload + icon = id.replace('_options_mupload_', '_options_remove_'); + icon2 = id.replace('variants_mupload_', 'variants_remove_'); + } else { + icon = id.replace('_options_upload_', '_options_remove_'); + icon2 = id.replace('variants_upload_', 'variants_remove_'); + } + + if (numFiles > 0) { + $('#' + icon).removeClass('hidden'); + $('#' + icon2).removeClass('hidden'); + $('#' + id).parent('a').removeClass('btn-primary').addClass('btn-success'); + } else { + $('#' + icon).addClass('hidden'); + $('#' + icon2).addClass('hidden'); + $('#' + id).parent('a').removeClass('btn-success').addClass('btn-primary'); + } + + if (id.indexOf("mupload") != -1) { // multiple file upload + var cnt = parseInt(id.split('_').slice(-1)[0]) + 1; + + if (modifier == 'variant') { + var row = '
    '+ + ' '+ + ' '+ + ' '+ + ' '+ + '
    '; + } else { + var row = '
    '+ + ' '+ + '
    '; + } + $('#file_upload_container').append(row); + $('.file-input-' + cnt).bootstrapFileInput(); + } +}; + +function removeFileUploadRow(id) { + $('#file_upload_div_' + id).remove(); + var len = $('#file_upload_container div').length; + if (len == 0) document.location.href = document.location.href; +} + +/* FILE UPLOAD VARIANT MODULE /EOF */ + ;function print_r (array, return_val) { // http://kevin.vanzonneveld.net // + original by: Michael White (http://getsprink.com) From 7dec0f52db5da8379cef0e09456bbec672dd5f30 Mon Sep 17 00:00:00 2001 From: datazen Date: Fri, 11 Jul 2014 13:51:15 -0400 Subject: [PATCH 049/168] added rec x to remove qpb --- .../applications/products/classes/products.php | 4 ++-- .../products/pages/tabs/pricing_qpb.inc.php | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php index a1fff3fab..111a643ad 100644 --- a/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php +++ b/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php @@ -648,7 +648,7 @@ public static function getQPBPricingContent() { private static function _getNewQPBPricingRow($group, $cnt, $data = array()) { global $lC_Currencies; - $content = '
    ' . + $content = '
    ' . '
    ' . ' #' . ' ' . @@ -658,7 +658,7 @@ private static function _getNewQPBPricingRow($group, $cnt, $data = array()) { ' ' . $lC_Currencies->getSymbolLeft() . '' . ' ' . '
    ' . - ' Price' . + ' Price' . '
    '; return $content; diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php index ef5d17571..c51b11cf2 100644 --- a/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php +++ b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php @@ -62,11 +62,11 @@ classes: 'blue-gradient glossy', }); } - _addNewQPBRow(e); + var parts = $(e).attr('id').split('_'); + _addNewQPBRow(parts); } -function _addNewQPBRow(e) { - var parts = $(e).attr('id').split('_'); +function _addNewQPBRow(parts) { var group = parseInt(parts[4]); var id = parseInt(parts[5]) + 1; var symbol = 'getSymbolLeft(); ?>'; @@ -74,7 +74,7 @@ function _addNewQPBRow(e) { if( $('#products_qty_break_point_' + group + '_' + parts[5]).val() == '' ) return false; if( $('#products_qty_break_point_' + group + '_' + id).length > 0 && $('#products_qty_break_point_' + group + '_' + id).val() == '') return false; - row = '
    ' + + row = '
    ' + '
    ' + ' #' + ' ' + @@ -84,11 +84,18 @@ function _addNewQPBRow(e) { ' ' + symbol + '' + ' ' + '
    ' + - ' Price' + + ' Price' + '
    '; $('#qpbContainer').append(row); } + +function removeQPBRow(id) { + $('#' + id).remove(); + var id2 = id.replace('_div', ''); + parts = id.split('_'); + _addNewQPBRow(parts); +} function validateQPBPrice(e) { var curr = $(e).val(); From b3d327d60e5a83f0ccbfa807e7fed1e08fc2672d Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Mon, 14 Jul 2014 10:56:33 -0400 Subject: [PATCH 050/168] renamed to new product categories and set new install to use new box --- .../en_US/modules/boxes/categories.xml | 10 ----- .../modules/boxes/product_categories.xml | 10 +++++ ...{categories.php => product_categories.php} | 40 +++++++++---------- catalog/install/loadedcommerce.sql | 8 ++-- catalog/install/loadedcommerce_innodb.sql | 8 ++-- ...{categories.php => product_categories.php} | 12 +++--- 6 files changed, 46 insertions(+), 42 deletions(-) delete mode 100644 catalog/includes/languages/en_US/modules/boxes/categories.xml create mode 100644 catalog/includes/languages/en_US/modules/boxes/product_categories.xml rename catalog/includes/modules/boxes/{categories.php => product_categories.php} (52%) rename catalog/templates/core/modules/boxes/{categories.php => product_categories.php} (60%) diff --git a/catalog/includes/languages/en_US/modules/boxes/categories.xml b/catalog/includes/languages/en_US/modules/boxes/categories.xml deleted file mode 100644 index 70d67d698..000000000 --- a/catalog/includes/languages/en_US/modules/boxes/categories.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - box_categories_heading - - modules-boxes - - - diff --git a/catalog/includes/languages/en_US/modules/boxes/product_categories.xml b/catalog/includes/languages/en_US/modules/boxes/product_categories.xml new file mode 100644 index 000000000..282fee61c --- /dev/null +++ b/catalog/includes/languages/en_US/modules/boxes/product_categories.xml @@ -0,0 +1,10 @@ + + + + + box_product_categories_heading + + modules-boxes + + + diff --git a/catalog/includes/modules/boxes/categories.php b/catalog/includes/modules/boxes/product_categories.php similarity index 52% rename from catalog/includes/modules/boxes/categories.php rename to catalog/includes/modules/boxes/product_categories.php index e54e165b0..d2d03a759 100644 --- a/catalog/includes/modules/boxes/categories.php +++ b/catalog/includes/modules/boxes/product_categories.php @@ -5,46 +5,46 @@ @copyright Copyright 2003-2014 Loaded Commerce, LLC @copyright Portions Copyright 2003 osCommerce @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt - @version $Id: categories.php v1.0 2013-08-08 datazen $ + @version $Id: product_categories.php v1.0 2013-08-08 datazen $ */ -class lC_Boxes_categories extends lC_Modules { +class lC_Boxes_product_categories extends lC_Modules { var $_title, - $_code = 'categories', + $_code = 'product_categories', $_author_name = 'Loaded Commerce', $_author_www = 'http://www.loadedcommerce.com', $_group = 'boxes'; - function lC_Boxes_categories() { + function lC_Boxes_product_categories() { global $lC_Language; if (function_exists($lC_Language->injectDefinitions)) $lC_Language->injectDefinitions('modules/' . $_GET['set'] . '/' . $this->_code . '.xml'); - $this->_title = $lC_Language->get('box_categories_heading'); + $this->_title = $lC_Language->get('box_product_categories_heading'); } function initialize() { global $lC_CategoryTree, $cPath; $lC_CategoryTree->reset(); - if (BOX_CATEGORIES_MAX_LEVEL == 'None') { + if (BOX_PRODUCT_CATEGORIES_MAX_LEVEL == 'None') { $bcml = 1; - } else if (BOX_CATEGORIES_MAX_LEVEL == 'All') { + } else if (BOX_PRODUCT_CATEGORIES_MAX_LEVEL == 'All') { $bcml = 0; - } else if (BOX_CATEGORIES_MAX_LEVEL == '1') { + } else if (BOX_PRODUCT_CATEGORIES_MAX_LEVEL == '1') { $bcml = 2; - } else if (BOX_CATEGORIES_MAX_LEVEL == '2') { + } else if (BOX_PRODUCT_CATEGORIES_MAX_LEVEL == '2') { $bcml = 3; - } else if (BOX_CATEGORIES_MAX_LEVEL == '3') { + } else if (BOX_PRODUCT_CATEGORIES_MAX_LEVEL == '3') { $bcml = 4; } $lC_CategoryTree->setMaximumLevel($bcml); $lC_CategoryTree->setCategoryPath($cPath, '', ''); - $lC_CategoryTree->setParentGroupStringTop('
      ', '
    '); - $lC_CategoryTree->setParentGroupString('
      ', '
    '); + $lC_CategoryTree->setParentGroupStringTop('
      ', '
    '); + $lC_CategoryTree->setParentGroupString('
      ', '
    '); $lC_CategoryTree->setChildStringWithChildren('
  • ', '
    • '); $lC_CategoryTree->setUseAria(true); - $lC_CategoryTree->setShowCategoryProductCount((BOX_CATEGORIES_SHOW_PRODUCT_COUNT == '1') ? true : false); - $lC_CategoryTree->setRootCategoryID(BOX_CATEGORIES_ROOT_CATEGORY); + $lC_CategoryTree->setShowCategoryProductCount((BOX_PRODUCT_CATEGORIES_SHOW_PRODUCT_COUNT == '1') ? true : false); + $lC_CategoryTree->setRootCategoryID(BOX_PRODUCT_CATEGORIES_ROOT_CATEGORY); $this->_content = $lC_CategoryTree->getTree(); @@ -55,16 +55,16 @@ function install() { parent::install(); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Show Product Count', 'BOX_CATEGORIES_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())"); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('Top Category', 'BOX_CATEGORIES_ROOT_CATEGORY', 0, 'Select the Top Category of the Categories Infobox', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category')"); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('Expand Menu Item', 'BOX_CATEGORIES_MAX_LEVEL', '2', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))')"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Show Product Count', 'BOX_PRODUCT_CATEGORIES_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('Top Category', 'BOX_PRODUCT_CATEGORIES_ROOT_CATEGORY', 1, 'Select the Top Category of the Product Categories Infobox', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_PRODUCT_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category')"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('Expand Menu Item', 'BOX_PRODUCT_CATEGORIES_MAX_LEVEL', '2', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))')"); } function getKeys() { if (!isset($this->_keys)) { - $this->_keys = array('BOX_CATEGORIES_SHOW_PRODUCT_COUNT', - 'BOX_CATEGORIES_ROOT_CATEGORY', - 'BOX_CATEGORIES_MAX_LEVEL'); + $this->_keys = array('BOX_PRODUCT_CATEGORIES_SHOW_PRODUCT_COUNT', + 'BOX_PRODUCT_CATEGORIES_ROOT_CATEGORY', + 'BOX_PRODUCT_CATEGORIES_MAX_LEVEL'); } return $this->_keys; diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql index b0b0a89b8..d64dd4594 100644 --- a/catalog/install/loadedcommerce.sql +++ b/catalog/install/loadedcommerce.sql @@ -1192,8 +1192,9 @@ INSERT INTO lc_configuration (configuration_id, configuration_title, configurati INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(180, 'Session Lifetime', 'SESSION_LIFETIME', 3600, 'The amount of time a user is logged in for after the last action.', 10, 0, now(), now(), NULL, NULL); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(181, 'Force Cookie Use', 'SESSION_FORCE_COOKIES', -1, 'Force the use cookies to handle sessions.', 10, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(182, 'Maximum New Products Per Page', 'NEW_PRODUCTS_PER_PAGE_DISPLAY', '9', 'Maximum number of new products to display in listing', 3, 20, now(), now(), NULL, NULL); -INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(183, 'Top Category', 'BOX_CATEGORIES_ROOT_CATEGORY', 0, 'Select the Top Category of the Categories Infobox', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category'); -INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(184, 'Expand Menu Item', 'BOX_CATEGORIES_MAX_LEVEL', '2', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(183, 'Show Product Count', 'BOX_PRODUCT_CATEGORIES_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has.', 6, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(184, 'Top Product Category', 'BOX_PRODUCT_CATEGORIES_ROOT_CATEGORY', 1, 'Select the Top Category of the Product Categories Infobox.', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(185, 'Expand Menu Item', 'BOX_PRODUCT_CATEGORIES_MAX_LEVEL', '2', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(1, 'My Store', 'General information about my store', 1, 1); @@ -6233,7 +6234,7 @@ INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, module INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(3, 'Date Available', 'date_available', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'product_attributes'); INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(4, 'Free Shipping', 'free', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'shipping|Free_Shipping'); INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(5, 'Cash On Delivery', 'cod', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'payment|Cash_On_Delivery'); -INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(6, 'Categories', 'categories', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'boxes'); +INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(6, 'Product Categories', 'product_categories', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'boxes'); INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(7, 'Best Sellers', 'best_sellers', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'boxes'); INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(8, 'Currencies', 'currencies', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'boxes'); INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(10, 'Languages', 'languages', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'boxes'); @@ -6258,6 +6259,7 @@ INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, module INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(29, 'Featured Products', 'featured_products', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'content'); INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(30, 'Top Categories on Mainpage', 'mainpage_categories', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'content'); INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(31, 'Information Pages', 'information_pages', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'boxes'); +INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(32, 'Categories', 'categories', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'boxes'); INSERT INTO lc_templates_boxes_to_pages (templates_boxes_id, templates_id, content_page, boxes_group, sort_order, page_specific) VALUES(23, 1, 'index/index', 'header', 10, 1); INSERT INTO lc_templates_boxes_to_pages (templates_boxes_id, templates_id, content_page, boxes_group, sort_order, page_specific) VALUES(27, 1, 'index/index', 'after', 20, 1); diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql index e4d9d9e77..e0117499a 100644 --- a/catalog/install/loadedcommerce_innodb.sql +++ b/catalog/install/loadedcommerce_innodb.sql @@ -1192,8 +1192,9 @@ INSERT INTO lc_configuration (configuration_id, configuration_title, configurati INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(180, 'Session Lifetime', 'SESSION_LIFETIME', 3600, 'The amount of time a user is logged in for after the last action.', 10, 0, now(), now(), NULL, NULL); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(181, 'Force Cookie Use', 'SESSION_FORCE_COOKIES', -1, 'Force the use cookies to handle sessions.', 10, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(182, 'Maximum New Products Per Page', 'NEW_PRODUCTS_PER_PAGE_DISPLAY', '9', 'Maximum number of new products to display in listing', 3, 20, now(), now(), NULL, NULL); -INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(183, 'Top Category', 'BOX_CATEGORIES_ROOT_CATEGORY', 0, 'Select the Top Category of the Categories Infobox', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category'); -INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(184, 'Expand Menu Item', 'BOX_CATEGORIES_MAX_LEVEL', '2', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(183, 'Show Product Count', 'BOX_PRODUCT_CATEGORIES_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has.', 6, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(184, 'Top Product Category', 'BOX_PRODUCT_CATEGORIES_ROOT_CATEGORY', 1, 'Select the Top Category of the Product Categories Infobox.', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(185, 'Expand Menu Item', 'BOX_PRODUCT_CATEGORIES_MAX_LEVEL', '2', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(1, 'My Store', 'General information about my store', 1, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(2, 'Minimum Values', 'The minimum values for functions / data', 2, 1); @@ -6232,7 +6233,7 @@ INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, module INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(3, 'Date Available', 'date_available', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'product_attributes'); INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(4, 'Free Shipping', 'free', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'shipping|Free_Shipping'); INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(5, 'Cash On Delivery', 'cod', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'payment|Cash_On_Delivery'); -INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(6, 'Categories', 'categories', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'boxes'); +INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(6, 'Product Categories', 'product_categories', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'boxes'); INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(7, 'Best Sellers', 'best_sellers', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'boxes'); INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(8, 'Currencies', 'currencies', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'boxes'); INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(10, 'Languages', 'languages', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'boxes'); @@ -6257,6 +6258,7 @@ INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, module INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(29, 'Featured Products', 'featured_products', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'content'); INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(30, 'Top Categories on Mainpage', 'mainpage_categories', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'content'); INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(31, 'Information Pages', 'information_pages', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'boxes'); +INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(32, 'Categories', 'categories', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'boxes'); INSERT INTO lc_templates_boxes_to_pages (templates_boxes_id, templates_id, content_page, boxes_group, sort_order, page_specific) VALUES(23, 1, 'index/index', 'header', 10, 1); INSERT INTO lc_templates_boxes_to_pages (templates_boxes_id, templates_id, content_page, boxes_group, sort_order, page_specific) VALUES(27, 1, 'index/index', 'after', 20, 1); diff --git a/catalog/templates/core/modules/boxes/categories.php b/catalog/templates/core/modules/boxes/product_categories.php similarity index 60% rename from catalog/templates/core/modules/boxes/categories.php rename to catalog/templates/core/modules/boxes/product_categories.php index 8c50bfd34..0279cff77 100644 --- a/catalog/templates/core/modules/boxes/categories.php +++ b/catalog/templates/core/modules/boxes/product_categories.php @@ -6,16 +6,16 @@ @copyright Portions Copyright 2003 osCommerce @copyright Template built on DevKit http://www.bootstraptor.com under GPL license @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt - @version $Id: categories.php v1.0 2013-08-08 datazen $ + @version $Id: product_categories.php v1.0 2013-08-08 datazen $ */ ?> - -
    + +
    getTitle(); ?>
    getContent(); ?>
    - \ No newline at end of file + \ No newline at end of file From 4c42eb254dedc30cb16e9b66938284663efdee58 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Mon, 14 Jul 2014 11:05:22 -0400 Subject: [PATCH 051/168] added back old categories --- .../en_US/modules/boxes/categories.xml | 10 ++++ catalog/includes/modules/boxes/categories.php | 60 +++++++++++++++++++ .../core/modules/boxes/categories.php | 21 +++++++ 3 files changed, 91 insertions(+) create mode 100644 catalog/includes/languages/en_US/modules/boxes/categories.xml create mode 100644 catalog/includes/modules/boxes/categories.php create mode 100644 catalog/templates/core/modules/boxes/categories.php diff --git a/catalog/includes/languages/en_US/modules/boxes/categories.xml b/catalog/includes/languages/en_US/modules/boxes/categories.xml new file mode 100644 index 000000000..70d67d698 --- /dev/null +++ b/catalog/includes/languages/en_US/modules/boxes/categories.xml @@ -0,0 +1,10 @@ + + + + + box_categories_heading + + modules-boxes + + + diff --git a/catalog/includes/modules/boxes/categories.php b/catalog/includes/modules/boxes/categories.php new file mode 100644 index 000000000..1af1a0cc7 --- /dev/null +++ b/catalog/includes/modules/boxes/categories.php @@ -0,0 +1,60 @@ +injectDefinitions)) $lC_Language->injectDefinitions('modules/' . $_GET['set'] . '/' . $this->_code . '.xml'); + + $this->_title = $lC_Language->get('box_categories_heading'); + } + + function initialize() { + global $lC_CategoryTree, $cPath; + + $lC_CategoryTree->reset(); + // added to control maximum level of categories infobox if desired + if (isset($_SESSION['setCategoriesMaximumLevel']) && $_SESSION['setCategoriesMaximumLevel'] != '') { + $lC_CategoryTree->setMaximumLevel($_SESSION['setCategoriesMaximumLevel']); + } + $lC_CategoryTree->setCategoryPath($cPath, '', ''); + $lC_CategoryTree->setParentGroupStringTop('
      ', '
    '); + $lC_CategoryTree->setParentGroupString('
      ', '
    '); + $lC_CategoryTree->setChildStringWithChildren('
  • ', '
    • '); + $lC_CategoryTree->setUseAria(true); + $lC_CategoryTree->setShowCategoryProductCount((BOX_CATEGORIES_SHOW_PRODUCT_COUNT == '1') ? true : false); + + $this->_content = $lC_CategoryTree->getTree(); + + } + + function install() { + global $lC_Database; + + parent::install(); + + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Show Product Count', 'BOX_CATEGORIES_SHOW_PRODUCT_COUNT', '1', 'Show the amount of products each category has', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())"); + } + + function getKeys() { + if (!isset($this->_keys)) { + $this->_keys = array('BOX_CATEGORIES_SHOW_PRODUCT_COUNT'); + } + + return $this->_keys; + } +} +?> \ No newline at end of file diff --git a/catalog/templates/core/modules/boxes/categories.php b/catalog/templates/core/modules/boxes/categories.php new file mode 100644 index 000000000..8c50bfd34 --- /dev/null +++ b/catalog/templates/core/modules/boxes/categories.php @@ -0,0 +1,21 @@ + + +
    +
    getTitle(); ?>
    + getContent(); ?> +
    + + \ No newline at end of file From 0cfae6957e3e8762bf6ebf2efc5b17dad8ff9f6a Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Mon, 14 Jul 2014 11:10:46 -0400 Subject: [PATCH 052/168] set old categories box to uninstalled --- catalog/install/loadedcommerce.sql | 1 - catalog/install/loadedcommerce_innodb.sql | 1 - 2 files changed, 2 deletions(-) diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql index d64dd4594..18f706ed9 100644 --- a/catalog/install/loadedcommerce.sql +++ b/catalog/install/loadedcommerce.sql @@ -6259,7 +6259,6 @@ INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, module INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(29, 'Featured Products', 'featured_products', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'content'); INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(30, 'Top Categories on Mainpage', 'mainpage_categories', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'content'); INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(31, 'Information Pages', 'information_pages', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'boxes'); -INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(32, 'Categories', 'categories', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'boxes'); INSERT INTO lc_templates_boxes_to_pages (templates_boxes_id, templates_id, content_page, boxes_group, sort_order, page_specific) VALUES(23, 1, 'index/index', 'header', 10, 1); INSERT INTO lc_templates_boxes_to_pages (templates_boxes_id, templates_id, content_page, boxes_group, sort_order, page_specific) VALUES(27, 1, 'index/index', 'after', 20, 1); diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql index e0117499a..3d64e67e2 100644 --- a/catalog/install/loadedcommerce_innodb.sql +++ b/catalog/install/loadedcommerce_innodb.sql @@ -6258,7 +6258,6 @@ INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, module INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(29, 'Featured Products', 'featured_products', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'content'); INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(30, 'Top Categories on Mainpage', 'mainpage_categories', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'content'); INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(31, 'Information Pages', 'information_pages', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'boxes'); -INSERT INTO lc_templates_boxes (id, title, code, author_name, author_www, modules_group) VALUES(32, 'Categories', 'categories', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'boxes'); INSERT INTO lc_templates_boxes_to_pages (templates_boxes_id, templates_id, content_page, boxes_group, sort_order, page_specific) VALUES(23, 1, 'index/index', 'header', 10, 1); INSERT INTO lc_templates_boxes_to_pages (templates_boxes_id, templates_id, content_page, boxes_group, sort_order, page_specific) VALUES(27, 1, 'index/index', 'after', 20, 1); From 8c0cbc39bf4f8da48c573e1fe4fcc85026b7c127 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Mon, 14 Jul 2014 11:12:33 -0400 Subject: [PATCH 053/168] removed old categories product count config value from fresh install. --- catalog/install/loadedcommerce.sql | 1 - catalog/install/loadedcommerce_innodb.sql | 1 - 2 files changed, 2 deletions(-) diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql index 18f706ed9..4b9b80458 100644 --- a/catalog/install/loadedcommerce.sql +++ b/catalog/install/loadedcommerce.sql @@ -1142,7 +1142,6 @@ INSERT INTO lc_configuration (configuration_id, configuration_title, configurati INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(130, 'Display Duplicate Banners', 'SERVICE_BANNER_SHOW_DUPLICATE', '-1', 'Show duplicate banners in the same banner group on the same page?', 6, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(131, 'Show Product Count', 'BOX_CATEGORIES_FLYOUTSHOW_PRODUCT_COUNT', '1', 'Show the amount of products each category has', 6, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(132, 'Show Product Count', 'BOX_QUICK_SHOP_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has', 6, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); -INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(133, 'Show Product Count', 'BOX_CATEGORIES_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has', 6, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(134, 'Default GeoIP Module', 'MODULE_DEFAULT_GEOIP', 'maxmind_geolite_country', 'Default GeoIP module.', 6, 0, now(), now(), NULL, NULL); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(135, 'Page Execution Time Log File', 'SERVICE_DEBUG_EXECUTION_TIME_LOG', '', 'Location of the page execution time log file (eg, /www/log/page_parse.log).', 6, 0, now(), now(), NULL, NULL); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(136, 'Show The Page Execution Time', 'SERVICE_DEBUG_EXECUTION_DISPLAY', '1', 'Show the page execution time.', 6, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql index 3d64e67e2..1cbde6673 100644 --- a/catalog/install/loadedcommerce_innodb.sql +++ b/catalog/install/loadedcommerce_innodb.sql @@ -1142,7 +1142,6 @@ INSERT INTO lc_configuration (configuration_id, configuration_title, configurati INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(130, 'Display Duplicate Banners', 'SERVICE_BANNER_SHOW_DUPLICATE', '-1', 'Show duplicate banners in the same banner group on the same page?', 6, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(131, 'Show Product Count', 'BOX_CATEGORIES_FLYOUTSHOW_PRODUCT_COUNT', '1', 'Show the amount of products each category has', 6, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(132, 'Show Product Count', 'BOX_QUICK_SHOP_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has', 6, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); -INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(133, 'Show Product Count', 'BOX_CATEGORIES_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has', 6, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(134, 'Default GeoIP Module', 'MODULE_DEFAULT_GEOIP', 'maxmind_geolite_country', 'Default GeoIP module.', 6, 0, now(), now(), NULL, NULL); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(135, 'Page Execution Time Log File', 'SERVICE_DEBUG_EXECUTION_TIME_LOG', '', 'Location of the page execution time log file (eg, /www/log/page_parse.log).', 6, 0, now(), now(), NULL, NULL); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(136, 'Show The Page Execution Time', 'SERVICE_DEBUG_EXECUTION_DISPLAY', '1', 'Show the page execution time.', 6, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); From 5d090c93965d548105f1f28ff59460ead477bd31 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Mon, 14 Jul 2014 17:10:44 -0400 Subject: [PATCH 054/168] updted css for new product categories to work better on mobile. --- catalog/templates/core/css/template.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/catalog/templates/core/css/template.css b/catalog/templates/core/css/template.css index 8cae2e815..898de5032 100644 --- a/catalog/templates/core/css/template.css +++ b/catalog/templates/core/css/template.css @@ -706,6 +706,14 @@ #loaded7 .pr_gallery li:hover { border:1px solid #f0ad4e; +} + +#loaded7 .box-product-categories-ul { + margin: 0 0 10px 0; +} + +#loaded7 .box-product-categories-ul li { + margin: 10px 0 10px; } #loaded7 span.active-cpath { From 0b4f449cebd90811c6065bbef12169d16672f58f Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Mon, 14 Jul 2014 17:20:57 -0400 Subject: [PATCH 055/168] added switch for only category mode categories in top category selection configuration dropdown. --- .../lc_cfg_set_categories_top_category.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/catalog/admin/includes/functions/cfg_parameters/lc_cfg_set_categories_top_category.php b/catalog/admin/includes/functions/cfg_parameters/lc_cfg_set_categories_top_category.php index 003de8f1a..8038ca05f 100644 --- a/catalog/admin/includes/functions/cfg_parameters/lc_cfg_set_categories_top_category.php +++ b/catalog/admin/includes/functions/cfg_parameters/lc_cfg_set_categories_top_category.php @@ -18,11 +18,14 @@ function lc_cfg_set_categories_top_category($default = 0, $key = null) { $categories = array('0' => $lC_Language->get('top_category')); foreach ( $lC_CategoryTree->getArray() as $value ) { - $cid = explode('_', $value['id']); - $count = count($cid); - $cid = end($cid); - $acArr = lC_Categories_Admin::getAllChildren($id); - $categories[$cid] = str_repeat("    ", $count-1) . ' ' . $value['title']; + // added switch for only category mode categories in selection dropdown. + if ($value['mode'] == 'category') { + $cid = explode('_', $value['id']); + $count = count($cid); + $cid = end($cid); + $acArr = lC_Categories_Admin::getAllChildren($id); + $categories[$cid] = str_repeat("    ", $count-1) . ' ' . $value['title']; + } } $css_class = 'class="input with-small-padding mid-margin-top"'; From 457472cbd0e84fb566520fdf208a53480f0afc65 Mon Sep 17 00:00:00 2001 From: datazen Date: Tue, 15 Jul 2014 14:17:03 -0400 Subject: [PATCH 056/168] merge work --- .../b2b_settings/b2b_settings.php | 43 + .../b2b_settings/classes/b2b_settings.php | 316 +++++++ .../applications/b2b_settings/classes/rpc.php | 117 +++ .../b2b_settings/js/b2b_settings.php | 14 + .../b2b_settings/modal/delete.php | 91 ++ .../applications/b2b_settings/modal/edit.php | 110 +++ .../applications/b2b_settings/pages/main.php | 219 +++++ .../categories/classes/categories.php | 191 ++++ .../applications/categories/classes/rpc.php | 33 + .../categories/modal/batchAccess.php | 88 ++ .../classes/customer_groups.php | 218 +++++ .../products/classes/products.php | 77 ++ .../applications/products/classes/rpc.php | 33 + .../products/modal/batchAccess.php | 88 ++ .../tabs/relationships_access_levels.inc.php | 35 + .../Loaded_7_B2B/admin/classes/access.php | 16 + .../admin/hooks/b2b_indicator.xml | 13 + .../admin/hooks/b2b_indiciator.xml | 13 + .../hooks/category_edit_relationships.xml | 21 + .../hooks/category_new_relationships.xml | 17 + .../admin/hooks/category_pages_main.xml | 13 + .../admin/hooks/customer_groups_rpc.xml | 21 + .../hooks/product_edit_relationships.xml | 13 + .../admin/hooks/products_pages_main.xml | 13 + .../admin/languages/en_US/b2b_settings.php | 55 ++ .../en_US/modules/access/b2b_settings.php | 12 + .../admin/modules/access/b2b_settings.php | 23 + .../addons/Loaded_7_B2B/classes/product.php | 183 ++++ catalog/addons/Loaded_7_B2B/controller.php | 154 ++++ catalog/addons/Loaded_7_B2B/hooks/account.xml | 13 + .../Loaded_7_B2B/hooks/application_bottom.xml | 13 + .../hooks/includes_classes_product.xml | 13 + .../hooks/includes_content_index.xml | 13 + .../hooks/modules_actions_cart_add.xml | 13 + .../hooks/modules_boxes_featured_products.xml | 13 + .../hooks/modules_boxes_specials.xml | 13 + .../hooks/modules_boxes_whats_new.xml | 13 + ...odules_content_also_purchased_products.xml | 13 + .../modules_content_featured_products.xml | 13 + .../hooks/modules_content_new_products.xml | 13 + .../hooks/modules_product_listing.xml | 13 + .../modules_recently_visited_products.xml | 17 + .../hooks/modules_upcoming_products.xml | 13 + .../Loaded_7_B2B/images/loaded7_b2b.png | Bin 0 -> 3220 bytes .../Loaded_7_B2B/javascript/general.js.php | 49 + .../addons/Loaded_7_B2B/languages/en_US.xml | 15 + .../categories/classes/categories.php | 123 +++ .../classes/product_classes.php | 219 +++++ .../product_classes/classes/rpc.php | 78 ++ .../product_classes/js/product_classes.js.php | 39 + .../product_classes/modal/delete.php | 94 ++ .../product_classes/modal/edit.php | 117 +++ .../product_classes/modal/new.php | 115 +++ .../product_classes/pages/main.php | 60 ++ .../product_classes/product_classes.php | 28 + .../products/classes/products.php | 871 ++++++++++++++++++ .../applications/products/classes/rpc.php | 30 + .../products/modal/addComboOption.php | 603 ++++++++++++ .../pages/tabs/options_subproducts.inc.php | 347 +++++++ .../products/pages/tabs/pricing_qpb.inc.php | 127 +++ .../admin/hooks/categories_save.xml | 17 + .../admin/hooks/customers_listing.xml | 13 + .../admin/hooks/database_tables.xml | 13 + .../admin/hooks/product_actions_save.xml | 17 + .../admin/hooks/product_classes.xml | 28 + .../admin/hooks/product_edit_data.xml | 17 + .../admin/hooks/product_edit_images.xml | 17 + .../admin/hooks/product_edit_options.xml | 26 + .../admin/hooks/product_edit_pricing.xml | 17 + .../admin/hooks/products_class.xml | 25 + .../Loaded_7_Pro/admin/hooks/store_class.xml | 13 + .../en_US/modules/access/product_classes.php | 12 + .../product_attributes/product_classes.php | 12 + .../admin/languages/en_US/product_classes.php | 38 + .../product_attributes/product_classes.php | 45 + .../content/account/login.inc.php | 67 ++ catalog/addons/Loaded_7_Pro/controller.php | 288 ++++++ .../hooks/content_account_login.xml | 13 + .../Loaded_7_Pro/images/loaded7_pro.png | Bin 0 -> 3708 bytes .../addons/Loaded_7_Pro/languages/en_US.xml | 20 + 80 files changed, 6039 insertions(+) create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/b2b_settings.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/b2b_settings.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/rpc.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/js/b2b_settings.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/delete.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/edit.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/rpc.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/categories/modal/batchAccess.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/products/classes/rpc.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/products/modal/batchAccess.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/products/pages/tabs/relationships_access_levels.inc.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/classes/access.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/b2b_indicator.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/b2b_indiciator.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/category_edit_relationships.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/category_new_relationships.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/category_pages_main.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_rpc.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/product_edit_relationships.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_main.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/languages/en_US/modules/access/b2b_settings.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/modules/access/b2b_settings.php create mode 100644 catalog/addons/Loaded_7_B2B/classes/product.php create mode 100644 catalog/addons/Loaded_7_B2B/controller.php create mode 100644 catalog/addons/Loaded_7_B2B/hooks/account.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/application_bottom.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/includes_classes_product.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/includes_content_index.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_actions_cart_add.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_boxes_featured_products.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_boxes_specials.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_boxes_whats_new.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_content_also_purchased_products.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_content_featured_products.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_content_new_products.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_product_listing.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_recently_visited_products.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_upcoming_products.xml create mode 100644 catalog/addons/Loaded_7_B2B/images/loaded7_b2b.png create mode 100644 catalog/addons/Loaded_7_B2B/javascript/general.js.php create mode 100644 catalog/addons/Loaded_7_B2B/languages/en_US.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php create mode 100644 catalog/addons/Loaded_7_Pro/content/account/login.inc.php create mode 100644 catalog/addons/Loaded_7_Pro/controller.php create mode 100644 catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml create mode 100644 catalog/addons/Loaded_7_Pro/images/loaded7_pro.png create mode 100644 catalog/addons/Loaded_7_Pro/languages/en_US.xml diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/b2b_settings.php new file mode 100644 index 000000000..824f788c9 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/b2b_settings.php @@ -0,0 +1,43 @@ +_page_title = $lC_Language->get('heading_title'); + + $action = (isset($_GET['action']) && $_GET['action'] != NULL) ? $_GET['action'] : NULL; + + switch ($action) { + case 'save' : + $data = array('allow_self_register' => (isset($_POST['allow_self_register']) ? $_POST['allow_self_register'] : null), + 'guest_catalog_access' => (isset($_POST['guest_catalog_access']) ? $_POST['guest_catalog_access'] : null)); + + lC_B2b_settings_Admin::save($data); + + lc_redirect_admin(lc_href_link_admin(FILENAME_DEFAULT, $this->_module)); + break; + } + + $b2bInfo = new lC_ObjectInfo(lC_B2b_settings_Admin::get()); + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/b2b_settings.php new file mode 100644 index 000000000..0049bc866 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/b2b_settings.php @@ -0,0 +1,316 @@ +loadIniFile(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/languages/' . $lC_Language->getCode() . '/b2b_settings.php', null, null, true); + + $Qlevels = $lC_Database->query('select * from :table_customers_access order by id'); + $Qlevels->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); + $Qlevels->execute(); + + $result = array('aaData' => array()); + while ( $Qlevels->next() ) { + + $system = ($Qlevels->valueInt('id') == 1 || $Qlevels->valueInt('id') == 2) ? true : false; + + $id = $Qlevels->valueInt('id'); + $level = $Qlevels->value('level') . ''; + $memberArr = self::getCustomerAccessMembers($Qlevels->valueInt('id')); + $members = $memberArr['members']; + $status = '' . (($Qlevels->valueInt('status') == 1) ? '' : '') . ''; + + $action = ' + + ' . (($media === 'mobile-portrait' || $media === 'mobile-landscape') ? NULL : $lC_Language->get('icon_edit')) . ' + + + + + '; + + $result['aaData'][] = array("$id", "$level", "$members", "$status", "$action"); + $result['entries'][] = $Qlevels->toArray(); + } + + $Qlevels->freeResult(); + + return $result; + } + + public static function getCustomerAccessMembers($id) { + global $lC_Database; + + $groups = array(); + + $Qgroups = $lC_Database->query('select customers_group_id, customers_access_levels from :table_customers_groups_data'); + $Qgroups->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); + $Qgroups->execute(); + + while($Qgroups->next()) { + $levelsArr = explode(';', $Qgroups->value('customers_access_levels')); + if (in_array($id, $levelsArr)) $groups[] = $Qgroups->value('customers_group_id'); + } + + $cnt = 0; + foreach($groups as $key => $cgID) { + $Qcustomers = $lC_Database->query('select count(*) as total from :table_customers where customers_group_id = :customers_group_id'); + $Qcustomers->bindTable(':table_customers', TABLE_CUSTOMERS); + $Qcustomers->bindInt(':customers_group_id', $cgID); + $Qcustomers->execute(); + + $cnt = $cnt + $Qcustomers->valueInt('total'); + + $Qcustomers->freeResult(); + } + + return array('members' => $cnt); + } + /* + * Returns the b2b_settings information + * + * @access public + * @return array + */ + public static function get() { + global $lC_Database, $lC_Language, $lC_Currencies; + + $data = array(); + + $Qcfg = $lC_Database->query('select configuration_value from :table_configuration where configuration_key = :configuration_key'); + $Qcfg->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qcfg->bindValue(':configuration_key', 'B2B_SETTINGS_GUEST_CATALOG_ACCESS'); + $Qcfg->execute(); + + $data['B2B_SETTINGS_GUEST_CATALOG_ACCESS'] = $Qcfg->value('configuration_value'); + + $Qcfg->freeResult(); + + $Qcfg = $lC_Database->query('select configuration_value from :table_configuration where configuration_key = :configuration_key'); + $Qcfg->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qcfg->bindValue(':configuration_key', 'B2B_SETTINGS_ALLOW_SELF_REGISTER'); + $Qcfg->execute(); + + $data['B2B_SETTINGS_ALLOW_SELF_REGISTER'] = $Qcfg->value('configuration_value'); + + $Qcfg->freeResult(); + + + + return $data; + } + /* + * Saves the settings information + * + * @param array $data The settings data to save + * @access public + * @return boolean + */ + public static function save($data) { + global $lC_Database; + + if (!is_array($data)) return false; + + $error = false; + + $lC_Database->startTransaction(); + + foreach ($data as $key => $value) { + + $const = 'B2B_SETTINGS_' . strtoupper($key); + + $Qcfg = $lC_Database->query('select configuration_id from :table_configuration where configuration_key = :configuration_key'); + $Qcfg->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qcfg->bindValue(':configuration_key', $const); + $Qcfg->execute(); + + $newValue = ($value == 'on') ? '1' : (string)$value; + + if ( $Qcfg->numberOfRows() === 1 ) { + $Qsettings = $lC_Database->query('update :table_configuration set configuration_value = :configuration_value, last_modified = now() where configuration_key = :configuration_key'); + } else { + $Qsettings = $lC_Database->query('insert into :table_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, date_added) values (:configuration_title, :configuration_key, :configuration_value, :configuration_description, :configuration_group_id, :date_added)'); + $Qsettings->bindValue(':configuration_title', ucwords(str_replace('_', ' ', $key))); + $Qsettings->bindValue(':configuration_description', ucwords(str_replace('_', ' ', $key))); + $Qsettings->bindInt(':configuration_group_id', 10); + $Qsettings->bindRaw(':date_added', 'now()'); + } + $Qsettings->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qsettings->bindValue(':configuration_value', $newValue); + $Qsettings->bindValue(':configuration_key', $const); + $Qsettings->setLogging($_SESSION['module'], $key); + $Qsettings->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + break; + } + } + + if ( $error === false ) { + $lC_Database->commitTransaction(); + lC_Cache::clear('configuration'); + + return true; + } + + $lC_Database->rollbackTransaction(); + + return false; + } + /* + * Update customer access level status + * + * @param int $id The customer access level id + * @param int $val The customer access level status + * @access public + * @return true or false + */ + public static function updateCustomerAccessLevelStatus($id, $val = 0) { + global $lC_Database; + + $Qupdate = $lC_Database->query('update :table_customers_access set status = :status where id = :id'); + $Qupdate->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); + $Qupdate->bindInt(':status', $val); + $Qupdate->bindInt(':id', $id); + $Qupdate->execute(); + + return true; + } + /* + * Save the customer access level information + * + * @param string $level The customer access level to add + * @access public + * @return boolean + */ + public static function addCustomerAccessLevel($level) { + global $lC_Database, $lC_Language; + + $error = false; + + $Qchk = $lC_Database->query('select id from :table_customers_access where level = :level limit 1'); + $Qchk->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); + $Qchk->bindValue(':level', $level); + $Qchk->execute(); + + $rows = $Qchk->numberOfRows(); + + $Qchk->freeResult(); + + if ($rows == 0) { + + $lC_Database->startTransaction(); + + $Qlevel = $lC_Database->query('insert into :table_customers_access (level, status) values (:level, :status)'); + $Qlevel->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); + $Qlevel->bindValue(':level', $level); + $Qlevel->bindInt(':status', 1); + $Qlevel->setLogging($_SESSION['module'], $level); + $Qlevel->execute(); + + if ( $lC_Database->isError() === false ) { + $lC_Database->commitTransaction(); + return true; + } + + $lC_Database->rollbackTransaction(); + + return false; + } else { + return true; + } + } + /* + * Update the customer access level information + * + * @param integer $id The customer access level id to update + * @param array $data The customer access level data + * @access public + * @return boolean + */ + public static function updateCustomerAccessLevels($id, $data) { + global $lC_Database, $lC_Language; + + $error = false; + + $lC_Database->startTransaction(); + + $Qlevel = $lC_Database->query('update :table_customers_access set level = :level, status = :status where id = :id'); + $Qlevel->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); + $Qlevel->bindValue(':level', $data['level']); + $Qlevel->bindInt(':status', (($data['status'] == 'on') ? 1 : 0)); + $Qlevel->bindInt(':id', $id); + $Qlevel->setLogging($_SESSION['module'], $data['level']); + $Qlevel->execute(); + + if ( $lC_Database->isError() === false ) { + $lC_Database->commitTransaction(); + return true; + } + + $lC_Database->rollbackTransaction(); + + return false; + } + /* + * Delete the customer access level record + * + * @param integer $id The customer access level id to delete + * @access public + * @return boolean + */ + public static function deleteCustomerAccessLevel($id) { + global $lC_Database; + + $Qgroups = $lC_Database->query('delete from :table_customers_access where id = :id'); + $Qgroups->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); + $Qgroups->bindInt(':id', $id); + $Qgroups->setLogging($_SESSION['module'], $id); + $Qgroups->execute(); + + if ( $lC_Database->isError() ) { + return false; + } + + return true; + } + /* + * Get the customer access level data + * + * @param integer $id The customer access level id to retrieve + * @access public + * @return array + */ + public static function getCustomerAccessFormData($id) { + global $lC_Database; + + $Qgroups = $lC_Database->query('select * from :table_customers_access where id = :id limit 1'); + $Qgroups->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); + $Qgroups->bindInt(':id', $id); + $Qgroups->execute(); + + $data = $Qgroups->toArray(); + + $Qgroups->freeResult(); + + return $data; + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/rpc.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/rpc.php new file mode 100644 index 000000000..ecb553f19 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/rpc.php @@ -0,0 +1,117 @@ + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/js/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/js/b2b_settings.php new file mode 100644 index 000000000..9135e7cce --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/js/b2b_settings.php @@ -0,0 +1,14 @@ + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/delete.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/delete.php new file mode 100644 index 000000000..94b8401ee --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/delete.php @@ -0,0 +1,91 @@ + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/edit.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/edit.php new file mode 100644 index 000000000..29447397b --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/edit.php @@ -0,0 +1,110 @@ + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php new file mode 100644 index 000000000..f21e0eb49 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php @@ -0,0 +1,219 @@ + + + +
    + +
    +

    getPageTitle(); ?>

    +
    +
    +
    + +
    + + + +
    +
    + +
    + get('heading_guest_access'); ?> +
    +
    +

    + + + get('B2B_SETTINGS_ALLOW_SELF_REGISTER') == '1') ? 'checked="checked" ' : ''); + echo lc_draw_checkbox_field('allow_self_register',null, null, $checked . 'class="switch medium" data-text-on="' . strtoupper($lC_Language->get('button_yes')) . '" data-text-off="' . strtoupper($lC_Language->get('button_no')) . '"'); ?>get('info_bubble_displays_create_account_form'); ?> +

    + +

    + get('label_guest_catalog_access'); ?> + get('info_bubble_guest_catalog_access')); ?> + +

    + +
    +
    +
    + +
    +
    + get('heading_access_group_levels'); ?> + + + + + + + + + + + + + + + + + + +
    get('table_heading_id'); ?>get('table_heading_group'); ?>get('table_heading_members'); ?>get('table_heading_status'); ?>get('table_heading_action'); ?>
    +

    + + + get('button_create_new'); ?> +

    +
    + +
    +
    +
    + + + +
    +
    + +
    +
    +
    +
    +
    +

    + getModule()] < 3) ? '' : ' onclick="validateForm(\'#b2b_settings\');"'); + $close = lc_href_link_admin(FILENAME_DEFAULT, $lC_Template->getModule()); + button_save_close($save, false, $close); + ?> +

    +
    +
    +
    +
    + + + +
    +
    +loadModal($lC_Template->getModule()); ?> + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php b/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php new file mode 100644 index 000000000..f9f64bd50 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php @@ -0,0 +1,191 @@ +modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php')); +include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/classes/category_tree.php')); + +class lC_Categories_b2b_Admin extends lC_Categories_pro_Admin { + /* + * Save the category record + * + * @param integer $id The category id on update, null on insert + * @param array $data The category information + * @access public + * @return boolean + */ + public static function save($id = null, $data) { + global $lC_Database, $lC_Language, $lC_CategoryTree; + + $category_id = lC_Categories_pro_Admin::save($id, $data); + + $error = false; + + $lC_Database->startTransaction(); + + $levels = ''; + if (is_array($data['access_levels'])) { + foreach ($data['access_levels'] as $key => $val) { + $levels .= $key . ';'; + } + $levels = substr($levels, 0, -1); + } + + $Qcat = $lC_Database->query('update :table_categories set `access_levels` = :access_levels where `categories_id` = :categories_id'); + $Qcat->bindTable(':table_categories', TABLE_CATEGORIES); + $Qcat->bindInt(':categories_id', $category_id); + $Qcat->bindValue(':access_levels', $levels); + $Qcat->setLogging($_SESSION['module'], $category_id); + $Qcat->execute(); + + if ( !$lC_Database->isError()) { + $syncAllProducts = (isset($data['sync_all_products']) && $data['sync_all_products'] == 'on') ? true: false; + $syncAllChildren = (isset($data['sync_all_children']) && $data['sync_all_children'] == 'on') ? true: false; + + if ($syncAllProducts || $syncAllChildren) { + $lC_CategoryTree = new lC_CategoryTree_Admin(); + $catArr = $lC_CategoryTree->getArray($category_id); + + foreach ($catArr as $value) { + $catID = end(explode('_', $value['id'])); + if ($syncAllChildren) self::_updateCategoryAccessLevels($catID, $levels); + if ($syncAllProducts) self::_updateProductAccessLevels($catID, $levels); + } + } + } + + if ( !$lC_Database->isError() ) { + $lC_Database->commitTransaction(); + lC_Cache::clear('categories'); + + return $category_id; // used for the save_close buttons + } + + $lC_Database->rollbackTransaction(); + + return false; + } + /* + * Update the product access levels + * + * @param integer $category_id The parent category id + * @param string $levels The access levels + * @access public + * @return boolean + */ + protected static function _updateProductAccessLevels($category_id, $levels) { + global $lC_Database; + + // get all product_id's assigned to $category_id + $Qp2c = $lC_Database->query('select products_id from :table_products_to_categories where `categories_id` = :categories_id'); + $Qp2c->bindTable(':table_products_to_categories', TABLE_PRODUCTS_TO_CATEGORIES); + $Qp2c->bindInt(':categories_id', $category_id); + $Qp2c->setLogging($_SESSION['module'], $category_id); + $Qp2c->execute(); + + $lC_Database->startTransaction(); + + if ( !$lC_Database->isError()) { + while($Qp2c->next()) { + $Qproducts = $lC_Database->query('update :table_products set `access_levels` = :access_levels where `products_id` = :products_id'); + $Qproducts->bindTable(':table_products', TABLE_PRODUCTS); + $Qproducts->bindInt(':products_id', $Qp2c->valueInt('products_id')); + $Qproducts->bindvalue(':access_levels', $levels); + $Qproducts->setLogging($_SESSION['module'], $category_id); + $Qproducts->execute(); + } + } + + $Qp2c->freeResult(); + + if ( !$lC_Database->isError() ) { + $lC_Database->commitTransaction(); + return true; + } + + $lC_Database->rollbackTransaction(); + + return false; + } + /* + * Update the category access levels + * + * @param integer $category_id The parent category id + * @param string $levels The access levels + * @access public + * @return boolean + */ + protected static function _updateCategoryAccessLevels($category_id, $levels) { + global $lC_Database; + + $lC_Database->startTransaction(); + + $Qcat = $lC_Database->query('update :table_categories set `access_levels` = :access_levels where `categories_id` = :categories_id'); + $Qcat->bindTable(':table_categories', TABLE_CATEGORIES); + $Qcat->bindInt(':categories_id', $category_id); + $Qcat->bindValue(':access_levels', $levels); + $Qcat->setLogging($_SESSION['module'], $category_id); + $Qcat->execute(); + + if ( !$lC_Database->isError() ) { + $lC_Database->commitTransaction(); + return true; + } + + $lC_Database->rollbackTransaction(); + + return false; + } + /* + * Batch update the category access levels + * + * @param integer $category_id The parent category id + * @param string $levels The access levels + * @access public + * @return boolean + */ + public static function batchEditAccess($data) { + global $lC_Database, $lC_CategoryTree; + + $levels = ''; + if (is_array($data['access_levels'])) { + foreach ($data['access_levels'] as $key => $val) { + $levels .= $key . ';'; + } + $levels = substr($levels, 0, -1); + } + + $syncAllProducts = (isset($data['sync_all_products']) && $data['sync_all_products'] == 'on') ? true: false; + $syncAllChildren = (isset($data['sync_all_children']) && $data['sync_all_children'] == 'on') ? true: false; + + foreach ( $data['batch'] as $category_id ) { + + self::_updateCategoryAccessLevels($category_id, $levels); + + if ($syncAllProducts || $syncAllChildren) { + // get the children categories + $lC_CategoryTree = new lC_CategoryTree_Admin(); + $catArr = $lC_CategoryTree->getArray($category_id); + + foreach ($catArr as $value) { + $catID = end(explode('_', $value['id'])); + if ($syncAllChildren) self::_updateCategoryAccessLevels($catID, $levels); + if ($syncAllProducts) self::_updateProductAccessLevels($catID, $levels); + } + } + } + + return true; + } +} \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/rpc.php b/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/rpc.php new file mode 100644 index 000000000..6a42ef319 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/rpc.php @@ -0,0 +1,33 @@ + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/categories/modal/batchAccess.php b/catalog/addons/Loaded_7_B2B/admin/applications/categories/modal/batchAccess.php new file mode 100644 index 000000000..419376b40 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/categories/modal/batchAccess.php @@ -0,0 +1,88 @@ +modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); + +global $lC_Language, $lC_Template; +?> + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php b/catalog/addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php new file mode 100644 index 000000000..0f08d72a9 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php @@ -0,0 +1,218 @@ +modCheck('includes/applications/customer_groups/classes/customer_groups.php')); + +class lC_Customer_groups_b2b_Admin extends lC_Customer_groups_Admin { + + /* + * Return the data used on the dialog forms + * + * @param integer $id The customer groups id + * @param boolean $edit True = called from edit dialog else called from delete dialog + * @access public + * @return array + */ + public static function getFormData($id = null, $edit = false) { + global $lC_Database, $lC_Language, $lC_Addons; + + $result = parent::getFormData($id, $edit); + + // get the access levels + $Qlevels = $lC_Database->query('select * from :table_customers_access where status = :status'); + $Qlevels->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); + $Qlevels->bindInt(':status', 1); + $Qlevels->execute(); + + $accessHtml = ''; + $levels = array(); + if (is_array($result['cgData'])) { + $levels = explode(';', $result['cgData']['customers_access_levels']); + } + + while ($Qlevels->next()) { + $checked = ( (in_array($Qlevels->valueInt('id'), $levels)) ? ' checked="checked" ' : '' ); + $accessHtml .= '
    '; + } + + $Qlevels->freeResult(); + + // get the payment/shipping addons for the group + $paymentHtml = ''; + $shippingHtml = ''; + foreach($lC_Addons->getAddons('enabled') as $name => $data) { + if ($data['type'] == 'payment' || $data['type'] == 'paypal') { + $checked = (strstr($result['cgData']['payment_modules'], $name)) ? ' checked="checked" ' : ''; + $paymentHtml .= '
    '; + } else if ($data['type'] == 'shipping') { + $checked = (strstr($result['cgData']['shipping_modules'], $name)) ? ' checked="checked" ' : ''; + $shippingHtml .= '
    '; + } + } + $taxStatus = (isset($result['cgData']['taxable']) && $result['cgData']['taxable'] == 1) ? ' checked="checked" ' : ''; + $hpnChecked = (isset($result['cgData']['hidden_products_notification']) && $result['cgData']['hidden_products_notification'] == 1) ? ' checked="checked" ' : ''; + if ($hpnChecked == '' && !isset($_GET['cgid'])) $hpnChecked = ' checked="checked" '; + + $result['extraFormHtml'] = '
    ' . + ' ' . $lC_Language->get('legend_checkout_options') . '' . + '
    ' . + '
    ' . + '
    ' . $lC_Language->get('heading_payment_methods_available') . lc_show_info_bubble($lC_Language->get('info_bubble_payment_methods_available'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . + '

    ' . $paymentHtml . '

    ' . + '
    ' . + '
    ' . + '
    ' . $lC_Language->get('heading_shipping_methods_available') . lc_show_info_bubble($lC_Language->get('info_bubble_shipping_methods_available'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . + '

    ' . $shippingHtml . '

    ' . + '
    ' . $lC_Language->get('heading_taxable_status') . lc_show_info_bubble($lC_Language->get('info_bubble_taxable_status'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . + '

    ' . + '
    ' . + '
    ' . + '
    ' . + '
    ' . + ' ' . $lC_Language->get('legend_catalog_visibility') . '' . + '
    ' . + '
    ' . + '
    ' . $lC_Language->get('heading_access_group_visibility') . lc_show_info_bubble($lC_Language->get('info_bubble_access_group_visibility'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . + '

    ' . $accessHtml . '

    ' . + '
    ' . + '
    ' . + '
    ' . $lC_Language->get('heading_hidden_product_notification') . lc_show_info_bubble($lC_Language->get('info_bubble_hidden_product_notification'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . + '
    ' . + ' ' . + '
    ' . + '

    ' . $lC_Language->get('text_hidden_product_notification_info') . '

    ' . + '
    ' . + '
    ' . + '
    '; + + return $result; + } + + public static function getCustomerAccessLevelsHtml($section = 'customer_groups') { + global $lC_Database, $lC_Language, $pInfo, $cInfo; + + $lC_Language->loadIniFile('customer_groups.php'); + + $levels = array(); + if (isset($pInfo)) { + $levels = explode(';', $pInfo->get('access_levels')); + } else if (isset($cInfo)) { + $levels = explode(';', $cInfo['access_levels']); + } + + // get the access levels + $Qlevels = $lC_Database->query('select * from :table_customers_access where status = :status'); + $Qlevels->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); + $Qlevels->bindInt(':status', 1); + $Qlevels->execute(); + + $accessHtml = '
    '; + + while ($Qlevels->next()) { + $checked = ( (in_array($Qlevels->valueInt('id'), $levels)) ? ' checked="checked" ' : '' ); + $accessHtml .= '
    '; + } + + $Qlevels->freeResult(); + + if ($section == 'categories') { + $accessHtml .= self::_getSyncHtml(); + } + + return $accessHtml; + } + + protected static function _getSyncHtml() { + global $lC_Language; + + $lC_Language->loadIniFile('categories.php'); + + $html = '' . + '
    ' . + ' ' . + ' ' . lc_show_info_bubble($lC_Language->get('info_bubble_sync_products'), null, 'info-spot on-left grey margin-left margin-right') . + '
    ' . + '
    ' . + ' ' . + ' ' . lc_show_info_bubble($lC_Language->get('info_bubble_sync_children'), null, 'info-spot on-left grey margin-left margin-right') . + '
    '; + + return $html; + } + /* + * Save the customer group information + * + * @param integer $id The customer group id used on update, null on insert + * @param array $data An array containing the customer group information + * @param boolean $default True = set the customer group to be the default + * @access public + * @return boolean + */ + public static function save($id = null, $data, $default = false) { + global $lC_Database, $lC_Language; + + $customers_group_id = parent::save($id, $data, $default); + + $error = false; + + $lC_Database->startTransaction(); + + $Qdel = $lC_Database->query('delete from :table_customers_groups_data where customers_group_id = :customers_group_id'); + $Qdel->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); + $Qdel->bindInt(':customers_group_id', $customers_group_id); + $Qdel->execute(); + + $Qgdata = $lC_Database->query('insert into :table_customers_groups_data (customers_group_id, baseline_discount, customers_access_levels, hidden_products_notification, taxable, payment_modules, shipping_modules) values (:customers_group_id, :baseline_discount, :customers_access_levels, :hidden_products_notification, :taxable, :payment_modules, :shipping_modules)'); + $Qgdata->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); + $Qgdata->bindInt(':customers_group_id', $customers_group_id); + $Qgdata->bindFloat(':baseline_discount', $data['baseline']); + $Qgdata->bindValue(':customers_access_levels', self::_arr2str($data['level'])); + $Qgdata->bindInt(':hidden_products_notification', (($data['hidden_products_notification'] == 'on') ? true : false)); + $Qgdata->bindInt(':taxable', $data['taxable']); + $Qgdata->bindValue(':payment_modules', self::_arr2str($data['payment'])); + $Qgdata->bindValue(':shipping_modules', self::_arr2str($data['shipping'])); + $Qgdata->setLogging($_SESSION['module'], $customers_group_id); + $Qgdata->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + } + + if ( $error === false ) { + $lC_Database->commitTransaction(); + + return $customers_group_id; + } + + $lC_Database->rollbackTransaction(); + + return false; + } + /* + * format the array to semi-colo separated string + * + * @param array $arr The array to format + * @access private + * @return string + */ + private static function _arr2str($arr) { + if (!is_array($arr)) return false; + $str = ''; + foreach ($arr as $key => $val) { + $str .= $key . ';'; + } + $str = substr($str, 0, -1); + + return $str; + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php b/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php new file mode 100644 index 000000000..05559ea35 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php @@ -0,0 +1,77 @@ +modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/applications/products/classes/products.php')); +include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/applications/products/classes/products.php')); +include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/applications/customer_groups/classes/customer_groups.php')); + +class lC_Products_b2b_Admin extends lC_Products_pro_Admin { + /* + * Save the product + * + * @param integer $id The products id to update, null on insert + * @param array $data The products information + * @access public + * @return boolean + */ + public static function save($id = null, $data) { + global $lC_Database, $lC_Language; + + $error = false; + + $products_id = lC_Products_pro_Admin::save($id, $data); + + return $products_id; + } + /* + * Batch update the category access levels + * + * @param integer $category_id The parent category id + * @param string $levels The access levels + * @access public + * @return boolean + */ + public static function batchEditAccess($data) { + global $lC_Database; + + $levels = ''; + if (is_array($data['access_levels'])) { + foreach ($data['access_levels'] as $key => $val) { + $levels .= $key . ';'; + } + $levels = substr($levels, 0, -1); + } + + $lC_Database->startTransaction(); + + foreach ( $data['batch'] as $products_id ) { + $Qproduct = $lC_Database->query('update :table_products set `access_levels` = :access_levels where `products_id` = :products_id'); + $Qproduct->bindTable(':table_products', TABLE_PRODUCTS); + $Qproduct->bindInt(':products_id', $products_id); + $Qproduct->bindvalue(':access_levels', $levels); + $Qproduct->setLogging($_SESSION['module'], $products_id); + $Qproduct->execute(); + } + + if ( !$lC_Database->isError() ) { + $lC_Database->commitTransaction(); + return true; + } + + $lC_Database->rollbackTransaction(); + + return false; + } +} \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/rpc.php b/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/rpc.php new file mode 100644 index 000000000..590c3c74f --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/rpc.php @@ -0,0 +1,33 @@ + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/products/modal/batchAccess.php b/catalog/addons/Loaded_7_B2B/admin/applications/products/modal/batchAccess.php new file mode 100644 index 000000000..9a314faf5 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/products/modal/batchAccess.php @@ -0,0 +1,88 @@ +modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); + +global $lC_Language, $lC_Template; +?> + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/products/pages/tabs/relationships_access_levels.inc.php b/catalog/addons/Loaded_7_B2B/admin/applications/products/pages/tabs/relationships_access_levels.inc.php new file mode 100644 index 000000000..66bb0f9af --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/products/pages/tabs/relationships_access_levels.inc.php @@ -0,0 +1,35 @@ +modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); +?> + +
    + get('section_access_levels_overrides'); ?> +
    +
    +
    get('subsection_access'); ?>
    +

    +
    +
    +
    + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/classes/access.php b/catalog/addons/Loaded_7_B2B/admin/classes/access.php new file mode 100644 index 000000000..4fd96283a --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/classes/access.php @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/b2b_indicator.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/b2b_indicator.xml new file mode 100644 index 000000000..81af6fda8 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/b2b_indicator.xml @@ -0,0 +1,13 @@ + + + After Logo Image, add Pro Indicator + 1.0.0 + 2.3.2 + loadedcommerce.com + + + ]]> + B2B' : null; ?>]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/b2b_indiciator.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/b2b_indiciator.xml new file mode 100644 index 000000000..81af6fda8 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/b2b_indiciator.xml @@ -0,0 +1,13 @@ + + + After Logo Image, add Pro Indicator + 1.0.0 + 2.3.2 + loadedcommerce.com + + + ]]> + B2B' : null; ?>]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/category_edit_relationships.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/category_edit_relationships.xml new file mode 100644 index 000000000..65542aed1 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/category_edit_relationships.xml @@ -0,0 +1,21 @@ + + + Enable B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('text_access_levels_upsell_title'); ?>" upselldesc="get('text_access_levels_upsell_desc'); ?>">]]> + ]]> + + + get('access_levels_registered'); ?>

    get('access_levels_wholesale'); ?>

    get('access_levels_dealer'); ?>

    ]]>     + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); echo '

    ' . lC_Customer_groups_b2b_Admin::getCustomerAccessLevelsHtml('categories') . '

    '; ?>]]>     +     + + ]]> + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php')); echo lC_Categories_pro_Admin::getProductRelatedHtml($_GET['categories']); ?>]]> + +     +     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/category_new_relationships.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/category_new_relationships.xml new file mode 100644 index 000000000..c01a3ec52 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/category_new_relationships.xml @@ -0,0 +1,17 @@ + + + Enable B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('text_access_levels_upsell_title'); ?>" upselldesc="get('text_access_levels_upsell_desc'); ?>">]]> + ]]> + + + get('access_levels_registered'); ?>

    get('access_levels_wholesale'); ?>

    get('access_levels_dealer'); ?>

    ]]>     + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); echo '

    ' . lC_Customer_groups_b2b_Admin::getCustomerAccessLevelsHtml() . '

    '; ?>]]>     +     +     +     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/category_pages_main.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/category_pages_main.xml new file mode 100644 index 000000000..669030f76 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/category_pages_main.xml @@ -0,0 +1,13 @@ + + + Enable B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('text_with_selected'); ?>]]> + get('text_edit_access'); ?>]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_rpc.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_rpc.xml new file mode 100644 index 000000000..ebdf2f65f --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_rpc.xml @@ -0,0 +1,21 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php'));]]> + + + + + + + + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/product_edit_relationships.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/product_edit_relationships.xml new file mode 100644 index 000000000..b8527156b --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/product_edit_relationships.xml @@ -0,0 +1,13 @@ + + + Enable B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_main.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_main.xml new file mode 100644 index 000000000..1a7dabf9f --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_main.xml @@ -0,0 +1,13 @@ + + + Enable B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('text_with_selected'); ?>]]> + get('text_edit_access'); ?>]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php new file mode 100644 index 000000000..bf90364a8 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php @@ -0,0 +1,55 @@ +# $Id: b2b_settings.php v1.0 2011-11-04 datazen $ +# +# LoadedCommerce, Innovative eCommerce Solutions +# http://www.loadedcommerce.com +# +# Copyright (c) 2014 LoadedCommerce.com +# +# @author LoadedCommerce Team +# @copyright (c) 2014 LoadedCommerce Team +# @license http://loadedcommerce.com/license.html + +heading_title = B2B Settings + +access_b2b_settings_title = B2B Settings + +heading_customers = Customers +heading_products = Products +heading_guest_access = Guest Access +heading_access_group_levels = Access Group Levels + +table_heading_id = ID +table_heading_group = Access Level +table_heading_members = Members +table_heading_status = Status +table_heading_action = Action + +label_allow_self_registrations = Allow Self Registrations +label_guest_catalog_access = Guest Catalog Access +label_guest = Guest +label_status = Status +label_active = Active +label_registered = Registered +label_new_access_level = New Access Level + +button_create_new = Create New + +modal_heading_delete_customer_access_level = Delete Customer Access Level +modal_heading_edit_customer_access_level = Edit Customer Access Level + +introduction_edit_customer_access_level = Please make the necessary changes for this customer access level. +introduction_delete_customer_access_level = Please verify the removal of this customer access level. +delete_error_customer_access_level_prohibited = Error: The system customer access levels cannot be removed. +delete_error_customer_access_level_in_use = Error: This customer access level is currently assigned to +delete_error_customer_access_level_in_use_end = customers and cannot be removed. + +info_bubble_displays_create_account_form = Displays Create Account Form +info_bubble_guest_catalog_access = Control Guest Access to the Catalog + +text_add_to_cart = Add to Cart +text_members = Members +text_none = None +text_see_pricing = See Pricing +text_view_catalog = View Catalog +text_enable_level = Enable Level +text_disable_level = Disable Level diff --git a/catalog/addons/Loaded_7_B2B/admin/languages/en_US/modules/access/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/languages/en_US/modules/access/b2b_settings.php new file mode 100644 index 000000000..fe908d5af --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/languages/en_US/modules/access/b2b_settings.php @@ -0,0 +1,12 @@ +# $Id: b2b_settings.php v1.0 2013-01-01 datazen $ +# +# LoadedCommerce, Innovative eCommerce Solutions +# http://www.loadedcommerce.com +# +# Copyright (c) 2014 Loaded Commerce, LLC +# +# @author LoadedCommerce Team +# @copyright (c) 2014 LoadedCommerce Team +# @license http://loadedcommerce.com/license.html + +access_b2b_settings_title = B2B Settings \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/modules/access/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/modules/access/b2b_settings.php new file mode 100644 index 000000000..28d15d098 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/modules/access/b2b_settings.php @@ -0,0 +1,23 @@ +_title = $lC_Language->get('access_b2b_settings_title'); + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/classes/product.php b/catalog/addons/Loaded_7_B2B/classes/product.php new file mode 100644 index 000000000..8246b3cb4 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/classes/product.php @@ -0,0 +1,183 @@ +modCheck(DIR_FS_CATALOG . 'includes/classes/product.php')); + +class lC_Product_b2b extends lC_Product { + /* + * Check to see if product has restricted accesa + * + * @access public + * @return array + */ + public static function hasProductAccess($products_id, $customers_group_id) { + global $lC_Database, $lC_Customer; + + $valid = false; + + if ($lC_Customer->isLoggedOn === false) $customers_group_id = 0; + + if ($customers_group_id > 0) { // not guest + + // get the access levels for the group + $Qcg = $lC_Database->query('select customers_access_levels from :table_customers_groups_data where customers_group_id = :customers_group_id limit 1'); + $Qcg->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); + $Qcg->bindInt(':customers_group_id', $customers_group_id); + $Qcg->execute(); + + $cg_access_levels = explode(';', $Qcg->value('customers_access_levels')); + + $Qcg->freeResult(); + + // get the product access levels + $Qproduct = $lC_Database->query('select access_levels from :table_products where products_id = :products_id limit 1'); + $Qproduct->bindTable(':table_products', TABLE_PRODUCTS); + $Qproduct->bindInt(':products_id', $products_id); + $Qproduct->execute(); + + $product_access_levels = explode(';', $Qproduct->value('access_levels')); + + $Qproduct->freeResult(); + + // check if product has access + $valid = false; + if ($Qproduct->value('access_levels') == '') { // if nothing set, valid = true + $valid = true; + } else { + foreach ($product_access_levels as $id) { + if ($id != '') { + if (in_array($id, $cg_access_levels)) { + $valid = true; + break; + } + } + } + } + + } else { + $guestAccess = (defined('B2B_SETTINGS_GUEST_CATALOG_ACCESS') && B2B_SETTINGS_GUEST_CATALOG_ACCESS > 0) ? (int)B2B_SETTINGS_GUEST_CATALOG_ACCESS : 0; + + if ($guestAccess > 0) { + // get the category access levels + $Qproduct = $lC_Database->query('select access_levels from :table_products where products_id = :products_id limit 1'); + $Qproduct->bindTable(':table_products', TABLE_PRODUCTS); + $Qproduct->bindInt(':categories_id', $products_id); + $Qproduct->execute(); + + $product_access_levels = explode(';', $Qproduct->value('access_levels')); + + $Qproduct->freeResult(); + + if ($Qproduct->value('access_levels') == '') { // if nothing set, valid = true + $valid = true; + } else if (in_array('1', $product_access_levels)) { // has guest access at the category level + $valid = true; + } + + } + } + + return $valid; + } + /* + * Check to see if category has restricted accesa + * + * @access public + * @return array + */ + public static function hasCategoryAccess($categories_id, $customers_group_id) { + global $lC_Database, $lC_Customer; + + $valid = false; + + if ($lC_Customer->isLoggedOn() === false) $customers_group_id = 0; + + if ($customers_group_id > 0) { // not guest + + // get the access levels for the group + $Qcg = $lC_Database->query('select customers_access_levels from :table_customers_groups_data where customers_group_id = :customers_group_id limit 1'); + $Qcg->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); + $Qcg->bindInt(':customers_group_id', $customers_group_id); + $Qcg->execute(); + + $cg_access_levels = explode(';', $Qcg->value('customers_access_levels')); + + $Qcg->freeResult(); + + // get the category access levels + $Qcat = $lC_Database->query('select access_levels from :table_categories where categories_id = :categories_id limit 1'); + $Qcat->bindTable(':table_categories', TABLE_CATEGORIES); + $Qcat->bindInt(':categories_id', $categories_id); + $Qcat->execute(); + + $category_access_levels = explode(';', $Qcat->value('access_levels')); + + $Qcat->freeResult(); + + // check if product has access + if ($Qcat->value('access_levels') == '') { // if nothing set, valid = true + $valid = true; + } else { + foreach ($category_access_levels as $id) { + if ($id != '') { + if (in_array($id, $cg_access_levels)) { + $valid = true; + break; + } + } + } + } + + } else { + $guestAccess = (defined('B2B_SETTINGS_GUEST_CATALOG_ACCESS') && B2B_SETTINGS_GUEST_CATALOG_ACCESS > 0) ? (int)B2B_SETTINGS_GUEST_CATALOG_ACCESS : 0; + + if ($guestAccess > 0) { + // get the category access levels + $Qcat = $lC_Database->query('select access_levels from :table_categories where categories_id = :categories_id limit 1'); + $Qcat->bindTable(':table_categories', TABLE_CATEGORIES); + $Qcat->bindInt(':categories_id', $categories_id); + $Qcat->execute(); + + $category_access_levels = explode(';', $Qcat->value('access_levels')); + + $Qcat->freeResult(); + + if ($Qcat->value('access_levels') == '') { // if nothing set, valid = true + $valid = true; + } else if (in_array('1', $category_access_levels)) { // has guest access at the category level + $valid = true; + } + + } + } + + return $valid; + } + + public static function restrictCategories($customers_group_id, $data) { +echo "
    ";
+print_r($data);
+echo "
    "; +die('55'); + + foreach ($data[0] as $key => $top) { + foreach ($data[$key] as $ckey => $child) { +// if ($child['item_id'] != NULL && self::hasCategoryAccess($child['item_id'], $customers_group_id) === false) unset($data[$key][$ckey]); + } + + if ($top['item_id'] != NULL && self::hasCategoryAccess($top['item_id'], $customers_group_id) === false) unset($data[0][$key]); + } + + return $data; + } + +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/controller.php b/catalog/addons/Loaded_7_B2B/controller.php new file mode 100644 index 000000000..33151b0a8 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/controller.php @@ -0,0 +1,154 @@ +modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/controller.php')); +if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/product.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/product.php')); +if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); +if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php')); + +class Loaded_7_B2B extends Loaded_7_Pro { + /* + * Class constructor + */ + public function Loaded_7_B2B() { + global $lC_Language, $lC_Database; + /** + * The addon type (category) + * valid types; payment, shipping, themes, checkout, catalog, admin, reports, connectors, other + */ + $this->_type = 'systems'; + /** + * The addon class name + */ + $this->_code = 'Loaded_7_B2B'; + /** + * The addon title used in the addons store listing + */ + $this->_title = $lC_Language->get('addon_system_b2b_title'); + /** + * The addon description used in the addons store listing + */ + $this->_description = $lC_Language->get('addon_system_b2b_description'); + /** + * The developers name + */ + $this->_author = 'Loaded Commerce, LLC'; + /** + * The developers web address + */ + $this->_authorWWW = 'http://www.loadedcommerce.com'; + /** + * The addon version + */ + $this->_version = '1.0.0'; + /** + * The Loaded 7 core compatibility version + */ + $this->_compatibility = '7.002.2.0'; // the addon is compatible with this core version and later + /** + * The base64 encoded addon image used in the addons store listing + */ + $this->_thumbnail = lc_image(DIR_WS_CATALOG . 'addons/' . $this->_code . '/images/loaded7-b2b.png', $this->_title); + /** + * The addon enable/disable switch + */ + $this->_enabled = $this->_checkAndActivate(); + if ($this->_enabled && !defined('ADDONS_SYSTEM_LOADED_7_B2B_STATUS')) $this->install(); + /** + * Automatically install the module + */ + // $this->_auto_install = true; + } + /** + * Checks to see if the addon has been installed + * + * @access public + * @return boolean + */ + public function isInstalled() { + return (bool)defined('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); + } + /** + * Install the addon + * + * @access public + * @return void + */ + public function install() { + global $lC_Database; + + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Enable AddOn', 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS', '1', 'Do you want to enable this addon?', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())"); + + if ($this->_isConfigInstalled('B2B_SETTINGS_ALLOW_SELF_REGISTER') === false) { + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_ALLOW_SELF_REGISTER', '1', '', '6', '0', '', '', now())"); + } + if ($this->_isConfigInstalled('B2B_SETTINGS_GUEST_CATALOG_ACCESS') === false) { + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_GUEST_CATALOG_ACCESS', '4', '', '6', '0', '', '', now())"); + } + } + /** + * Return the configuration parameter keys an an array + * + * @access public + * @return array + */ + public function getKeys() { + if (!isset($this->_keys)) { + $this->_keys = array('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); + } + + return $this->_keys; + } + /** + * Check if the config key is already in the database + * + * @access protected + * @return boolean + */ + private function _isConfigInstalled($key) { + global $lC_Database; + + $Qcfg = $lC_Database->query('select configuration_id from :table_configuration where configuration_key = :configuration_key'); + $Qcfg->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qcfg->bindValue(':configuration_key', $key); + $Qcfg->execute(); + + $status = ($Qcfg->numberOfRows() > 0) ? true : false; + + $Qcfg->freeResult(); + + return $status; + } + /** + * Check if the Pro addon is active + * + * @access public + * @return array + */ + protected function _checkAndActivate() { + + $isPro = utility::isPro(); + $isB2B = utility::isB2B(); + + $enabled = false; + if ($isPro) { + $enabled = true; + if ($isB2B) { + } else { + $this->install(); + } + } + + return $enabled; + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/account.xml b/catalog/addons/Loaded_7_B2B/hooks/account.xml new file mode 100644 index 000000000..9eb21f8c8 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/account.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + load('account');]]> + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/application_bottom.xml b/catalog/addons/Loaded_7_B2B/hooks/application_bottom.xml new file mode 100644 index 000000000..d413779e2 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/application_bottom.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + stopServices();]]> + isLoggedOn() === false && $page != 'login') { if (defined('B2B_SETTINGS_ALLOW_SELF_REGISTER') && B2B_SETTINGS_ALLOW_SELF_REGISTER == 1 && $page != 'create') { $lC_NavigationHistory->setSnapshot(); lc_redirect(lc_href_link(FILENAME_ACCOUNT, 'login', 'SSL')); }}} if (file_exists('addons/Loaded_7_B2B/javascript/general.js.php')) { include_once('addons/Loaded_7_B2B/javascript/general.js.php'); }}]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/includes_classes_product.xml b/catalog/addons/Loaded_7_B2B/hooks/includes_classes_product.xml new file mode 100644 index 000000000..a10ac6cb3 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/includes_classes_product.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/product.php')); if (lC_Product_b2b::hasProductAccess($id, $lC_Customer->getCustomerGroup($id)) < 66) $priceFormattedResult = '';]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/includes_content_index.xml b/catalog/addons/Loaded_7_B2B/hooks/includes_content_index.xml new file mode 100644 index 000000000..d72bae846 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/includes_content_index.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + _page_contents = 'category_listing.php';]]> + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/product.php')); if (!lC_Product_b2b::hasCategoryAccess($current_category_id, $lC_Customer->getCustomerGroup($id))) { $this->_page_contents = 'category_not_found.php'; }]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_actions_cart_add.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_actions_cart_add.xml new file mode 100644 index 000000000..e813fe089 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_actions_cart_add.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/product.php')); if (!lC_Product_b2b::hasProductAccess($id, $lC_Customer->getCustomerGroup($id))) { $lC_ShoppingCart->reset(); lc_redirect(lc_href_link(FILENAME_INFO, 'permissions')); }]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_featured_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_featured_products.xml new file mode 100644 index 000000000..79295187c --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_featured_products.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + valueInt('products_id'));]]> + valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) $this->_content = ''; return true;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_specials.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_specials.xml new file mode 100644 index 000000000..da9914e2e --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_specials.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + toArray();]]> + valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) $this->_content = ''; return true;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_whats_new.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_whats_new.xml new file mode 100644 index 000000000..7dfe38fa2 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_whats_new.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + valueInt('products_id'));]]> + valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) $this->_content = ''; return true;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_content_also_purchased_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_content_also_purchased_products.xml new file mode 100644 index 000000000..985bc601e --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_content_also_purchased_products.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + _content .= '
    ' . "\n";]]> + getID(), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) continue;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_content_featured_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_content_featured_products.xml new file mode 100644 index 000000000..9b06d371e --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_content_featured_products.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + valueInt('products_id'));]]> + valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) continue;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_content_new_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_content_new_products.xml new file mode 100644 index 000000000..5ce2c9b3d --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_content_new_products.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + valueInt('products_id'));]]> + valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) continue;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_product_listing.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_product_listing.xml new file mode 100644 index 000000000..52232bf3f --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_product_listing.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + valueInt('products_id'));]]> + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/product.php')); if (!lC_Product_b2b::hasProductAccess($Qlisting->valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) continue;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_recently_visited_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_recently_visited_products.xml new file mode 100644 index 000000000..f1f289268 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_recently_visited_products.xml @@ -0,0 +1,17 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + getCustomerGroup($lC_Customer->getID()))) continue;]]> + + + + getCustomerGroup($lC_Customer->getID()))) continue;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_upcoming_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_upcoming_products.xml new file mode 100644 index 000000000..c81c8e104 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_upcoming_products.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + valueInt('products_id'));]]> + valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) continue;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/images/loaded7_b2b.png b/catalog/addons/Loaded_7_B2B/images/loaded7_b2b.png new file mode 100644 index 0000000000000000000000000000000000000000..ff32445bac3c8609ae0eb6d58958b1ca8e32e297 GIT binary patch literal 3220 zcmaJ^c|4SB8=fKCG?FFTA!8~_*~V@%24iO|Gb4K$Gh>WpX3UH|%MnLIva}r(iaLdZ z6Ov>tOCqIX%My_#vPFgPjZSsGKfb>A_rCA5{I2V|@B6v0e;&4@y`>;X8Uz3U1g)*i zFr3km^BMBJ~!qR+MVR!}!U_zw%kRaAUcrpn?!V@EcpO6dz0B$G+ z=gM+L+rbI6AT|6hMlC#u&S7)Jkl}PZA%Mh!_>jmHDgwG#+W>`7hzO{Q4q5|EN0Iy} zR*?)6HqstPhzuYY5TQsTh+#OKBM?Ml;UVEcfm9|u90C2R3+K#tx7DGLuMk!M0{Tx< zu4qRHipC&8bkwv|2^ugML|0c0rmdr^3sZq;YQQwrH8`)XDoh)$qYKy6gM53SoM;T9 zFC1fL@hui-g@F38Sai6$dRSPPT9}p^jX_q285kJsYG`VzauBM_2r3I7u1aMd`mSI` zViFh>I*UT1LUtALKC}=P0?NtspAv%TKV+%QZ^y(rF!gXeT^**Tv0Ku2AR7Jup+P}E z&`cJF^l!fZQ<#a1pp(=wBql9{LEtpb_t0)AIvm9y;aM~Wjz$aoeu|EMG!~8NN25bf zSY3#c3x!Igg)x=C;?ZchHI>Q2Qwbz%GX#{Qphlq(;X3B#<}h7-4Va0x84PBwWuRlB zfzsF4(9}ZdqO`S9-??TqLP!va%KFYF{>z2^l)Gz%AUY?q8Hqs&B@rzcv>?dWlHrt} z=Avi*Q@w9o;!ktYv-l}jos*3EZe#ze(ciZ??%AFGuq|it!}ugB$L$P`tyhA3-2eaq zerq!mT==Vb&j6;3<$*c`qPFMV)?LDr^C}H-kAn@&o%9v-fuIhYsndGnMD;TJD9ET; zqPduhef=zV0uUR`#2)1$dw@8?SkdkRhp>50A+)Xg%f!kh0-mDU?MMo9II0#(}lsVhMRFomtE2AsQN z*!Yb$f3oV*{&0X$6-g((#In%bWEH%sJP-UL zXJ0hP)lrsM&G)=77nplD?a0|Eg14vHt2R}YdZ{=FVyWGj+*B@*!KR;QhqXJ`U%`2# z)m{dVs%5Am54ZHs=nl(Khx1A%GS|f8)0~vv67%x9ql?GV0orUksANPIt_?esE`YU7 z-WM3>Er-rf?ILIz3aE;@1aXV8u0fjJ-U2=AyRSvuV8pU->syAtHyXTjoallK`2^gf zL(j!6QoJ)>`*!l%SDK0;Op!vKa^c;nsP|YWGqDV+8SLb%uCNOTQsg`(a$0l_9H2`vbY{tbpZwm+r9Ey?Q zm$@|6uCgVu^(A#)X2aN9wm|4mqQRQGpG~!BNadM7ErESJnsw7k57w|Z-VU`F+GC=- zGo>Hik4DP2S*6w4n7npNrfw(9KT7k`IC98c(sC0byf1Z{kGtFH%W^kh5=oC$zLbL4 zF!mj@->2z2?eN%GcB0fr6ZL!4;XvxvHXttc#YoykiO_1vc00L|0`G-1x)EFQVyNz7 zcV}yy;FHN;h*P5yT?B7jw{nj|tj9pb^53DLr5KUW@drGLQ&wcHSnf}w#zn7D!Ai*% zMY%BGF($H9h&Qh-DmLLX&!F3QmD_!5fu5@;{_v!OytlDenjVm!zqKght0S`+i1ST+ z0ffNFkdd`M?xK=Urg1D4|FrNlEny9`WUj$Z^dNAiSU|ymfryN z-n*BrptWO0Iw>L*3jgg2yd>vbNaTS^9j=y^f`>};{^jzW@NjD>zM(%)OJKISV#?Ng zcyhDoW62eb$736HeYIL2Rr8$bc50^_C~JDUW)k)c6=0vT;4HN^t0NN|3gGuRW~MmymwqqMRC5OISI+C)N_w+= zD%0&6D{iO_Xe|6GMQjy0akTOoiIwIe=DRGKOdfBrNueP9KP2U+<QVZHw?TDj#I9`D_!>tHKw61O}nZ zkqhQ%m_q?IH@FP@ z)Dau99pkrq9V+1H7mv%7@uI2$fg>}wZ1$F$zErX)zGDO}U#DWc+IS30TOVwR%odyy zrm$OMk0jd94xcwEu^ks@>W5ss_oU-+{U_ZPD2?WEy2JlN%L`sV;* zxwQ2ZvT^g(O&KXXrG4yLq`51mRxCv^1|>Y;f_E>t+{mYvie*iQdB3~HdI_MUI;R_j zO11436XPxJh0DY^mAEuJM@rmz*bSb9!qWUk(FJm#+h1zADsXuI`QtSi6u^noqn(@H ze+=~s=(jX15jvVq+nSe^gTQQsla?J`%#9)z^PWa-xNc5xg<*!cGLg4uw4@6pdS*hs zS7mWb@VMo3FFf)bYfguVoh9!#5F8wtYg{+^82P5A!%g*QWBlZU;ON8k4xjR_f0rdUgd%F z0lRnJDJ%#vzEQqMNxCF4%hqX+-MW0-Lc;s|@oyNHny>GrhR9od5}q8BEu2_X&RxG^ zck;5&(O?D7w{e6XeLSx^JGfatGg&)-DE9(&s3fM{^=7+%`|MkLm9Fhu8i8PmB$+b` zb{Y7m`H#kJZx;>HgcSEyAC|7cmVrL7c4}1kJKakwy(!^uesN6rDBbOMH7MSx8ld$d zRk@I;zY=n{j@;AbAtEGsaO-YKla?!Uzl*|On(i5^MxKIVPBFi(W~5-i#JiqmAQbxJ zl(-|k^o&{EMdYS5B{%RwkVf>pNMrbmzdC)d+E>ZNHxwr4G=*gAxjJbR8=OvPxv#qD z+!^p(%1p|`xy3>(9%MJKowQXRw7xttsTvvx4z$;fNQD-X_eHiP7R+82^~h4yb-j6f z)VXvTxcD)_gWIQHUTCl09m8c08*#5C5%K+8hLzfp&_NIp}$l|=9=fmiF&suK;J47^ zbPJf8?GbX+p>q;_#a@d%3-XE1A + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/languages/en_US.xml b/catalog/addons/Loaded_7_B2B/languages/en_US.xml new file mode 100644 index 000000000..5d76a620c --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/languages/en_US.xml @@ -0,0 +1,15 @@ + + + + + addon_system_b2b_title + + checkout + + + addon_system_b2b_description + + checkout + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php b/catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php new file mode 100644 index 000000000..73513f246 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php @@ -0,0 +1,123 @@ +modCheck(DIR_FS_ADMIN . 'includes/applications/categories/classes/categories.php')); + +class lC_Categories_pro_Admin extends lC_Categories_Admin { + /* + * Save the category record + * + * @param integer $id The category id on update, null on insert + * @param array $data The category information + * @access public + * @return boolean + */ + public static function save($id = null, $data) { + global $lC_Database, $lC_Language; + + $category_id = parent::save($id, $data); + + return $category_id; + } + /* + * Get related products/categories html + * + * @access public + * @return string + */ + public static function getProductRelatedHtml($cid = '') { + global $lC_Language; + + $lC_Language->loadIniFile('categories.php'); + + $pData = self::_getProductsRelated($cid); + + $html = '' . + '
    ' . + ' ' . $lC_Language->get('field_products_related') . '' . + '
    ' . + '
    ' . + '
    ' . + '
    ' . number_format($pData['products_in_category'], 0) . '
    ' . + '
    ' . $lC_Language->get('field_products_in_category') . '
    ' . + '
    ' . + '
    ' . + '
    ' . number_format($pData['number_of_sub_categories'], 0) . '
    ' . + '
    ' . $lC_Language->get('field_sub_categories') . '
    ' . + '
    ' . + '
    ' . + '
    ' . number_format($pData['products_in_sub_categories'], 0) . '
    ' . + '
    ' . $lC_Language->get('field_products_in_sub_categories') . '
    ' . + '
    ' . + '
    ' . + '
    ' . number_format($pData['total_products'], 0) . '
    ' . + '
    ' . $lC_Language->get('field_total_products') . '
    ' . + '
    ' . + '
    ' . + '
    ' . + '
    '; + + return $html; + } + + protected static function _getProductsRelated($cid) { + global $lC_Database, $lC_CategoryTree; + + $total = 0; + $pData = array(); + if (!is_numeric($cid)) return false; + + // get number of products in this category + $Qp2c = $lC_Database->query('select count(*) as total from :table_products_to_categories where `categories_id` = :categories_id'); + $Qp2c->bindTable(':table_products_to_categories', TABLE_PRODUCTS_TO_CATEGORIES); + $Qp2c->bindInt(':categories_id', $cid); + $Qp2c->execute(); + + $pData['products_in_category'] = $Qp2c->valueInt('total'); + $total = (int)$total + $Qp2c->valueInt('total'); + + // get the number of sub categories under this category + $lC_CategoryTree = new lC_CategoryTree_Admin(); + $catArr = $lC_CategoryTree->getArray($cid); + $pData['number_of_sub_categories'] = count($catArr); + + $pCnt = 0; + foreach ($catArr as $value) { + $catID = end(explode('_', $value['id'])); + $pCnt = (int)$pCnt + self::_numberofProducts($catID); + } + $pData['products_in_sub_categories'] = $pCnt; + $total = (int)$total + $pCnt; + + $pData['total_products'] = $total; + + return $pData; + } + + protected static function _numberofProducts($cid) { + global $lC_Database; + + // get number of products in this category + $Qp2c = $lC_Database->query('select count(*) as total from :table_products_to_categories where `categories_id` = :categories_id'); + $Qp2c->bindTable(':table_products_to_categories', TABLE_PRODUCTS_TO_CATEGORIES); + $Qp2c->bindInt(':categories_id', $cid); + $Qp2c->execute(); + + $total = $Qp2c->valueInt('total'); + + $Qp2c->freeResult(); + + return (int)$total; + } +} \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php new file mode 100644 index 000000000..7e8bf8374 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php @@ -0,0 +1,219 @@ +query('select * from :table_product_classes where language_id = :language_id order by name'); + $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qclasses->bindInt(':language_id', $lC_Language->getID()); + $Qclasses->execute(); + + $result = array('aaData' => array()); + while ( $Qclasses->next() ) { + $name = $Qclasses->value('name'); + if ( $Qclasses->valueInt('id') == DEFAULT_PRODUCT_CLASSES_ID ) { + $name .= '' . $lC_Language->get('default_entry') . ''; + } + + $title = '' . $name . ''; + $comment = '' . $Qclasses->value('comment') . ''; + $usage = ' '; + $action = ' + ' . (($media === 'mobile-portrait' || $media === 'mobile-landscape') ? NULL : $lC_Language->get('icon_edit')) . ' + + '; + + $result['aaData'][] = array("$title", "$comment", "$usage", "$action"); + $result['entries'][] = $Qclasses->toArray(); + } + + $Qclasses->freeResult(); + + return $result; + } + /* + * Return the data used on the dialog forms + * + * @param integer $id The customer groups id + * @param boolean $edit True = called from edit dialog else called from delete dialog + * @access public + * @return array + */ + public static function getFormData($id = null, $edit = false) { + global $lC_Database, $lC_Language; + + $result = array(); + if (isset($id) && $id != null) { + if ($edit === true) { + $Qclasses = $lC_Database->query('select language_id, name, comment from :table_product_classes where id = :id'); + $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qclasses->bindInt(':id', $id); + $Qclasses->execute(); + + $status_name = array(); + $result['editComment'] = ''; + while ( $Qclasses->next() ) { + $status_name[$Qclasses->valueInt('language_id')] = $Qclasses->value('name'); + $result['editComment'] = $Qclasses->value('comment'); + } + $result['editNames'] = ''; + foreach ( $lC_Language->getAll() as $l ) { + $result['editNames'] .= '' . lc_draw_input_field('name[' . $l['id'] . ']', (isset($status_name[$l['id']]) ? $status_name[$l['id']] : null), 'class="input-unstyled"') . '
    '; + } + } else { + $Qclasses = $lC_Database->query('select count(*) as total from :table_products where product_class_id = :product_class_id'); + $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qclasses->bindInt(':product_class_id', $id); + $Qclasses->execute(); + + if ( $Qclasses->valueInt('total') > 0 ) { + $result['totalProducts'] = $Qclasses->valueInt('total'); + $result['rpcStatus'] = -2; + } + } + } else { + $result['names'] = ''; + foreach ( $lC_Language->getAll() as $l ) { + $result['names'] .= '' . lc_draw_input_field('name[' . $l['id'] . ']', null, 'class="input-unstyled"') . '
    '; + } + } + + return $result; + } + /* + * Get the customer group information + * + * @param integer $id The customer group id + * @access public + * @return array + */ + public static function getData($id) { + global $lC_Database, $lC_Language; + + $Qclasses = $lC_Database->query('select* from :table_product_classes where id = :id and language_id = :language_id order by name'); + $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qclasses->bindInt(':id', $id); + $Qclasses->bindInt(':language_id', $lC_Language->getID()); + + $data = $Qclasses->toArray(); + + $Qclasses->freeResult(); + + return $data; + } + /* + * Save the customer group information + * + * @param integer $id The customer group id used on update, null on insert + * @param array $data An array containing the customer group information + * @param boolean $default True = set the customer group to be the default + * @access public + * @return boolean + */ + public static function save($id = null, $data, $default = false) { + global $lC_Database, $lC_Language; + + $error = false; + + $lC_Database->startTransaction(); + + if ( is_numeric($id) ) { + $product_class_id = $id; + } else { + $Qpc = $lC_Database->query('select max(id) as product_class_id from :table_product_classes'); + $Qpc->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qpc->execute(); + + $product_class_id = $Qpc->valueInt('product_class_id') + 1; + } + + foreach ( $lC_Language->getAll() as $l ) { + if ( is_numeric($id) ) { + $Qpc = $lC_Database->query('update :table_product_classes set name = :name, comment = :comment where id = :id and language_id = :language_id'); + } else { + $Qpc = $lC_Database->query('insert into :table_product_classes (name, comment, language_id) values (:name, :comment, :language_id)'); + } + + $Qpc->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qpc->bindInt(':id', $product_class_id); + $Qpc->bindValue(':name', $data['name'][$l['id']]); + $Qpc->bindValue(':comment', $data['comment']); + $Qpc->bindInt(':language_id', $l['id']); + $Qpc->setLogging($_SESSION['module'], $product_class_id); + $Qpc->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + break; + } + } + + if ( $error === false ) { + if ( $default === true ) { + $Qupdate = $lC_Database->query('update :table_configuration set configuration_value = :configuration_value where configuration_key = :configuration_key'); + $Qupdate->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qupdate->bindInt(':configuration_value', $product_class_id); + $Qupdate->bindValue(':configuration_key', 'DEFAULT_PRODUCT_CLASSES_ID'); + $Qupdate->setLogging($_SESSION['module'], $product_class_id); + $Qupdate->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + } + } + } + + if ( $error === false ) { + $lC_Database->commitTransaction(); + + if ( $default === true ) { + lC_Cache::clear('configuration'); + } + + return true; + } + + $lC_Database->rollbackTransaction(); + + return false; + } + /* + * Delete the customer group record + * + * @param integer $id The customer group id to delete + * @access public + * @return boolean + */ + public static function delete($id) { + global $lC_Database; + + $Qclasses = $lC_Database->query('delete from :table_product_classes where id = :id'); + $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qclasses->bindInt(':id', $id); + $Qclasses->setLogging($_SESSION['module'], $id); + $Qclasses->execute(); + + if ( $lC_Database->isError() ) { + return false; + } + + return true; + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php new file mode 100644 index 000000000..c418dc4ef --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php @@ -0,0 +1,78 @@ + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php new file mode 100644 index 000000000..faf5f69e2 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php @@ -0,0 +1,39 @@ + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php new file mode 100644 index 000000000..6895ceaa9 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php @@ -0,0 +1,94 @@ + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php new file mode 100644 index 000000000..33b2e1160 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php @@ -0,0 +1,117 @@ + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php new file mode 100644 index 000000000..c9f8bede6 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php @@ -0,0 +1,115 @@ + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php new file mode 100644 index 000000000..9836d1d27 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php @@ -0,0 +1,60 @@ + + +
    + +
    +

    getPageTitle(); ?>

    +
    + +
    +
    + + + + + + + + + + + + + + + + +
    get('table_heading_name'); ?>get('table_heading_comment'); ?>get('table_heading_usage'); ?>  get('table_heading_action'); ?>
     
    +
    +
    + +
    +
    +loadModal($lC_Template->getModule()); ?> + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php new file mode 100644 index 000000000..fa1be3dfe --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php @@ -0,0 +1,28 @@ +_page_title = $lC_Language->get('heading_title'); + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php new file mode 100644 index 000000000..5ebdd8c96 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php @@ -0,0 +1,871 @@ +modCheck(DIR_FS_ADMIN . 'includes/applications/products/classes/products.php')); +include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/applications/customer_groups/classes/customer_groups.php')); + +class lC_Products_pro_Admin extends lC_Products_Admin { + /* + * Save the product + * + * @param integer $id The products id to update, null on insert + * @param array $data The products information + * @access public + * @return boolean + */ + public static function save($id = null, $data) { + global $lC_Database, $lC_Language; + + $error = false; + + $products_id = parent::save($id, $data); + + $group = (defined('DEFAULT_CUSTOMERS_GROUP_ID') && DEFAULT_CUSTOMERS_GROUP_ID != null) ? (int)DEFAULT_CUSTOMERS_GROUP_ID : 1; + + // qty price breaks + if (is_array($data['products_qty_break_point'][$group]) && $data['products_qty_break_point'][$group][1] != null) { + if ($products_id != null) { + + $lC_Database->startTransaction(); + + // remove any old pricing records + $Qpricing = $lC_Database->query('delete from :table_products_pricing where products_id = :products_id'); + $Qpricing->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qpricing->bindInt(':products_id', $products_id); + $Qpricing->setLogging($_SESSION['module'], $products_id); + $Qpricing->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + } else { + // add the new records + + foreach($data['products_qty_break_point'][$group] as $key => $val) { + + if ($data['products_qty_break_point'][$group][$key] == null) continue; + if ($data['products_qty_break_point'][$group][$key] == '1') continue; + + $Qpb = $lC_Database->query('insert into :table_products_pricing (products_id, group_id, tax_class_id, qty_break, price_break, date_added) values (:products_id, :group_id, :tax_class_id, :qty_break, :price_break, :date_added)'); + $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qpb->bindInt(':products_id', $products_id ); + $Qpb->bindInt(':group_id', $group); + $Qpb->bindInt(':tax_class_id', $data['tax_class_id'] ); + $Qpb->bindValue(':qty_break', $data['products_qty_break_point'][$group][$key] ); + $Qpb->bindValue(':price_break', $data['products_qty_break_price'][$group][$key] ); + $Qpb->bindRaw(':date_added', 'now()'); + $Qpb->setLogging($_SESSION['module'], $products_id); + $Qpb->execute(); + } + } + + if ( $error === false ) { + $lC_Database->commitTransaction(); + } + + $lC_Database->rollbackTransaction(); + } + } + + // subproducts + if ( $error === false ) { + if (isset($data['sub_products_name'])) { + + if (is_numeric($id)) { + // first delete the subproducts that have been removed and not in the post data + $Qchk = $lC_Database->query('select products_id from :table_products where parent_id = :parent_id'); + $Qchk->bindTable(':table_products', TABLE_PRODUCTS); + $Qchk->bindInt(':parent_id', $products_id); + $Qchk->execute(); + + while( $Qchk->next() ) { + if (! @in_array($Qchk->valueInt('products_id'), $data['sub_products_id'])) { + self::delete($Qchk->valueInt('products_id')); + } + } + } else { + // delete any possible ghosts for sanity + $Qdel = $lC_Database->query('delete from :table_products where parent_id = :products_id and is_subproduct = :is_subproduct'); + $Qdel->bindTable(':table_products', TABLE_PRODUCTS); + $Qdel->bindInt(':parent_id', $products_id); + $Qdel->bindInt(':is_subproduct', 1); + $Qdel->execute(); + } + + for ($i=0; $i < sizeof($data['sub_products_name']); $i++) { + if ($data['sub_products_name'][$i] == '') continue; + + if (is_numeric($id) && @in_array($data['sub_products_id'][$i], $data['sub_products_id'])) { + // update the subproduct record + $Qsubproduct = $lC_Database->query('update :table_products set products_quantity = :products_quantity, products_cost = :products_cost, products_price = :products_price, products_sku = :products_sku, products_weight = :products_weight, products_weight_class = :products_weight_class, products_status = :products_status, products_tax_class_id = :products_tax_class_id, products_date_added = :products_date_added, is_subproduct = :is_subproduct where parent_id = :parent_id and products_id = :products_id'); + $Qsubproduct->bindInt(':products_id', $data['sub_products_id'][$i]); + } else { + // add new subproduct record + $Qsubproduct = $lC_Database->query('insert into :table_products (parent_id, products_quantity, products_cost, products_price, products_sku, products_weight, products_weight_class, products_status, products_tax_class_id, products_ordered, products_date_added, is_subproduct) values (:parent_id, :products_quantity, :products_cost, :products_price, :products_sku, :products_weight, :products_weight_class, :products_status, :products_tax_class_id, :products_ordered, :products_date_added, :is_subproduct)'); + $Qsubproduct->bindInt(':products_ordered', $data['products_ordered'][$i]); + } + + $Qsubproduct->bindTable(':table_products', TABLE_PRODUCTS); + $Qsubproduct->bindInt(':parent_id', $products_id); + $Qsubproduct->bindInt(':products_quantity', $data['sub_products_qoh'][$i]); + $Qsubproduct->bindFloat(':products_cost', preg_replace('/[^0-9]\./', '', $data['sub_products_cost'][$i])); + $Qsubproduct->bindFloat(':products_price', preg_replace('/[^0-9]\./', '', $data['sub_products_price'][1][$i])); // retail group - other prices go into pricing table + $Qsubproduct->bindValue(':products_sku', $data['sub_products_sku'][$i]); + $Qsubproduct->bindFloat(':products_weight', $data['sub_products_weight'][$i]); + $Qsubproduct->bindInt(':products_weight_class', $data['weight_class']); + $Qsubproduct->bindInt(':products_status', $data['sub_products_status'][$i]); + $Qsubproduct->bindInt(':products_tax_class_id', $data['tax_class_id']); + $Qsubproduct->bindRaw(':products_date_added', 'now()'); + $Qsubproduct->bindInt(':is_subproduct', ($data['sub_products_default'][$i] == '1' || sizeof($data['sub_products_name']) == 2) ? 2 : 1); + $Qsubproduct->setLogging($_SESSION['module'], $products_id); + $Qsubproduct->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + } else { + if ( is_numeric($id) && @in_array($data['sub_products_id'][$i], $data['sub_products_id']) ) { + $sub_products_id = $data['sub_products_id'][$i]; + } else { + $sub_products_id = self::_getLastID(); + } + // subproduct description + foreach ($lC_Language->getAll() as $l) { + if (is_numeric($id) && @in_array($data['sub_products_id'][$i], $data['sub_products_id'])) { + $Qpd = $lC_Database->query('update :table_products_description set products_name = :products_name where products_id = :products_id and language_id = :language_id'); + } else { + $Qpd = $lC_Database->query('insert into :table_products_description (products_id, language_id, products_name) values (:products_id, :language_id, :products_name)'); + } + $Qpd->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION); + $Qpd->bindInt(':products_id', $sub_products_id); + $Qpd->bindInt(':language_id', $l['id']); + $Qpd->bindValue(':products_name', $data['sub_products_name'][$i]); + $Qpd->setLogging($_SESSION['module'], $sub_products_id); + $Qpd->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + break; + } + } + } + + //subproduct images + if ( $error === false ) { + if (empty($_FILES['sub_products_image']['name'][$i]) === false) { + $images = array(); + $file = array('name' => $_FILES['sub_products_image']['name'][$i], + 'type' => $_FILES['sub_products_image']['type'][$i], + 'size' => $_FILES['sub_products_image']['size'][$i], + 'tmp_name' => $_FILES['sub_products_image']['tmp_name'][$i]); + + $products_image = new upload($file); + + $products_image->set_extensions(array('gif', 'jpg', 'jpeg', 'png')); + + if ( $products_image->exists() ) { + $products_image->set_destination(realpath('../images/products/originals')); + + if ( $products_image->parse() && $products_image->save() ) { + $images[] = $products_image->filename; + } + } + + $default_flag = 1; + + foreach ($images as $image) { + $Qimage = $lC_Database->query('insert into :table_products_images (products_id, image, default_flag, sort_order, date_added) values (:products_id, :image, :default_flag, :sort_order, :date_added)'); + $Qimage->bindTable(':table_products_images', TABLE_PRODUCTS_IMAGES); + $Qimage->bindInt(':products_id', $sub_products_id); + $Qimage->bindValue(':image', $image); + $Qimage->bindInt(':default_flag', $default_flag); + $Qimage->bindInt(':sort_order', 0); + $Qimage->bindRaw(':date_added', 'now()'); + $Qimage->setLogging($_SESSION['module'], $products_id); + $Qimage->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + } else { + foreach ($lC_Image->getGroups() as $group) { + if ($group['id'] != '1') { + $lC_Image->resize($image, $group['id']); + } + } + } + $default_flag = 0; + } + } + } + } + } + } + + // combo variants + if ( $error === false ) { + $variants_array = array(); + $default_variant_combo = null; + + if ( isset($data['variants']) && !empty($data['variants']) ) { + foreach ( $data['variants'] as $key => $combo ) { + if (isset($data['variants'][$key]['product_id']) && $data['variants'][$key]['product_id'] != 0) { + $Qsubproduct = $lC_Database->query('update :table_products set products_quantity = :products_quantity, products_cost = :products_cost, products_price = :products_price, products_msrp = :products_msrp, products_model = :products_model, products_sku = :products_sku, products_weight = :products_weight, products_weight_class = :products_weight_class, products_status = :products_status, products_tax_class_id = :products_tax_class_id where products_id = :products_id'); + $Qsubproduct->bindInt(':products_id', $data['variants'][$key]['product_id']); + } else { + $Qsubproduct = $lC_Database->query('insert into :table_products (parent_id, products_quantity, products_cost, products_price, products_msrp, products_model, products_sku, products_weight, products_weight_class, products_status, products_tax_class_id, products_date_added) values (:parent_id, :products_quantity, :products_cost, :products_price, :products_msrp, :products_model, :products_sku, :products_weight, :products_weight_class, :products_status, :products_tax_class_id, :products_date_added)'); + $Qsubproduct->bindInt(':parent_id', $products_id); + $Qsubproduct->bindRaw(':products_date_added', 'now()'); + } + + $price = 0.00; + if (is_array($data['variants'][$key]['price'])) $price = $data['variants'][$key]['price'][0]; + + $Qsubproduct->bindTable(':table_products', TABLE_PRODUCTS); + $Qsubproduct->bindInt(':products_quantity', $data['variants'][$key]['qoh']); + $Qsubproduct->bindFloat(':products_cost', $data['variants'][$key]['cost']); + $Qsubproduct->bindFloat(':products_price', $price); + $Qsubproduct->bindFloat(':products_msrp', $data['variants'][$key]['msrp']); + $Qsubproduct->bindValue(':products_model', $data['variants'][$key]['model']); + $Qsubproduct->bindValue(':products_sku', $data['variants'][$key]['sku']); + $Qsubproduct->bindFloat(':products_weight', $data['variants'][$key]['weight']); + $Qsubproduct->bindInt(':products_weight_class', $data['weight_class']); + $Qsubproduct->bindInt(':products_status', $data['variants'][$key]['status']); + $Qsubproduct->bindInt(':products_tax_class_id', $data['tax_class_id']); + $Qsubproduct->setLogging($_SESSION['module'], $products_id); + $Qsubproduct->execute(); + + if ( isset($data['variants'][$key]['product_id']) && $data['variants'][$key]['product_id'] != '0') { + $subproduct_id = $data['variants'][$key]['product_id']; + } else { + $Qnext = $lC_Database->query('select max(products_id) as maxID from :table_products'); + $Qnext->bindTable(':table_products', TABLE_PRODUCTS); + $Qnext->execute(); + $subproduct_id = $Qnext->valueInt('maxID'); + $Qnext->freeResult(); + } + + if ( $data['variants'][$key]['default_combo'] == 1) { + $default_variant_combo = $subproduct_id; + } + + foreach ( $data['variants'][$key]['values'] as $values_id => $values_text ) { + + $variants_array[$subproduct_id][] = $values_id; + + $check_combos_array[] = $values_id; + + $Qcheck = $lC_Database->query('select products_id from :table_products_variants where products_id = :products_id and products_variants_values_id = :products_variants_values_id'); + $Qcheck->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qcheck->bindInt(':products_id', $subproduct_id); + $Qcheck->bindInt(':products_variants_values_id', $values_id); + $Qcheck->execute(); + + if ( $Qcheck->numberOfRows() < 1 ) { + + $Qvcombo = $lC_Database->query('insert into :table_products_variants (products_id, products_variants_values_id) values (:products_id, :products_variants_values_id)'); + $Qvcombo->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qvcombo->bindInt(':products_id', $subproduct_id); + $Qvcombo->bindInt(':products_variants_values_id', $values_id); + $Qvcombo->setLogging($_SESSION['module'], $products_id); + $Qvcombo->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + break 2; + } + } + } + + } + } + + if ( $error === false ) { + if ( empty($variants_array) ) { + $Qcheck = $lC_Database->query('select pv.* from :table_products p, :table_products_variants pv where p.parent_id = :parent_id and p.products_id = pv.products_id'); + $Qcheck->bindTable(':table_products', TABLE_PRODUCTS); + $Qcheck->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qcheck->bindInt(':parent_id', $products_id); + $Qcheck->execute(); + + while ( $Qcheck->next() ) { + $Qdel = $lC_Database->query('delete from :table_products_variants where products_id = :products_id'); + $Qdel->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); + $Qdel->execute(); + + $Qdel = $lC_Database->query('delete from :table_products where products_id = :products_id'); + $Qdel->bindTable(':table_products', TABLE_PRODUCTS); + $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); + $Qdel->execute(); + + } + } else { + $Qcheck = $lC_Database->query('select pv.* from :table_products p, :table_products_variants pv where p.parent_id = :parent_id and p.products_id = pv.products_id and pv.products_id not in (":products_id")'); + $Qcheck->bindTable(':table_products', TABLE_PRODUCTS); + $Qcheck->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qcheck->bindInt(':parent_id', $products_id); + $Qcheck->bindRaw(':products_id', implode('", "', array_keys($variants_array))); + $Qcheck->execute(); + + while ( $Qcheck->next() ) { + $Qdel = $lC_Database->query('delete from :table_products_variants where products_id = :products_id and products_variants_values_id = :products_variants_values_id'); + $Qdel->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); + $Qdel->bindInt(':products_variants_values_id', $Qcheck->valueInt('products_variants_values_id')); + $Qdel->execute(); + + $Qdel = $lC_Database->query('delete from :table_products where products_id = :products_id'); + $Qdel->bindTable(':table_products', TABLE_PRODUCTS); + $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); + $Qdel->execute(); + + } + + foreach ( $variants_array as $key => $values ) { + $Qdel = $lC_Database->query('delete from :table_products_variants where products_id = :products_id and products_variants_values_id not in (":products_variants_values_id")'); + $Qdel->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qdel->bindInt(':products_id', $key); + $Qdel->bindRaw(':products_variants_values_id', implode('", "', $values)); + $Qdel->execute(); + } + } + } + + $Qupdate = $lC_Database->query('update :table_products set has_children = :has_children where products_id = :products_id'); + $Qupdate->bindTable(':table_products', TABLE_PRODUCTS); + $Qupdate->bindInt(':has_children', (empty($variants_array)) ? 0 : 1); + $Qupdate->bindInt(':products_id', $products_id); + $Qupdate->execute(); + + } + + if ( $error === false ) { + $Qupdate = $lC_Database->query('update :table_products_variants set default_combo = :default_combo where products_id in (":products_id")'); + $Qupdate->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qupdate->bindInt(':default_combo', 0); + $Qupdate->bindRaw(':products_id', implode('", "', array_keys($variants_array))); + $Qupdate->execute(); + + if ( is_numeric($default_variant_combo) ) { + $Qupdate = $lC_Database->query('update :table_products_variants set default_combo = :default_combo where products_id = :products_id'); + $Qupdate->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qupdate->bindInt(':default_combo', 1); + $Qupdate->bindInt(':products_id', $default_variant_combo); + $Qupdate->execute(); + } + } + + // customer access levels (B2B) + if ( $error === false ) { + $levels = ''; + if (is_array($data['access_levels'])) { + foreach($data['access_levels'] as $key => $val) { + $levels .= $key . ';'; + } + $levels = substr($levels, 0, -1); + } + + $Qupdate = $lC_Database->query('update :table_products set access_levels = :access_levels where products_id = :products_id'); + $Qupdate->bindTable(':table_products', TABLE_PRODUCTS); + $Qupdate->bindValue(':access_levels', $levels); + $Qupdate->bindInt(':products_id', $products_id); + $Qupdate->execute(); + } + + return $products_id; // Return the products id for use with the save_close buttons + + } + /* + * Return the product simple options accordian price listing content + * + * @access public + * @return array + */ + public static function getOptionsPricingContent() { + global $lC_Language, $pInfo; + + $content = ''; + $groups = lC_Customer_groups_Admin::getAll(); + foreach($groups['entries'] as $key => $value) { + $content .= '
    ' . $value['customers_group_name'] . '
    ' . + '
    ' . + '
    '; + + if (isset($pInfo) && is_array($pInfo->get('simple_options'))) { + $content .= '
    ' . + '
    ' . $lC_Language->get('text_simple_options') . '
    ' . + ' ' . + ' ' . lC_Products_Admin::getSimpleOptionsPricingTbody($pInfo->get('simple_options'), $value['customers_group_id']) . '' . + '
    ' . + '
    '; + + } + + if (isset($pInfo) && $pInfo->get('has_subproducts') == '1') { + $content .= '
    ' . + '
    ' . $lC_Language->get('text_sub_products') . '
    ' . + ' ' . + ' ' . lC_Products_pro_Admin::getSubProductsPricingTbody($pInfo, $value['customers_group_id']) . '' . + '
    ' . + '
    '; + + } + + if (isset($pInfo) && $pInfo->get('has_children') == '1') { + $content .= '
    ' . + '
    ' . $lC_Language->get('text_combo_options') . '
    ' . + ' ' . + ' ' . lC_Products_pro_Admin::getComboOptionsPricingTbody($pInfo, $value['customers_group_id']) . '' . + '
    ' . + '
    '; + } + + if ( (!isset($pInfo)) || (isset($pInfo) && $pInfo->get('has_subproducts') != '1' && $pInfo->get('has_children') != '1' && !is_array($pInfo->get('simple_options'))) ) { + $content .= '
    ' . $lC_Language->get('text_no_options_defined') . '
    '; + } + + $content .= '
    ' . + '
    '; + } + + return $content; + } + + /* + * Returns the icons used in the product listing + * + * @param integer $id The products id + * @access public + * @return string + */ + public static function getlistingIcons($products_id) { + global $lC_Language; + + $icons = parent::getlistingIcons($products_id); + + if (self::hasSubProducts($products_id)) { + $icons .= ''; + } + if (self::hasComboOptions($products_id)) { + $icons .= ''; + } + + return $icons; + } + /* + * Returns the price info used in the product listing + * + * @param integer $data The product data array + * @access public + * @return string + */ + public function getProductsListingPrice($data) { + global $lC_Database, $lC_Language, $lC_Currencies; + + if (self::hasSubProducts($data['products_id']) === false && self::hasComboOptions($data['products_id']) === false) { + $price = parent::getProductsListingPrice($data); + } else { + $mm = self::getMinMaxPrice($data['products_id']); + $price = ($mm['min'] == $mm['max']) ? $lC_Currencies->format($mm['min']) : '(' . $lC_Currencies->format($mm['min']) . ' - ' . $lC_Currencies->format($mm['max']) . ')'; + } + + return $price; + } + /* + * Returns the min/max price used in the product listing + * + * @param integer $id The product id + * @access public + * @return string + */ + public static function getMinMaxPrice($id) { + global $lC_Database; + + $Qproducts = $lC_Database->query('select MAX(products_price) as max, MIN(products_price) as min from :table_products where parent_id = :parent_id'); + $Qproducts->bindTable(':table_products', TABLE_PRODUCTS); + $Qproducts->bindInt(':parent_id', $id); + $Qproducts->execute(); + + $result = $Qproducts->toArray(); + + $Qproducts->freeResult(); + + return $result; + } + /* + * Returns the price info used in the product listing + * + * @param integer $data The product data array + * @access public + * @return string + */ + public function getProductsListingQty($data) { + global $lC_Database; + + if (self::hasSubProducts($data['products_id']) === false && self::hasComboOptions($data['products_id']) === false) { + $result = $data['products_quantity']; + } else { + $Qproducts = $lC_Database->query('select SUM(products_quantity) as total from :table_products where parent_id = :parent_id'); + $Qproducts->bindTable(':table_products', TABLE_PRODUCTS); + $Qproducts->bindInt(':parent_id', $data['products_id']); + $Qproducts->execute(); + + $result = '(' . $Qproducts->valueInt('total') . ')'; + + $Qproducts->freeResult(); + } + + return $result; + } + + /* + * Determine if product has qty price breaks + * + * @param integer $id The product id + * @access public + * @return boolean + */ + public static function hasQPBPricing($id) { + global $lC_Database; + + $Qpb = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id limit 1'); + $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qpb->bindInt(':products_id', $id); + $Qpb->execute(); + + $rows = $Qpb->numberOfRows(); + + $Qpb->freeResult(); + + if ( $rows > 0 ) { + return true; + } + + return false; + } + /* + * Retrieve qty price breaks + * + * @param integer $id The product id + * @param integer $group The customer group id + * @access public + * @return array + */ + public static function getQPBPricing($id, $group = null) { + global $lC_Database; + + if ($group == null) $group = (defined('DEFAULT_CUSTOMERS_GROUP_ID') && DEFAULT_CUSTOMERS_GROUP_ID != null) ? (int)DEFAULT_CUSTOMERS_GROUP_ID : 1; + + $Qpb = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id and group_id = :group_id order by qty_break asc'); + $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qpb->bindInt(':products_id', $id); + $Qpb->bindInt(':group_id', $group); + $Qpb->execute(); + + $data = array(); + while($Qpb->next()) { + $data[] = $Qpb->toArray(); + } + + $Qpb->freeResult(); + + return $data; + } + /* + * Return the qty price breaks listing content + * + * @access public + * @return array + */ + public static function getQPBPricingContent() { + global $lC_Language, $lC_Currencies, $pInfo; + + $content = ''; + $groups = lC_Customer_groups_Admin::getAll(); + foreach($groups['entries'] as $key => $value) { + + if ($value['customers_group_id'] == DEFAULT_CUSTOMERS_GROUP_ID) { // locked to default for Pro + + $base = (isset($pInfo)) ? (float)$pInfo->get('products_price') : 0.00; + $special = (isset($pInfo)) ? (float)$pInfo->get('products_special_price') : 0.00; + + $content .= '' . + + '
    ' . + '
    ' . + '
    ' . + ' #' . + ' ' . + '
    ' . + ' Qty' . + '
    ' . + ' ' . $lC_Currencies->getSymbolLeft() . '' . + ' ' . + '
    ' . + ' Price' . + '
    '; + + + if ( isset($pInfo) && self::hasQPBPricing($pInfo->get('products_id')) ) { + + $qpbData = self::getQPBPricing($pInfo->get('products_id'), $value['customers_group_id']); + + $cnt = 0; + foreach ($qpbData as $key => $val) { + $content .= self::_getNewQPBPricingRow($val['group_id'], $key+1, $val); + $cnt = $key+1; + } + // add a new row + $content .= self::_getNewQPBPricingRow($value['customers_group_id'], $cnt+1); + } else { // no qpb recorded, setup new + $content .= self::_getNewQPBPricingRow($value['customers_group_id'], 1); + } + + $content .= '
    '; + } + } + + return $content; + } + /* + * Generate qty price break row + * + * @param integer $group The customer group id + * @param integer $cnt The product id + * @param array $data The product data + * @access private + * @return string + */ + private static function _getNewQPBPricingRow($group, $cnt, $data = array()) { + global $lC_Currencies; + + $content = '
    ' . + '
    ' . + ' #' . + ' ' . + '
    ' . + ' Qty' . + '
    ' . + ' ' . $lC_Currencies->getSymbolLeft() . '' . + ' ' . + '
    ' . + ' Price' . + '
    '; + + return $content; + } + /* + * Determine if the product has combo options + * + * @param integer $id The product id + * @access public + * @return boolean + */ + public static function hasComboOptions($id) { + global $lC_Database; + + $Qchk = $lC_Database->query('select has_children from :table_products where parent_id = :parent_id and products_id = :products_id limit 1'); + $Qchk->bindTable(':table_products', TABLE_PRODUCTS); + $Qchk->bindInt(':parent_id', 0); + $Qchk->bindInt(':products_id', $id); + $Qchk->execute(); + + return ( $Qchk->valueInt('has_children') === 1 ); + } + /* + * Return the combo options listing content + * + * @param array $options The multi sku options array + * @access public + * @return array + */ + public static function getComboOptionsContent($options = array()) { + $content = ''; + + $content .= self::_getComboOptionsTbody($options); + + return $content; + } + /* + * Return the combo options pricing content + * + * @param array $data The product data object + * @access public + * @return string + */ + public static function getComboOptionsPricingTbody($pInfo, $customers_group_id) { + global $lC_Currencies; + + if ($customers_group_id == '') return false; + $ok = (defined('ADDONS_SYSTEM_LOADED_7_PRO_STATUS') && ADDONS_SYSTEM_LOADED_7_PRO_STATUS == '1') ? true : false; + + $tbody = ''; + $cnt = 0; + if (isset($pInfo) && $pInfo->get('has_children') == '1') { + + foreach ($pInfo->get('variants') as $product_id => $val) { + $title = ''; + if (is_array($val['values'])) { + foreach ($val['values'] as $group_id => $value_id) { + foreach ($value_id as $value) { + $title .= $value['value_title'] . ', '; + } + } + } + if (strstr($title, ',')) $title = substr($title, 0, -2); + + if ((isset($title) && $title != NULL)) { + $tbody .= '' . + ' ' . $title . '' . + ' ' . + '
    ' . + ' ' . $lC_Currencies->getSymbolLeft() . '' . + ' ' . + '
    ' . + ' ' . + ''; + $cnt++; + } + } + } + + return $tbody; + } + /* + * Return the product simple options tbody content + * + * @param array $options The product simple options array + * @access public + * @return string + */ + private static function _getComboOptionsTbody($options) { + global $lC_Currencies, $lC_Language; + + $tbody = ''; + $sort = 10; + $cnt = 0; + if (isset($options) && !empty($options)) { + foreach ($options as $product_id => $mso) { + $combo = ''; + $default = ''; + $module = ''; + $comboInput = ''; + if (is_array($mso['values'])) { + foreach ($mso['values'] as $group_id => $value_id) { + foreach ($value_id as $key => $data) { + $combo .= $data['value_title'] . ', '; + $module = $data['module']; + $default = $data['default']; + $default_visual = $data['default_visual']; + $comboInput .= ''; + $comboInput .= ''; + } + } + if (strstr($combo, ',')) $combo = substr($combo, 0, -2); + + $statusIcon = (isset($mso['data']['status']) && $mso['data']['status'] == '1') ? '' : ''; + $defaultIcon = (isset($default) && $default == '1') ? '' : ''; + + $tbody .= '' . $comboInput . + ' ' . + ' ' . $combo . '' . + ' ' . $defaultIcon . '' . + ' +
    + + ' . lC_Weight::getCode(SHIPPING_WEIGHT_UNIT) . ' +
    + ' . + ' ' . + ' ' . + ' +
    + ' . $lC_Currencies->getSymbolLeft() . ' + +
    + ' . + ' ' . + ' ' . + ' ' . + ' ' . + ' ' . $statusIcon . '' . + ' + + + ' . + ''; + } + $sort = ($sort + 10); + $cnt++; + } + } + + return $tbody; + } + /* + * Determine if the product has subproducts + * + * @param integer $id The product id + * @access public + * @return boolean + */ + public static function hasSubProducts($id) { + global $lC_Database; + + $Qchk = $lC_Database->query('select products_id from :table_products where parent_id = :parent_id and is_subproduct > :is_subproduct limit 1'); + $Qchk->bindTable(':table_products', TABLE_PRODUCTS); + $Qchk->bindInt(':parent_id', $id); + $Qchk->bindInt(':is_subproduct', 0); + $Qchk->execute(); + + if ( $Qchk->numberOfRows() === 1 ) { + return true; + } + + return false; + } + /* + * Return the sub products pricing content + * + * @param array $data The product data object + * @access public + * @return string + */ + public static function getSubProductsPricingTbody($pInfo, $customers_group_id) { + global $lC_Currencies; + + if ($customers_group_id == '') return false; + $ok = (defined('ADDONS_SYSTEM_LOADED_7_PRO_STATUS') && ADDONS_SYSTEM_LOADED_7_PRO_STATUS == '1') ? true : false; + + $tbody = ''; + $cnt = 0; + if (isset($pInfo) && $pInfo->get('has_subproducts') == '1') { + foreach ($pInfo->get('subproducts') as $key => $sub) { + if ((isset($sub['products_name']) && $sub['products_name'] != NULL)) { + + $tbody .= '' . + ' ' . $sub['products_name'] . '' . + ' ' . + '
    ' . + ' ' . $lC_Currencies->getSymbolLeft() . '' . + ' ' . + '
    ' . + ' ' . + ''; + $cnt++; + } + } + } + + return $tbody; + } +} \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php new file mode 100644 index 000000000..4c2e2fc1b --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php @@ -0,0 +1,30 @@ + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php new file mode 100644 index 000000000..8ede8347c --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php @@ -0,0 +1,603 @@ + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php new file mode 100644 index 000000000..eb9762b92 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php @@ -0,0 +1,347 @@ + +
    + + +
    + +
    + get('button_setup'); ?> + + + + + + + + + + + + + + + + get('variants')) : null); ?> +
     get('table_heading_option_set_name'); ?> get('table_heading_weight'); ?>get('table_heading_sku'); ?>get('table_heading_qoh'); ?>get('table_heading_price'); ?>get('table_heading_img'); ?>get('table_heading_status'); ?>get('table_heading_action'); ?>
    +
    + +
    + + + + + + + + + + + + + + +
    get('table_heading_name'); ?>get('table_heading_status'); ?>get('table_heading_weight'); ?>get('table_heading_sku'); ?>get('table_heading_qoh'); ?>get('table_heading_base_price'); ?>get('table_heading_img'); ?>get('table_heading_action'); ?>
    +
    + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php new file mode 100644 index 000000000..0cca1baa8 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php @@ -0,0 +1,127 @@ + +
    + + get('info_bubble_pricing_qty_price_breaks'), null, 'info-spot on-left grey margin-left'); ?> + +
    +     +
    + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml new file mode 100644 index 000000000..105dfd5e7 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml @@ -0,0 +1,17 @@ + + + Categories Save + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php'));]]> + + + + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml new file mode 100644 index 000000000..496b547ae --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml @@ -0,0 +1,13 @@ + + + Modify Customers Listing Page + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('icon_login_as_customer') . ' (PRO)">]]> + value('customers_email_address')) . '" class="button icon-monitor with-tooltip' . ((int)($_SESSION['admin']['access'][$_module] < 4) ? ' disabled' : NULL) . '" title="' . $lC_Language->get('icon_login_as_customer') . '">]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml new file mode 100644 index 000000000..41ee6411f --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml @@ -0,0 +1,13 @@ + + + Add Pro DB Tables + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml new file mode 100644 index 000000000..dd08bab59 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml @@ -0,0 +1,17 @@ + + + extend products save() + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/products/classes/products.php')); if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php'));]]> + + + _module]) && is_numeric($_GET[$this->_module]) ? $_GET[$this->_module] : null), $data);]]> + _module]) && is_numeric($_GET[$this->_module]) ? $_GET[$this->_module] : null), $data); } else { $id = (int)lC_Products_pro_Admin::save((isset($_GET[$this->_module]) && is_numeric($_GET[$this->_module]) ? $_GET[$this->_module] : null), $data); }]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml new file mode 100644 index 000000000..38c0134f4 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml @@ -0,0 +1,28 @@ + + + After Image Groups, add Product Classes + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + loadIniFile(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php', null, null, true);]]> + $lC_Template->setSubOf('product_settings'); + + + + '?image_groups'),]]> + 'classes.png', + 'title' => $lC_Language->get('access_product_classes_title'), + 'identifier' => '?product_classes'), ]]> + + + + + 0) { $ok = TRUE;]]> + 0) { $ok = TRUE;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml new file mode 100644 index 000000000..4ea50ef92 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml @@ -0,0 +1,17 @@ + + + Enable Multi SKU Inv Control + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('text_multi_sku'); ?>" upselldesc="get('text_multi_sku_desc'); ?>" for="ic_radio_2" class="upsellinfo disabled oicb button red-activegetInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> + getInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> + + + get('text_multi_sku') . '' . lc_go_pro() . ''; ?>]]> + get('text_multi_sku'); ?>]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml new file mode 100644 index 000000000..f98547c16 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml @@ -0,0 +1,17 @@ + + + Enable Pro on Images Tab + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('text_additional_images'); ?>]]> + get('text_additional_images'); ?>]]> + + + ]]> +
    get('subsection_original_images'); ?>
    get('subsection_images'); ?>
    ]]> +     +     +     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml new file mode 100644 index 000000000..22a99b369 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml @@ -0,0 +1,26 @@ + + + Enable Pro on Options Tab + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('text_multi_sku'); ?>" upselldesc="get('text_multi_sku_desc'); ?>" for="ioc_radio_2" class="upsellinfo disabled oicb button red-activegetInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> + getInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> + + + get('text_multi_sku') . '' . lc_go_pro() . ''; ?>]]> + get('text_multi_sku'); ?>]]> + + + ]]> + ]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml new file mode 100644 index 000000000..4e12adc5d --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml @@ -0,0 +1,17 @@ + + + QPB Pricing + 1.0.0 + 2.3.2 + loadedcommerce.com + + + ]]> + ]]> + + + ]]> + ]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml new file mode 100644 index 000000000..7d0db0aa1 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml @@ -0,0 +1,25 @@ + + + Products Class + 1.0.0 + 2.3.2 + loadedcommerce.com + + + valueInt('products_id'));]]> + valueInt('products_id'));]]> + + + toArray());]]> + toArray());]]> + + + toArray());]]> + toArray());]]> + + + + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/products/classes/products.php')); if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php'));]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml new file mode 100644 index 000000000..83959d3d1 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml @@ -0,0 +1,13 @@ + + + Hide Pro Template Pack + 1.0.0 + 2.3.2 + loadedcommerce.com + + + $type ) {]]> + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php new file mode 100644 index 000000000..7dc443b88 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php @@ -0,0 +1,12 @@ +# $Id: product_classes.php v1.0 2013-01-01 datazen $ +# +# LoadedCommerce, Innovative eCommerce Solutions +# http://www.loadedcommerce.com +# +# Copyright (c) 2013 Loaded Commerce, LLC +# +# @author LoadedCommerce Team +# @copyright (c) 2013 LoadedCommerce Team +# @license http://loadedcommerce.com/license.html + +access_product_classes_title = Product Classes \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php new file mode 100644 index 000000000..c0acd0786 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php @@ -0,0 +1,12 @@ +# $Id: product_classes.php v1.0 2013-01-01 datazen $ +# +# LoadedCommerce, Innovative eCommerce Solutions +# http://www.loadedcommerce.com +# +# Copyright (c) 2013 Loaded Commerce, LLC +# +# @author LoadedCommerce Team +# @copyright (c) 2013 LoadedCommerce Team +# @license http://loadedcommerce.com/license.html + +product_attributes_product_classes_title = Product Classes \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php new file mode 100644 index 000000000..c15fcc747 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php @@ -0,0 +1,38 @@ +# $Id: product_classes.php v1.0 2011-11-04 datazen $ +# +# LoadedCommerce, Innovative eCommerce Solutions +# http://www.loadedcommerce.com +# +# Copyright (c) 2011 LoadedCommerce.com +# +# @author LoadedCommerce Team +# @copyright (c) 2011 LoadedCommerce Team +# @license http://loadedcommerce.com/license.html + +heading_title = Product Classes + +access_product_classes_title = Product Classes + +table_heading_name = Name +table_heading_comment = Comment +table_heading_usage = Usage +table_heading_action = Action + +modal_heading_new_class = New Product Class +modal_heading_edit_class = Edit Product Class +modal_heading_delete_class = Delete Product Class + +field_name = Name: +field_comment = Comment: +field_status = Status: +field_set_as_default = Set as Default? + +button_new_class = New Class + +introduction_new_class = Please fill in the following information for the new class. +introduction_edit_class = Please make the necessary changes for this class. +introduction_delete_class = Please verify the removal of this classe. + +delete_error_class_prohibited = Error: The default class cannot be removed. +delete_error_class_in_use_1 = Error: This class is currently assigned to +delete_error_class_in_use_2 = product(s) and cannot be removed. \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php new file mode 100644 index 000000000..16087e42f --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php @@ -0,0 +1,45 @@ +_section = 'dataManagementSettings'; + } + + public function setFunction($value) { + global $lC_Database, $lC_Language; + + $string = ''; + + if (defined('ADDONS_SYSTEM_LOADED_7_PRO_STATUS') && ADDONS_SYSTEM_LOADED_7_PRO_STATUS == '1') { + $Qclass = $lC_Database->query('select id, name from :table_product_classes where language_id = :language_id order by name'); + $Qclass->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qclass->bindInt(':language_id', $lC_Language->getID()); + $Qclass->execute(); + + $classes = array(); + while ( $Qclass->next() ) { + $classes[] = array('id' => $Qclass->valueInt('id'), + 'text' => $Qclass->value('name')); + } + + if ( !empty($classes) ) { + $string = lc_draw_pull_down_menu('attributes[' . self::getID() . ']', $classes, $value, 'class="select full-width"'); + } + } + + return $string; + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/content/account/login.inc.php b/catalog/addons/Loaded_7_Pro/content/account/login.inc.php new file mode 100644 index 000000000..053cfed2d --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/content/account/login.inc.php @@ -0,0 +1,67 @@ +query('select user_password from :table_administrators'); + $Qadmin->bindTable(':table_administrators', TABLE_ADMINISTRATORS); + $Qadmin->execute(); + + $validated = false; + while ( $Qadmin->next()) { + if ( _validateAdminPassword($password, $Qadmin->value('user_password')) ) { + $validated = true; + break; + } + } + + return $validated; +} + +// check for admin session +if (isset($_SESSION['admin_login'])) unset($_SESSION['admin_login']); +if (validateAdminPassword($_POST['password'])) { + $_SESSION['admin_login'] = true; + } + } +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/controller.php b/catalog/addons/Loaded_7_Pro/controller.php new file mode 100644 index 000000000..069c3eb5c --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/controller.php @@ -0,0 +1,288 @@ +modCheck(DIR_FS_CATALOG . 'includes/classes/transport.php')); +if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php')); +if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php')); + +class Loaded_7_Pro extends lC_Addon { // your addon must extend lC_Addon + /* + * Class constructor + */ + public function Loaded_7_Pro() { + global $lC_Language, $lC_Database; + /** + * The addon type (category) + * valid types; payment, shipping, themes, checkout, catalog, admin, reports, connectors, other + */ + $this->_type = 'systems'; + /** + * The addon class name + */ + $this->_code = 'Loaded_7_Pro'; + /** + * The addon title used in the addons store listing + */ + $this->_title = $lC_Language->get('addon_system_pro_title'); + /** + * The addon description used in the addons store listing + */ + $this->_description = $lC_Language->get('addon_system_pro_description'); + /** + * The developers name + */ + $this->_author = 'Loaded Commerce, LLC'; + /** + * The developers web address + */ + $this->_authorWWW = 'http://www.loadedcommerce.com'; + /** + * The addon version + */ + $this->_version = '1.2.0'; + /** + * The Loaded 7 core compatibility version + */ + $this->_compatibility = '7.002.0.0'; // the addon is compatible with this core version and later + /** + * The base64 encoded addon image used in the addons store listing + */ + $this->_thumbnail = lc_image(DIR_WS_CATALOG . 'addons/' . $this->_code . '/images/loaded7_pro.png', $this->_title); + /** + * The addon enable/disable switch + */ + if (defined('INSTALLATION_ID') && INSTALLATION_ID != '') { + // if ($this->_timeToCheck() === true) { + // $this->_enabled = $this->_validateSerial(INSTALLATION_ID); + // if ($this->_enabled) $this->_updateLastChecked(); + // } else { + $this->_enabled = (defined('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS') && @constant('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS') == '1') ? true : false; + // } + // if (!$this->_enabled) { + // $lC_Database->simpleQuery("update " . TABLE_CONFIGURATION . " set configuration_value = '0' where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); + // } else { + // $lC_Database->simpleQuery("update " . TABLE_CONFIGURATION . " set configuration_value = '1' where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); + // } + } else { + $this->_enabled = false; + } + /** + * Automatically install the module + */ + $this->_auto_install = true; + } + /** + * Checks to see if the addon has been installed + * + * @access public + * @return boolean + */ + public function isInstalled() { + return (bool)defined('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); + } + /** + * Install the addon + * + * @access public + * @return void + */ + public function install() { + global $lC_Database; + + if (isset($_SESSION['remove_loaded_7_pro']) && $_SESSION['remove_loaded_7_pro'] == true) { + unset($_SESSION['remove_loaded_7_pro']); + $this->_clearCache(); + } else if (!$this->_checkStatus()) { + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Enable AddOn', 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS', '1', 'Do you want to enable this addon?', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())"); + $lC_Database->simpleQuery("delete from " . TABLE_TEMPLATES_BOXES . " where modules_group like '%Loaded_7_Pro%'"); + $lC_Database->simpleQuery("insert into " . TABLE_TEMPLATES_BOXES . " (title, code, author_name, author_www, modules_group) values ('Loaded 7 Pro', '" . $this->_type . "', '" . $this->_author . "','" . $this->_authorWWW . "', 'systems|Loaded_7_Pro')"); + // product classes + if (!defined('DEFAULT_PRODUCT_CLASSES_ID')) { + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'DEFAULT_PRODUCT_CLASSES_ID'"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'DEFAULT_PRODUCT_CLASSES_ID', '1', '', '6', '0', '', '', now())"); + $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . DB_TABLE_PREFIX . "product_classes` (id int(11) NOT NULL AUTO_INCREMENT,`name` varchar(128) NOT NULL DEFAULT '', `comment` varchar(255) DEFAULT NULL, `status` tinyint(1) NOT NULL DEFAULT '0', language_id int(11) NOT NULL DEFAULT '1', PRIMARY KEY (id)) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci AUTO_INCREMENT=2;"); + $lC_Database->simpleQuery("delete from `" . DB_TABLE_PREFIX . "product_classes` where id = '1'"); + $lC_Database->simpleQuery("insert into `" . DB_TABLE_PREFIX . "product_classes` (id, name, comment, status, language_id) VALUES ('1', 'Common', 'Common Class', 1, 1);"); + $lC_Database->simpleQuery("delete from " . TABLE_TEMPLATES_BOXES . " where code = 'product_classes'"); + $lC_Database->simpleQuery("insert into " . TABLE_TEMPLATES_BOXES . " (title, code, author_name, author_www, modules_group) VALUES ('Product Classes', 'product_classes', 'Loaded Commerce, LLC', 'http://www.loadedcommerce.com', 'product_attributes')"); + $lC_Database->simpleQuery("alter table " . TABLE_PRODUCTS . " ADD `is_subproduct` TINYINT( 1 ) NOT NULL DEFAULT '0'"); + } + // skip shipping + if (!defined('SKIP_CHECKOUT_SHIPPING_PAGE')) { + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'SKIP_CHECKOUT_SHIPPING_PAGE'"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Skip Shipping Page', 'SKIP_CHECKOUT_SHIPPING_PAGE', '-1', 'Bypass the checkout shipping page? No shipping will be charged.', 19, 0, NULL, now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); + } + // qty breaks config + if (!defined('PRODUCT_PRICING_QPB_FORMAT')) { + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'PRODUCT_PRICING_QPB_FORMAT'"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Price Break Format', 'PRODUCT_PRICING_QPB_FORMAT', 'Range', 'The price break format shown on the product listing pages.', 8, 11, NULL, now(), NULL, 'lc_cfg_set_boolean_value(array(''None'', ''Range'', ''Starts At'', ''Low As''))')"); + } + + $this->_clearCache(); + } + } + /** + * Return the configuration parameter keys an an array + * + * @access public + * @return array + */ + public function getKeys() { + global $lC_Database; + + if (!isset($this->_keys)) { + $this->_keys = array('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); + } + + return $this->_keys; + } + /** + * Remove the addon + * + * @access public + * @return void + */ + public function remove() { + global $lC_Database, $lC_Language; + + if ($this->hasKeys()) { + $Qdel = $lC_Database->query('delete from :table_configuration where configuration_key in (":configuration_key")'); + $Qdel->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qdel->bindRaw(':configuration_key', implode('", "', $this->getKeys())); + $Qdel->execute(); + } + + if (file_exists(DIR_FS_CATALOG . 'addons/' . $this->_code . '/languages/' . $lC_Language->getCode() . '.xml')) { + foreach ($lC_Language->extractAddonDefinitions(DIR_FS_CATALOG . 'addons/' . $this->_code . '/languages/' . $lC_Language->getCode() . '.xml') as $def) { + $Qdel = $lC_Database->query('delete from :table_languages_definitions where definition_key = :definition_key and content_group = :content_group'); + $Qdel->bindTable(':table_languages_definitions', TABLE_LANGUAGES_DEFINITIONS); + $Qdel->bindValue(':definition_key', $def['key']); + $Qdel->bindValue(':content_group', $def['group']); + $Qdel->execute(); + } + } + // product classes + $lC_Database->simpleQuery("DROP TABLE IF EXISTS `" . DB_TABLE_PREFIX . "product_classes`"); + $lC_Database->simpleQuery("alter table " . TABLE_PRODUCTS . " DROP COLUMN `is_subproduct`"); + $lC_Database->simpleQuery("delete from " . TABLE_TEMPLATES_BOXES . " where modules_group like '%Loaded_7_Pro%'"); + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'DEFAULT_PRODUCT_CLASSES_ID'"); + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'SKIP_CHECKOUT_SHIPPING_PAGE'"); + + $_SESSION['remove_loaded_7_pro'] = true; + + $this->_clearCache(); + } + /** + * Clear the cache + * + * @access public + * @return void + */ + private function _clearCache() { + lC_Cache::clear('configuration'); + lC_Cache::clear('languages'); + lC_Cache::clear('addons'); + lC_Cache::clear('vqmoda'); + } + /** + * Check the addon install status + * + * @access public + * @return void + */ + private function _checkStatus() { + $addons = ''; + if (file_exists('../includes/work/cache/addons.cache')) { + $addons = @file_get_contents('../includes/work/cache/addons.cache'); + } + + return (strstr($addons, 'Loaded_7_Pro/controller.php') != '') ? true : false; + } + /** + * Validate the serial is valid and active + * + * @access private + * @return boolean + */ + private function _validateSerial($serial) { + $result = array(); + $validateArr = array('serial' => $serial, + 'storeName' => STORE_NAME, + 'storeEmail' => STORE_OWNER_EMAIL_ADDRESS, + 'storeWWW' => HTTP_SERVER . DIR_WS_HTTP_CATALOG); + + $checksum = hash('sha256', json_encode($validateArr)); + $validateArr['checksum'] = $checksum; + + $resultXML = transport::getResponse(array('url' => 'https://api.loadedcommerce.com/1_0/check/serial/?product=pro', 'method' => 'post', 'parameters' => $validateArr)); + $result = utility::xml2arr($resultXML); + + if ($result['data']['error'] == '1') return false; + + return ($result['data']['valid'] == '1') ? true : false; + } + /** + * Check to see if it's time to re-check addon validity + * + * @access private + * @return boolean + */ + private function _timeToCheck() { + global $lC_Database; + + $itsTime = false; + + $today = substr(lC_DateTime::getShort(@date("Y-m-d H:m:s")), 3, 2); + + $instID = (defined('INSTALLATION_ID') && INSTALLATION_ID != '') ? INSTALLATION_ID : NULL; + if ($instID == NULL) return true; + + $last_checked = (isset($_SESSION['Loaded_7_Pro']['last_checked']) && $_SESSION['Loaded_7_Pro']['last_checked'] != NULL) ? $_SESSION['Loaded_7_Pro']['last_checked'] : NULL; + + if ($last_checked == NULL || $today != substr(lC_DateTime::getShort($last_checked), 3, 2)) { + + $itsTime = true; + + $Qcheck = $lC_Database->query('select last_modified from :table_configuration where configuration_key = :configuration_key'); + $Qcheck->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qcheck->bindValue(':configuration_key', 'ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); + $Qcheck->execute(); + + $last_checked = $Qcheck->value('last_modified'); + $_SESSION['Loaded_7_Pro']['last_checked'] = $last_checked; + + $Qcheck->freeResult(); + } + + return $itsTime; + } + /** + * Update the time last checked the install ID + * + * @access private + * @return void + */ + private function _updateLastChecked() { + global $lC_Database; + + $Qcheck = $lC_Database->query('update :table_configuration set last_modified = :last_modified where configuration_key = :configuration_key'); + $Qcheck->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qcheck->bindValue(':configuration_key', 'ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); + $Qcheck->bindRaw(':last_modified', 'now()'); + $Qcheck->execute(); + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml b/catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml new file mode 100644 index 000000000..832693dfd --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml @@ -0,0 +1,13 @@ + + + Admin Login as Customer + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/images/loaded7_pro.png b/catalog/addons/Loaded_7_Pro/images/loaded7_pro.png new file mode 100644 index 0000000000000000000000000000000000000000..5529704c677ed7ee1095f75c7e7b683aa705f6cf GIT binary patch literal 3708 zcmaJ^dpy(o{~xkkBT7iDxus!-O&@$2`wy)TdF^Z9zdU$56cpC}tEGhqQ~0RR9Xj5WvDaz-1@ zi{=AzzKhDbEY2XsFmYtqQQa5;cp3>{NTj-wKv*)~on%YG6EFF-kk9}C57^V*k>Q9t zfg(`J>i8XudLY@C!{&(T2m0a(-XsRdmE`V8(FM;}R)ayFL|yP{I8FoSYfSR+G!LSY z?1HT92|?ZjBoVBy2SNv;I09r60}l!$`%vhpKwa=JT@+`&vke7Uty zjHxsd2(GTBM$mx4KnR37OdF0sz*Iq+8Zb?$2IoPj!L(6u1WHo}^v?z6M57ViP_`J; ze`0Y~x?m3m!xsgG1_T7C2WY8NY3@)M5{cZ=(9~4pAk^rWC=7g{8ig+ZTLD9&6KI~k z3{NTrw4;c3rTQ~;!5pXmIRe@DUs($MpEPk21`WjfLSgC}J4gBr#NqybD4F~(n$EB# z{nzjRDNMJ&YUuu?8G&qyaP3#=u}ET1YK8{Fo^m zW`xny#F!W(eseKYfkwi45QOTfRM@D)6(TkzU zANBs>694GM(DaX7D8~$Rr?CI4(7(4h-Lo_Ow{1C#e;c1f;dDEV)7FjF#xVeZzycOy zXdgH*>->Xm*Smjf_`UiWN6iauUK)L>Sf1wwT`Ig?+BFJ1<=UMs&>#0>tt^he?@$QA zY#yj7$7QA=xWw*;E5w!(jm{WpGFahXP1i37q57S3c;xorgX@z&_Z>=<*-K?vQahWxi{vH3KX>FI;vi4 z2R3@$-n@n3Hbw6-uGXLb>=IOTrDE{@Ldu;>``V(LG~=;S$r+?a1z}$ww}j^IzTWw= z^0QuqUUG>k;LTT~6s0!_^e5*8XC|=53D+cY)_|F7D~2;)jh0&X=b%uTF;YC6guhyH zV;1+Y(L>jI`gwH+L>|97)bcj@{@;@-Ru2JQ#5+y*49~jVL-MR9NjN^lh2_4M^}@+s zs|9^8qU3m_Hbe-TyHpD3riU9Dw3_N4xwhW~$dz|YMzZWnvajAsckrf`FZXc8Ok~DS zp|~(6kt?Q$H;+9uk0*OPpO<`eJb<*wiPpLOm56G8tQ{5*rr z@BB8Y7C|umu{bwulGqd_tHb-vmBm9aK&ZUiEpN;lg#< z8*=^Zvy#4)3yf174%kZ1^9qcx(Qr@VU-b`lwDU`!0 zMtj*sVcVf|d~CK{XXG9DOi$f2k|39^r%k!X+MJ=hR7s4S^5HbWQy;h?CEaVSkflnO z0nsyd4(H7hLUT7@_l)MN!lt9dvmi-+{=Rx!$38+FY7nGW05AtT_b^20bHif!>cm@! zCvl-Y&D{B=IX5-zE2FmmrRcE#On4*GK|FHqHe~NsFPG!NgJVO*c+tQ``c&uI@a4!1 z-QBOMzhtZbtC%FQrprD1`>ig9B&4!vil5Iy^54^LU5w2V7vfMRZCG*}# z>p^{4&~5bDnQyq`5o3w8p#7&?MEx&kuFp&_)n}SCtGi$>OsOk8IWJe`-C$9{XVBSj z+X=eQHKmTV{Csb@8hD);g@Z8bGl4o8|U+&R3sAgN`c(S@7*V23u938)FCMyu#r78$(w!(jPS(RT( zP1tR2T2rc>*ZrM+$A2=#wQ*DOyfQ=ilW2 zHprA+qVCablzG6r{4nF&uAmn^BNwH0k3W@PuVsEgIU5#9tHkatieg5JxhZ>}3mtPi z*TL;rM`ESi!iu;I@$|_nsmy|vt+QrUbVRd*lE^Gudsy+)Tofv|+TTc5)n04rS>KOk zK3Nn?;kL`s2ui$WS*^d{Q@PL@C*ZwPIT)1^Su0T?nX+@a@r=yLZiO8B=xIM&ZLrWj z_L#Ud_u*g*qke14!-k(7;tS2E6RbM}z90E=nyF!}a+0EW1YP-b-hd^>3SkFzlRw&s z*1;`9`1ILD2}UXXsk779Bm`QA@SyEi+yQ*XV zc0qC-B>iTfNl@?*YS*pQYCr=v!Wui>#m#j`VN?6IaW3XXLx$Pw4S`^@7z1miyzzzX ziy!h+hsG9)2A{`Ojgk9fr+W{?c~qaiKuRSRA5ts3FQcpElzcwPudiTYcbYYt%goMh ztn85j%hpX|21Dyx2B{rt6V^k!DL2m}~ngM1TBnzVKMkf0JCBgZ5+ z?>TYxTZMCf^TF{mrIIU9YEzp2&%HzQ^AVL5{s5xa9Is&K!r(}a>2O@Z;TZ1pdxRkQ zpYL>;(l4t4Xw8vVo2&AMD;i}Ehvx9tUHsIXx5{R76Qv-R0r?`x8+!^Wf!I>5q03wR z2fjER^2|~sFeMvGpjFp)MbMOQlfIpO=Gs;8q%J)mbM#D=WJi)4W}qVyK{ukcQ*My2 z1moGbt}fil<#)|;#_urEE}u6S$6&?N3MT$2+T@44iK}1F#`0>p*jhk=uw|A)i{a+M zK^0hcef3g*>VuLdgwGFnd@UeI@27cw8vi|=`Z)J6)e1e@$6{hI`mE}tI-q|>X2-hyjD5XseQtMGq z_rUFkCNiKK86mRl?N`@ho?Qf6DLU6r;udV=fZ6*%uUs9GsujS`-BWQupG9?51}XILE=moj!LlK8y&Vtz=UE#=VDcEVBl4W#MC8+YNh z^eb9?<YStWW^1|4}sQRD#0^+3cE!cyXOEi>R>Y>z~Q zf>FAr=~EN2^sLGJ*fDKIZ)tsRpIJkb?Q+Ao1-scq&kEKl&`_5+R^`);@_y4Bx()*P zj_!O#w&hl~_m^k>yp2`yuum|qdLu=bjoT!|EV(qw>3m9Gs;E{6Q)rc6xHw+8)!GeR zBq6jn@*AzZan0gZJHSEY{JaR|V_v~VuB`;`E$=Mzw_nk@ZwOu~Fw4wsuj-ubMszK>VkMb$O+LcJDy5(7^ziVnB#uPO+ReXvkD zesq59Q;~&>zT1Y%jmK@k7@xOgu=P0|!agqTZCV`vXg05nPDx;=f-9|4Xv|EyPU*T5 z4-QZr(f;%7h7wOT3~*QUuF#bnz+Jw(*ol+O;& + + + + addon_system_pro_title + + checkout + + + addon_system_pro_description + + checkout + + + text_admin_session_active + + general + + + \ No newline at end of file From 0dbee63ca8b2bd0e1e170252c5a84365b776d67e Mon Sep 17 00:00:00 2001 From: datazen Date: Tue, 15 Jul 2014 14:30:38 -0400 Subject: [PATCH 057/168] merge work --- catalog/addons/Loaded_7_B2B/controller.php | 11 +++++------ .../work/updates/runAfter/controller.php | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/catalog/addons/Loaded_7_B2B/controller.php b/catalog/addons/Loaded_7_B2B/controller.php index 33151b0a8..8e6de109d 100644 --- a/catalog/addons/Loaded_7_B2B/controller.php +++ b/catalog/addons/Loaded_7_B2B/controller.php @@ -88,12 +88,11 @@ public function install() { $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Enable AddOn', 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS', '1', 'Do you want to enable this addon?', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())"); - if ($this->_isConfigInstalled('B2B_SETTINGS_ALLOW_SELF_REGISTER') === false) { - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_ALLOW_SELF_REGISTER', '1', '', '6', '0', '', '', now())"); - } - if ($this->_isConfigInstalled('B2B_SETTINGS_GUEST_CATALOG_ACCESS') === false) { - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_GUEST_CATALOG_ACCESS', '4', '', '6', '0', '', '', now())"); - } + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'B2B_SETTINGS_ALLOW_SELF_REGISTER'"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_ALLOW_SELF_REGISTER', '1', '', '6', '0', '', '', now())"); + + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'B2B_SETTINGS_GUEST_CATALOG_ACCESS'"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_GUEST_CATALOG_ACCESS', '4', '', '6', '0', '', '', now())"); } /** * Return the configuration parameter keys an an array diff --git a/catalog/includes/work/updates/runAfter/controller.php b/catalog/includes/work/updates/runAfter/controller.php index 6f606dbe5..17661a013 100644 --- a/catalog/includes/work/updates/runAfter/controller.php +++ b/catalog/includes/work/updates/runAfter/controller.php @@ -375,10 +375,22 @@ public static function updateDB() { parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Allowed File Types', 'PRODUCT_MODULES_FILE_UPLOAD_TYPES', '.zip,.pdf,.png,.gif,.jpg,.tiff,.gzip,.gz', 'Enter the allowed file upload extensions in a comma delimited format.', 22, 0, now(), now(), NULL, NULL);"); } - if (!defined('PRODUCT_MODULES_FILE_UPLOAD_MAX_SIZE')) { + if (!defined('PRODUCT_MODULES_FILE_UPLOAD_MAX_SIZE')) { $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Maximum Upload File Size', 'PRODUCT_MODULES_FILE_UPLOAD_MAX_SIZE', '10', 'Enter the maximum size allowed for file uploads.', 22, 0, now(), now(), NULL, NULL);"); parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Maximum Upload File Size', 'PRODUCT_MODULES_FILE_UPLOAD_MAX_SIZE', '10', 'Enter the maximum size (in MB) allowed for file uploads.', 22, 0, now(), now(), NULL, NULL);"); - } + } + + if (utility::isB2B) { + if (!defined('B2B_SETTINGS_ALLOW_SELF_REGISTER')) { + $lC_Database->simpleQuery("insert into `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_ALLOW_SELF_REGISTER', '1', '', '6', '0', '', '', now())"); + parent::log("Database Update: insert into `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_ALLOW_SELF_REGISTER', '1', '', '6', '0', '', '', now())"); + } + + if (!defined('B2B_SETTINGS_GUEST_CATALOG_ACCESS')) { + $lC_Database->simpleQuery("insert into `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_GUEST_CATALOG_ACCESS', '4', '', '6', '0', '', '', now())"); + parent::log("Database Update: insert into `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_GUEST_CATALOG_ACCESS', '4', '', '6', '0', '', '', now())"); + } + } } } From 9149d48389765c97971fe7125624243e5dbbe250 Mon Sep 17 00:00:00 2001 From: datazen Date: Tue, 15 Jul 2014 15:02:22 -0400 Subject: [PATCH 058/168] merge work --- .../applications/products/products.php | 128 +++++++++--------- .../admin/includes/classes/category_tree.php | 2 +- .../modules/services/category_path.php | 2 +- 3 files changed, 66 insertions(+), 66 deletions(-) diff --git a/catalog/admin/includes/applications/products/products.php b/catalog/admin/includes/applications/products/products.php index 1ad0edf87..2cc1973c2 100644 --- a/catalog/admin/includes/applications/products/products.php +++ b/catalog/admin/includes/applications/products/products.php @@ -1,65 +1,65 @@ -modCheck('includes/applications/products/classes/products.php')); -require_once($lC_Vqmod->modCheck('includes/applications/product_attributes/classes/product_attributes.php')); -require_once($lC_Vqmod->modCheck('../includes/classes/variants.php')); - -class lC_Application_Products extends lC_Template_Admin { - /* - * Protected variables - */ - protected $_module = 'products', - $_page_title, - $_page_contents = 'main.php'; - /* - * Class constructor - */ - public function __construct() { - global $lC_Language, $lC_MessageStack, $lC_Currencies, $lC_Tax, $lC_CategoryTree, $lC_Image, $current_category_id, $lC_Vqmod; - - $this->_page_title = $lC_Language->get('heading_title'); - - $current_category_id = 0; - - if ( isset($_GET['cID']) && is_numeric($_GET['cID']) ) { - $current_category_id = $_GET['cID']; - } else { - $_GET['cID'] = $current_category_id; - } - - require($lC_Vqmod->modCheck('../includes/classes/currencies.php')); - $lC_Currencies = new lC_Currencies(); - - require($lC_Vqmod->modCheck('includes/classes/tax.php')); - $lC_Tax = new lC_Tax_Admin(); - - require($lC_Vqmod->modCheck('includes/classes/category_tree.php')); - $lC_CategoryTree = new lC_CategoryTree_Admin(); - $lC_CategoryTree->setSpacerString(' ', 2); - - require($lC_Vqmod->modCheck('includes/classes/image.php')); - $lC_Image = new lC_Image_Admin(); - - // check if the products image directory exists and is writeable - if ( is_dir('../images/products') ) { - if ( !is_writeable('../images/products') ) { - $_SESSION['error'] = true; - $_SESSION['errmsg'] = sprintf($lC_Language->get('ms_error_image_directory_not_writable'), realpath('../images/products')); - } - } else { - $_SESSION['error'] = true; - $_SESSION['errmsg'] = sprintf($lC_Language->get('ms_error_image_directory_non_existant'), realpath('../images/products')); - } - } -} +modCheck('includes/applications/products/classes/products.php')); +require_once($lC_Vqmod->modCheck('includes/applications/product_attributes/classes/product_attributes.php')); +require_once($lC_Vqmod->modCheck('../includes/classes/variants.php')); + +class lC_Application_Products extends lC_Template_Admin { + /* + * Protected variables + */ + protected $_module = 'products', + $_page_title, + $_page_contents = 'main.php'; + /* + * Class constructor + */ + public function __construct() { + global $lC_Language, $lC_MessageStack, $lC_Currencies, $lC_Tax, $lC_CategoryTree, $lC_Image, $current_category_id, $lC_Vqmod; + + $this->_page_title = $lC_Language->get('heading_title'); + + $current_category_id = 0; + + if ( isset($_GET['cID']) && is_numeric($_GET['cID']) ) { + $current_category_id = $_GET['cID']; + } else { + $_GET['cID'] = $current_category_id; + } + + require($lC_Vqmod->modCheck('../includes/classes/currencies.php')); + $lC_Currencies = new lC_Currencies(); + + require($lC_Vqmod->modCheck('includes/classes/tax.php')); + $lC_Tax = new lC_Tax_Admin(); + + require_once($lC_Vqmod->modCheck('includes/classes/category_tree.php')); + $lC_CategoryTree = new lC_CategoryTree_Admin(); + $lC_CategoryTree->setSpacerString(' ', 2); + + require($lC_Vqmod->modCheck('includes/classes/image.php')); + $lC_Image = new lC_Image_Admin(); + + // check if the products image directory exists and is writeable + if ( is_dir('../images/products') ) { + if ( !is_writeable('../images/products') ) { + $_SESSION['error'] = true; + $_SESSION['errmsg'] = sprintf($lC_Language->get('ms_error_image_directory_not_writable'), realpath('../images/products')); + } + } else { + $_SESSION['error'] = true; + $_SESSION['errmsg'] = sprintf($lC_Language->get('ms_error_image_directory_non_existant'), realpath('../images/products')); + } + } +} ?> \ No newline at end of file diff --git a/catalog/admin/includes/classes/category_tree.php b/catalog/admin/includes/classes/category_tree.php index 93446b22b..9fbaa14e6 100644 --- a/catalog/admin/includes/classes/category_tree.php +++ b/catalog/admin/includes/classes/category_tree.php @@ -9,7 +9,7 @@ */ global $lC_Vqmod; -require($lC_Vqmod->modCheck('../includes/classes/category_tree.php')); +require_once($lC_Vqmod->modCheck('../includes/classes/category_tree.php')); class lC_CategoryTree_Admin extends lC_CategoryTree { protected $_show_total_products = true; diff --git a/catalog/includes/modules/services/category_path.php b/catalog/includes/modules/services/category_path.php index 978bdadaa..2ceae4153 100644 --- a/catalog/includes/modules/services/category_path.php +++ b/catalog/includes/modules/services/category_path.php @@ -14,7 +14,7 @@ function start() { lC_Services_category_path::process(); - include($lC_Vqmod->modCheck('includes/classes/category_tree.php')); + include_once($lC_Vqmod->modCheck('includes/classes/category_tree.php')); $lC_CategoryTree = new lC_CategoryTree(); return true; From 415ac42d09fc63828f6be16d702cd88d0eef5b54 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Tue, 15 Jul 2014 15:09:08 -0400 Subject: [PATCH 059/168] updated information pages to have max level, adjusted css of list-unstyled to 6px --- .../modules/boxes/information_pages.php | 22 ++++++++++++++----- catalog/install/loadedcommerce.sql | 1 + catalog/install/loadedcommerce_innodb.sql | 1 + catalog/templates/core/css/template.css | 8 +++---- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/catalog/includes/modules/boxes/information_pages.php b/catalog/includes/modules/boxes/information_pages.php index 1429f7bc8..0cac6ab3e 100644 --- a/catalog/includes/modules/boxes/information_pages.php +++ b/catalog/includes/modules/boxes/information_pages.php @@ -26,11 +26,19 @@ function initialize() { global $lC_CategoryTree, $cPath; $lC_CategoryTree->reset(); - // added to control maximum level of information_pages infobox if desired - if (isset($_SESSION['setInformationPagesMaximumLevel']) && $_SESSION['setInformationPagesMaximumLevel'] != '') { - $lC_CategoryTree->setMaximumLevel(BOX_INFORMATION_MAX_LEVEL); - } - $lC_CategoryTree->setCategoryPath($cPath, '', ''); + if (BOX_INFORMATION_PAGES_MAX_LEVEL == 'None') { + $biml = 1; + } else if (BOX_INFORMATION_PAGES_MAX_LEVEL == 'All') { + $biml = 0; + } else if (BOX_INFORMATION_PAGES_MAX_LEVEL == '1') { + $biml = 2; + } else if (BOX_INFORMATION_PAGES_MAX_LEVEL == '2') { + $biml = 3; + } else if (BOX_INFORMATION_PAGES_MAX_LEVEL == '3') { + $biml = 4; + } + $lC_CategoryTree->setMaximumLevel($biml); + $lC_CategoryTree->setCategoryPath($cPath, '', ''); $lC_CategoryTree->setParentGroupStringTop('
      ', '
    '); $lC_CategoryTree->setParentGroupString('
      ', '
    '); $lC_CategoryTree->setChildStringWithChildren('
  • ', '
    • '); @@ -48,11 +56,13 @@ function install() { parent::install(); $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('Top Information Category', 'BOX_INFORMATION_PAGES_ROOT_CATEGORY', 2, 'Select the Top Category of the Information Pages Infobox', 6, 0, now(), now(), 'lc_cfg_set_info_pages_top_category(BOX_INFORMATION_PAGES_ROOT_CATEGORY)', 'lc_cfg_set_info_pages_top_category')"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('Expand Menu Item', 'BOX_INFORMATION_PAGES_MAX_LEVEL', '2', 'How many levels to expand the information pages tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))')"); } function getKeys() { if (!isset($this->_keys)) { - $this->_keys = array('BOX_INFORMATION_PAGES_ROOT_CATEGORY'); + $this->_keys = array('BOX_INFORMATION_PAGES_ROOT_CATEGORY', + 'BOX_INFORMATION_PAGES_MAX_LEVEL' ); } return $this->_keys; diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql index 4b9b80458..796ee0980 100644 --- a/catalog/install/loadedcommerce.sql +++ b/catalog/install/loadedcommerce.sql @@ -1194,6 +1194,7 @@ INSERT INTO lc_configuration (configuration_id, configuration_title, configurati INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(183, 'Show Product Count', 'BOX_PRODUCT_CATEGORIES_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has.', 6, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(184, 'Top Product Category', 'BOX_PRODUCT_CATEGORIES_ROOT_CATEGORY', 1, 'Select the Top Category of the Product Categories Infobox.', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(185, 'Expand Menu Item', 'BOX_PRODUCT_CATEGORIES_MAX_LEVEL', '2', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(186, 'Expand Menu Item', 'BOX_INFORMATION_PAGES_MAX_LEVEL', '2', 'How many levels to expand the information pages tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(1, 'My Store', 'General information about my store', 1, 1); diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql index 1cbde6673..de10c443f 100644 --- a/catalog/install/loadedcommerce_innodb.sql +++ b/catalog/install/loadedcommerce_innodb.sql @@ -1194,6 +1194,7 @@ INSERT INTO lc_configuration (configuration_id, configuration_title, configurati INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(183, 'Show Product Count', 'BOX_PRODUCT_CATEGORIES_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has.', 6, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(184, 'Top Product Category', 'BOX_PRODUCT_CATEGORIES_ROOT_CATEGORY', 1, 'Select the Top Category of the Product Categories Infobox.', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(185, 'Expand Menu Item', 'BOX_PRODUCT_CATEGORIES_MAX_LEVEL', '2', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(186, 'Expand Menu Item', 'BOX_INFORMATION_PAGES_MAX_LEVEL', '2', 'How many levels to expand the information pages tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(1, 'My Store', 'General information about my store', 1, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(2, 'Minimum Values', 'The minimum values for functions / data', 2, 1); diff --git a/catalog/templates/core/css/template.css b/catalog/templates/core/css/template.css index 898de5032..cb2af5409 100644 --- a/catalog/templates/core/css/template.css +++ b/catalog/templates/core/css/template.css @@ -708,12 +708,12 @@ border:1px solid #f0ad4e; } -#loaded7 .box-product-categories-ul { - margin: 0 0 10px 0; +#loaded7 .list-unstyled { + margin: 0 0 6px 0; } -#loaded7 .box-product-categories-ul li { - margin: 10px 0 10px; +#loaded7 .list-unstyled li { + margin: 6px 0 6px; } #loaded7 span.active-cpath { From 5f0d4f2115731fb7de57a81d9c6802cb23862a32 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Tue, 15 Jul 2014 15:14:19 -0400 Subject: [PATCH 060/168] updated info pages top category selection to limit to "info_category" mode type categories --- .../lc_cfg_set_info_pages_top_category.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/catalog/admin/includes/functions/cfg_parameters/lc_cfg_set_info_pages_top_category.php b/catalog/admin/includes/functions/cfg_parameters/lc_cfg_set_info_pages_top_category.php index 7ea86f097..a7a9489a1 100644 --- a/catalog/admin/includes/functions/cfg_parameters/lc_cfg_set_info_pages_top_category.php +++ b/catalog/admin/includes/functions/cfg_parameters/lc_cfg_set_info_pages_top_category.php @@ -18,11 +18,14 @@ function lc_cfg_set_info_pages_top_category($default = 0, $key = null) { $categories = array('0' => $lC_Language->get('top_category')); foreach ( $lC_CategoryTree->getArray() as $value ) { - $cid = explode('_', $value['id']); - $count = count($cid); - $cid = end($cid); - $acArr = lC_Categories_Admin::getAllChildren($id); - $categories[$cid] = str_repeat("    ", $count-1) . ' ' . $value['title']; + // added switch for only category mode categories in selection dropdown. + if ($value['mode'] == 'info_category') { + $cid = explode('_', $value['id']); + $count = count($cid); + $cid = end($cid); + $acArr = lC_Categories_Admin::getAllChildren($id); + $categories[$cid] = str_repeat("    ", $count-1) . ' ' . $value['title']; + } } $css_class = 'class="input with-small-padding mid-margin-top"'; From 30b9e093abde738aaad90c255da5497bdeebfe34 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Tue, 15 Jul 2014 15:21:00 -0400 Subject: [PATCH 061/168] added --- catalog/install/loadedcommerce.sql | 2 +- catalog/install/loadedcommerce_innodb.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql index 796ee0980..db494ff9f 100644 --- a/catalog/install/loadedcommerce.sql +++ b/catalog/install/loadedcommerce.sql @@ -1194,7 +1194,7 @@ INSERT INTO lc_configuration (configuration_id, configuration_title, configurati INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(183, 'Show Product Count', 'BOX_PRODUCT_CATEGORIES_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has.', 6, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(184, 'Top Product Category', 'BOX_PRODUCT_CATEGORIES_ROOT_CATEGORY', 1, 'Select the Top Category of the Product Categories Infobox.', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(185, 'Expand Menu Item', 'BOX_PRODUCT_CATEGORIES_MAX_LEVEL', '2', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); -INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(186, 'Expand Menu Item', 'BOX_INFORMATION_PAGES_MAX_LEVEL', '2', 'How many levels to expand the information pages tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(186, 'Expand Menu Item', 'BOX_INFORMATION_PAGES_MAX_LEVEL', 'All', 'How many levels to expand the information pages tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(1, 'My Store', 'General information about my store', 1, 1); diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql index de10c443f..aecc271ec 100644 --- a/catalog/install/loadedcommerce_innodb.sql +++ b/catalog/install/loadedcommerce_innodb.sql @@ -1194,7 +1194,7 @@ INSERT INTO lc_configuration (configuration_id, configuration_title, configurati INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(183, 'Show Product Count', 'BOX_PRODUCT_CATEGORIES_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has.', 6, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(184, 'Top Product Category', 'BOX_PRODUCT_CATEGORIES_ROOT_CATEGORY', 1, 'Select the Top Category of the Product Categories Infobox.', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(185, 'Expand Menu Item', 'BOX_PRODUCT_CATEGORIES_MAX_LEVEL', '2', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); -INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(186, 'Expand Menu Item', 'BOX_INFORMATION_PAGES_MAX_LEVEL', '2', 'How many levels to expand the information pages tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(186, 'Expand Menu Item', 'BOX_INFORMATION_PAGES_MAX_LEVEL', 'All', 'How many levels to expand the information pages tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(1, 'My Store', 'General information about my store', 1, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(2, 'Minimum Values', 'The minimum values for functions / data', 2, 1); From 476f529b3ad93a1f63c7355fc0be7e5bf4e4fa23 Mon Sep 17 00:00:00 2001 From: wa4u Date: Wed, 16 Jul 2014 01:10:51 +0530 Subject: [PATCH 062/168] [B3356] - Product attribute does not carry from guest to logged in user fixed. --- catalog/includes/classes/shopping_cart.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalog/includes/classes/shopping_cart.php b/catalog/includes/classes/shopping_cart.php index f6f877d9b..a03c77445 100644 --- a/catalog/includes/classes/shopping_cart.php +++ b/catalog/includes/classes/shopping_cart.php @@ -519,7 +519,7 @@ public function add($product_id, $quantity = null) { $Qnew->execute(); } - if ( $Qproduct->valueInt('parent_id') > 0 ) { + //if ( $Qproduct->valueInt('parent_id') > 0 ) { $Qvariant = $lC_Database->query('select pvg.id as group_id, pvg.title as group_title, pvg.module, pvv.id as value_id, pvv.title as value_title from :table_products_variants pv, :table_products_variants_values pvv, :table_products_variants_groups pvg where pv.products_id = :products_id and pv.products_variants_values_id = pvv.id and pvv.languages_id = :languages_id and pvv.products_variants_groups_id = pvg.id and pvg.languages_id = :languages_id'); $Qvariant->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); $Qvariant->bindTable(':table_products_variants_values', TABLE_PRODUCTS_VARIANTS_VALUES); @@ -583,7 +583,7 @@ public function add($product_id, $quantity = null) { $Qnew->execute(); } } - } + //} } $this->_cleanUp(); From ef9f020f4fc19784a901eaf905ad11bba0c3fe1c Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Tue, 15 Jul 2014 16:51:12 -0400 Subject: [PATCH 063/168] set expand to all --- catalog/install/loadedcommerce.sql | 2 +- catalog/install/loadedcommerce_innodb.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql index db494ff9f..d9d6b93d3 100644 --- a/catalog/install/loadedcommerce.sql +++ b/catalog/install/loadedcommerce.sql @@ -1193,7 +1193,7 @@ INSERT INTO lc_configuration (configuration_id, configuration_title, configurati INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(182, 'Maximum New Products Per Page', 'NEW_PRODUCTS_PER_PAGE_DISPLAY', '9', 'Maximum number of new products to display in listing', 3, 20, now(), now(), NULL, NULL); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(183, 'Show Product Count', 'BOX_PRODUCT_CATEGORIES_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has.', 6, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(184, 'Top Product Category', 'BOX_PRODUCT_CATEGORIES_ROOT_CATEGORY', 1, 'Select the Top Category of the Product Categories Infobox.', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category'); -INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(185, 'Expand Menu Item', 'BOX_PRODUCT_CATEGORIES_MAX_LEVEL', '2', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(185, 'Expand Menu Item', 'BOX_PRODUCT_CATEGORIES_MAX_LEVEL', 'All', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(186, 'Expand Menu Item', 'BOX_INFORMATION_PAGES_MAX_LEVEL', 'All', 'How many levels to expand the information pages tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql index aecc271ec..bbec83790 100644 --- a/catalog/install/loadedcommerce_innodb.sql +++ b/catalog/install/loadedcommerce_innodb.sql @@ -1193,7 +1193,7 @@ INSERT INTO lc_configuration (configuration_id, configuration_title, configurati INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(182, 'Maximum New Products Per Page', 'NEW_PRODUCTS_PER_PAGE_DISPLAY', '9', 'Maximum number of new products to display in listing', 3, 20, now(), now(), NULL, NULL); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(183, 'Show Product Count', 'BOX_PRODUCT_CATEGORIES_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has.', 6, 0, now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(184, 'Top Product Category', 'BOX_PRODUCT_CATEGORIES_ROOT_CATEGORY', 1, 'Select the Top Category of the Product Categories Infobox.', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category'); -INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(185, 'Expand Menu Item', 'BOX_PRODUCT_CATEGORIES_MAX_LEVEL', '2', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(185, 'Expand Menu Item', 'BOX_PRODUCT_CATEGORIES_MAX_LEVEL', 'All', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(186, 'Expand Menu Item', 'BOX_INFORMATION_PAGES_MAX_LEVEL', 'All', 'How many levels to expand the information pages tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(1, 'My Store', 'General information about my store', 1, 1); From 97866858bcc3391c4578c490b4326732c6e59966 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Tue, 15 Jul 2014 16:52:09 -0400 Subject: [PATCH 064/168] set expand to all in modules config install sql --- catalog/includes/modules/boxes/information_pages.php | 2 +- catalog/includes/modules/boxes/product_categories.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/catalog/includes/modules/boxes/information_pages.php b/catalog/includes/modules/boxes/information_pages.php index 0cac6ab3e..8162a3c8f 100644 --- a/catalog/includes/modules/boxes/information_pages.php +++ b/catalog/includes/modules/boxes/information_pages.php @@ -56,7 +56,7 @@ function install() { parent::install(); $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('Top Information Category', 'BOX_INFORMATION_PAGES_ROOT_CATEGORY', 2, 'Select the Top Category of the Information Pages Infobox', 6, 0, now(), now(), 'lc_cfg_set_info_pages_top_category(BOX_INFORMATION_PAGES_ROOT_CATEGORY)', 'lc_cfg_set_info_pages_top_category')"); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('Expand Menu Item', 'BOX_INFORMATION_PAGES_MAX_LEVEL', '2', 'How many levels to expand the information pages tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))')"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('Expand Menu Item', 'BOX_INFORMATION_PAGES_MAX_LEVEL', 'All', 'How many levels to expand the information pages tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))')"); } function getKeys() { diff --git a/catalog/includes/modules/boxes/product_categories.php b/catalog/includes/modules/boxes/product_categories.php index d2d03a759..355599156 100644 --- a/catalog/includes/modules/boxes/product_categories.php +++ b/catalog/includes/modules/boxes/product_categories.php @@ -57,7 +57,7 @@ function install() { $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Show Product Count', 'BOX_PRODUCT_CATEGORIES_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())"); $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('Top Category', 'BOX_PRODUCT_CATEGORIES_ROOT_CATEGORY', 1, 'Select the Top Category of the Product Categories Infobox', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_PRODUCT_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category')"); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('Expand Menu Item', 'BOX_PRODUCT_CATEGORIES_MAX_LEVEL', '2', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))')"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('Expand Menu Item', 'BOX_PRODUCT_CATEGORIES_MAX_LEVEL', 'All', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))')"); } function getKeys() { From 5f8dd4d71963ed1706798f6e18f211c28d13d795 Mon Sep 17 00:00:00 2001 From: Gerald Bullard Jr Date: Wed, 16 Jul 2014 11:09:37 -0400 Subject: [PATCH 065/168] Revert changes to variants code fix was already in branch it seems. --- catalog/includes/classes/shopping_cart.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalog/includes/classes/shopping_cart.php b/catalog/includes/classes/shopping_cart.php index a03c77445..f6f877d9b 100644 --- a/catalog/includes/classes/shopping_cart.php +++ b/catalog/includes/classes/shopping_cart.php @@ -519,7 +519,7 @@ public function add($product_id, $quantity = null) { $Qnew->execute(); } - //if ( $Qproduct->valueInt('parent_id') > 0 ) { + if ( $Qproduct->valueInt('parent_id') > 0 ) { $Qvariant = $lC_Database->query('select pvg.id as group_id, pvg.title as group_title, pvg.module, pvv.id as value_id, pvv.title as value_title from :table_products_variants pv, :table_products_variants_values pvv, :table_products_variants_groups pvg where pv.products_id = :products_id and pv.products_variants_values_id = pvv.id and pvv.languages_id = :languages_id and pvv.products_variants_groups_id = pvg.id and pvg.languages_id = :languages_id'); $Qvariant->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); $Qvariant->bindTable(':table_products_variants_values', TABLE_PRODUCTS_VARIANTS_VALUES); @@ -583,7 +583,7 @@ public function add($product_id, $quantity = null) { $Qnew->execute(); } } - //} + } } $this->_cleanUp(); From 3b8700ebb969692edd6a8ea9b91ca7dba5ecb1f6 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Wed, 16 Jul 2014 12:11:33 -0400 Subject: [PATCH 066/168] updated sharing icons back to style of Jamie's original submission --- catalog/includes/languages/en_US.xml | 12 +- catalog/install/templates/css/styles/form.css | 4 +- .../templates/core/content/products/info.php | 64 ++------- catalog/templates/core/css/template.css | 129 +++++------------- 4 files changed, 58 insertions(+), 151 deletions(-) diff --git a/catalog/includes/languages/en_US.xml b/catalog/includes/languages/en_US.xml index e9fba32b5..26c7f3ea8 100644 --- a/catalog/includes/languages/en_US.xml +++ b/catalog/includes/languages/en_US.xml @@ -2958,32 +2958,32 @@ Your friend, %s, thought that you would be interested in %s from %s.]]> text_social_share_facebook - + general text_social_share_twitter - + general text_social_share_google_plus - + general text_social_share_linkedin - + general text_social_share_pinterest - + general text_social_share_tumblr - + general diff --git a/catalog/install/templates/css/styles/form.css b/catalog/install/templates/css/styles/form.css index 6924b8374..7611e011e 100644 --- a/catalog/install/templates/css/styles/form.css +++ b/catalog/install/templates/css/styles/form.css @@ -1551,8 +1551,8 @@ input:-moz-placeholder { /* Fields list */ .fieldset.fields-list, .wizard-fieldset.fields-list { - background-image: url(../../img/fieldset-bg.gif); - background-repeat: repeat-y; + /*background-image: url(../../img/fieldset-bg.gif); + background-repeat: repeat-y;*/ } .field-block { padding: 0 30px 0 230px; diff --git a/catalog/templates/core/content/products/info.php b/catalog/templates/core/content/products/info.php index 56ab470fe..f93c77d66 100644 --- a/catalog/templates/core/content/products/info.php +++ b/catalog/templates/core/content/products/info.php @@ -69,67 +69,33 @@ function social_popup(url){ var myWindow = window.open(url, "Social Window", "width=600, height=400"); } +

    get('payment_method_title'); ?>

    - selection(); - echo (sizeof($selection) > 1) ? '
    ' . $lC_Language->get('choose_payment_method') . '
    ' : (sizeof($selection) == 1) ? '
    ' . $lC_Language->get('only_one_payment_method_available') . '
    ' : '
    ' . $lC_Language->get('no_payment_method_available') . '
    ' . "\n"; + echo ((sizeof($selection) > 1) ? '
    ' . $lC_Language->get('choose_payment_method') . '
    ' : ((sizeof($selection) == 1) ? '22
    ' . $lC_Language->get('only_one_payment_method_available') . '
    ' : '
    ' . $lC_Language->get('no_payment_method_available') . '
    ' . "\n")); $radio_buttons = 0; for ($i=0, $n=sizeof($selection); $i<$n; $i++) { ?> From c662fe6278c3d5da6409693daafdda654f48434b Mon Sep 17 00:00:00 2001 From: datazen Date: Fri, 18 Jul 2014 14:47:55 -0400 Subject: [PATCH 077/168] update to last commit --- catalog/templates/core/content/checkout/checkout_payment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/templates/core/content/checkout/checkout_payment.php b/catalog/templates/core/content/checkout/checkout_payment.php index ddb44636a..b6d55ead4 100644 --- a/catalog/templates/core/content/checkout/checkout_payment.php +++ b/catalog/templates/core/content/checkout/checkout_payment.php @@ -92,7 +92,7 @@

    get('payment_method_title'); ?>

    selection(); - echo ((sizeof($selection) > 1) ? '
    ' . $lC_Language->get('choose_payment_method') . '
    ' : ((sizeof($selection) == 1) ? '22
    ' . $lC_Language->get('only_one_payment_method_available') . '
    ' : '
    ' . $lC_Language->get('no_payment_method_available') . '
    ' . "\n")); + echo ((sizeof($selection) > 1) ? '
    ' . $lC_Language->get('choose_payment_method') . '
    ' : ((sizeof($selection) == 1) ? '
    ' . $lC_Language->get('only_one_payment_method_available') . '
    ' : '
    ' . $lC_Language->get('no_payment_method_available') . '
    ' . "\n")); $radio_buttons = 0; for ($i=0, $n=sizeof($selection); $i<$n; $i++) { ?> From 0a13bb0cd32f10d8da601d7c147260afb677106b Mon Sep 17 00:00:00 2001 From: datazen Date: Fri, 18 Jul 2014 15:56:35 -0400 Subject: [PATCH 078/168] updat to last commit --- .../applications/store/classes/store.php | 32 ++------------- catalog/admin/includes/classes/addons.php | 41 +++++-------------- 2 files changed, 13 insertions(+), 60 deletions(-) diff --git a/catalog/admin/includes/applications/store/classes/store.php b/catalog/admin/includes/applications/store/classes/store.php index cc023cdc4..29b8fdb41 100644 --- a/catalog/admin/includes/applications/store/classes/store.php +++ b/catalog/admin/includes/applications/store/classes/store.php @@ -360,8 +360,8 @@ public static function getInstalledAddons() { $aoData = new $class(); $addon['code'] = substr($ao['name'], 0, strpos($ao['name'], '/')); $addon['type'] = $aoData->getAddonType(); - $addon['title'] = self::_getLanguageDefinition($aoData->getAddonTitle(), $class); - $addon['description'] = self::_getLanguageDefinition($aoData->getAddonDescription(), $class); + $addon['title'] = $aoData->getAddonTitle(); + $addon['description'] = $aoData->getAddonDescription(); $addon['rating'] = $aoData->getAddonRating(); $addon['author'] = $aoData->getAddonAuthor(); $addon['authorWWW'] = $aoData->getAddonAuthorWWW(); @@ -617,33 +617,7 @@ private static function _resetAddons() { */ private static function _usortAddonsByRating($a, $b) { return $a['rating'] == $b['rating'] ? 0 : $a['rating'] > $b['rating'] ? -1 : 1; - } - /* - * Retrieve a addon language definition value - * - * @param string $key The language key - * @param string $class The addon class - * @access private - * @return string - */ - private static function _getLanguageDefinition($key, $class) { - global $lC_Language; - - $langValue = ''; - if (file_exists(DIR_FS_CATALOG . 'addons/' . $class . '/languages/' . $lC_Language->getCode() . '.xml')) { - $lC_XML = new lC_XML(file_get_contents(DIR_FS_CATALOG . 'addons/' . $class . '/languages/' . $lC_Language->getCode() . '.xml')); - $definitions = $lC_XML->toArray(); - - foreach ($definitions['language']['definitions']['definition'] as $def) { - if ($def['key'] == $key) { - $langValue = $def['value']; - break; - } - } - - return $langValue; - } - } + } } } ?> \ No newline at end of file diff --git a/catalog/admin/includes/classes/addons.php b/catalog/admin/includes/classes/addons.php index 7958dabf2..b614ae197 100644 --- a/catalog/admin/includes/classes/addons.php +++ b/catalog/admin/includes/classes/addons.php @@ -571,9 +571,14 @@ private static function _init() { $isEnabled = $aoData->isEnabled(); } + // language definitions + if (file_exists(DIR_FS_CATALOG . 'addons/' . $class . '/languages/' . $lC_Language->getCode() . '.xml')) { + $lC_Language->injectAddonDefinitions(DIR_FS_CATALOG . 'addons/' . $class . '/languages/' . $lC_Language->getCode() . '.xml', $lC_Language->getCode()); + } + $_SESSION['lC_Addons_Admin_data'][$class] = array('type' => $aoData->getAddonType(), - 'title' => self::_getLanguageDefinition($aoData->getAddonTitle(), $class), - 'description' => self::_getLanguageDefinition($aoData->getAddonDescription(), $class), + 'title' => ((strpos($aoData->getAddonTitle(), '_') > 0) ? $lC_Language->get($aoData->getAddonTitle()) : $aoData->getAddonTitle()), + 'description' => ((strpos($aoData->getAddonDescription(), '_') > 0) ? $lC_Language->get($aoData->getAddonDescription()) : $aoData->getAddonDescription()), 'rating' => $aoData->getAddonRating(), 'author' => $aoData->getAddonAuthor(), 'authorWWW' => $aoData->getAddonAuthorWWW(), @@ -587,8 +592,8 @@ private static function _init() { if ($isEnabled) $enabled .= $addon['path'] . ';'; } - } - + } + if ($enabled != '') $enabled = substr($enabled, 0, -1); if (!file_exists(DIR_FS_WORK . 'cache/addons.cache')) { file_put_contents(DIR_FS_WORK . 'cache/addons.cache', serialize($enabled)); @@ -615,32 +620,6 @@ private static function _init() { } $Qchk->freeResult(); - } - /* - * Retrieve a addon language definition value - * - * @param string $key The language key - * @param string $class The addon class - * @access private - * @return string - */ - private static function _getLanguageDefinition($key, $class) { - global $lC_Language; - - $langValue = ''; - if (file_exists(DIR_FS_CATALOG . 'addons/' . $class . '/languages/' . $lC_Language->getCode() . '.xml')) { - $lC_XML = new lC_XML(file_get_contents(DIR_FS_CATALOG . 'addons/' . $class . '/languages/' . $lC_Language->getCode() . '.xml')); - $definitions = $lC_XML->toArray(); - - foreach ($definitions['language']['definitions']['definition'] as $def) { - if ($def['key'] == $key) { - $langValue = $def['value']; - break; - } - } - - return $langValue; - } - } + } } ?> \ No newline at end of file From 10c4cc6b37ffefb4f3d4968c98d3755a4ac5b8cd Mon Sep 17 00:00:00 2001 From: datazen Date: Fri, 18 Jul 2014 16:11:44 -0400 Subject: [PATCH 079/168] fixed runafter --- .../includes/work/updates/runAfter/controller.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/catalog/includes/work/updates/runAfter/controller.php b/catalog/includes/work/updates/runAfter/controller.php index 17661a013..f980da481 100644 --- a/catalog/includes/work/updates/runAfter/controller.php +++ b/catalog/includes/work/updates/runAfter/controller.php @@ -7,6 +7,7 @@ @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt @version $Id: controller.php v1.0 2013-08-08 datazen $ */ +error_reporting(0); require_once('includes/applications/updates/classes/updates.php'); class lC_Updates_Admin_run_after extends lC_Updates_Admin { @@ -371,16 +372,16 @@ public static function updateDB() { parent::log("Database Update: INSERT IGNORE INTO `" . $pf . "configuration_group` (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES (22, 'File Uploads', 'File Upload Settings', 13, 1)"); if (!defined('PRODUCT_MODULES_FILE_UPLOAD_TYPES')) { - $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Allowed File Types', 'PRODUCT_MODULES_FILE_UPLOAD_TYPES', '.zip,.pdf,.png,.gif,.jpg,.tiff,.gzip,.gz', 'Enter the allowed file upload extensions in a comma delimited format.', 22, 0, now(), now(), NULL, NULL);"); - parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Allowed File Types', 'PRODUCT_MODULES_FILE_UPLOAD_TYPES', '.zip,.pdf,.png,.gif,.jpg,.tiff,.gzip,.gz', 'Enter the allowed file upload extensions in a comma delimited format.', 22, 0, now(), now(), NULL, NULL);"); - } + $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Allowed File Types', 'PRODUCT_MODULES_FILE_UPLOAD_TYPES', '.zip,.pdf,.png,.gif,.jpg,.tiff,.gzip,.gz', 'Enter the allowed file upload extensions in a comma delimited format.', 22, 0, now(), now(), NULL, NULL)"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Allowed File Types', 'PRODUCT_MODULES_FILE_UPLOAD_TYPES', '.zip,.pdf,.png,.gif,.jpg,.tiff,.gzip,.gz', 'Enter the allowed file upload extensions in a comma delimited format.', 22, 0, now(), now(), NULL, NULL)"); + } if (!defined('PRODUCT_MODULES_FILE_UPLOAD_MAX_SIZE')) { - $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Maximum Upload File Size', 'PRODUCT_MODULES_FILE_UPLOAD_MAX_SIZE', '10', 'Enter the maximum size allowed for file uploads.', 22, 0, now(), now(), NULL, NULL);"); - parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Maximum Upload File Size', 'PRODUCT_MODULES_FILE_UPLOAD_MAX_SIZE', '10', 'Enter the maximum size (in MB) allowed for file uploads.', 22, 0, now(), now(), NULL, NULL);"); + $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Maximum Upload File Size', 'PRODUCT_MODULES_FILE_UPLOAD_MAX_SIZE', '10', 'Enter the maximum size allowed for file uploads.', 22, 0, now(), now(), NULL, NULL)"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Maximum Upload File Size', 'PRODUCT_MODULES_FILE_UPLOAD_MAX_SIZE', '10', 'Enter the maximum size (in MB) allowed for file uploads.', 22, 0, now(), now(), NULL, NULL)"); } - if (utility::isB2B) { + if (utility::isB2B()) { if (!defined('B2B_SETTINGS_ALLOW_SELF_REGISTER')) { $lC_Database->simpleQuery("insert into `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_ALLOW_SELF_REGISTER', '1', '', '6', '0', '', '', now())"); parent::log("Database Update: insert into `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_ALLOW_SELF_REGISTER', '1', '', '6', '0', '', '', now())"); From 3640763a888510bba83203d6a7ffc14800f13c13 Mon Sep 17 00:00:00 2001 From: datazen Date: Mon, 21 Jul 2014 13:43:09 -0400 Subject: [PATCH 080/168] added Po number addons to B2B --- .../admin/hooks/b2b_indiciator.xml | 13 --- .../admin/hooks/orders_classes_orders.xml | 75 ++++++++++++++++++ .../admin/hooks/orders_pages_edit.xml | 29 +++++++ .../admin/hooks/orders_pages_invoice.xml | 79 +++++++++++++++++++ catalog/addons/Loaded_7_B2B/classes/order.php | 74 +++++++++++++++++ catalog/addons/Loaded_7_B2B/controller.php | 3 + .../includes_content_checkout_process.xml | 22 ++++++ .../template_content_account_receipt.xml | 43 ++++++++++ ...plates_content_account_account_history.xml | 60 ++++++++++++++ ...content_checkout_checkout_confirmation.xml | 32 ++++++++ ...ates_content_checkout_checkout_success.xml | 44 +++++++++++ .../addons/Loaded_7_B2B/languages/en_US.xml | 22 +++++- .../work/updates/runAfter/controller.php | 3 +- catalog/install/loadedcommerce.sql | 9 +++ catalog/install/loadedcommerce_innodb.sql | 9 +++ 15 files changed, 502 insertions(+), 15 deletions(-) delete mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/b2b_indiciator.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/orders_classes_orders.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_edit.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_invoice.xml create mode 100644 catalog/addons/Loaded_7_B2B/classes/order.php create mode 100644 catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/template_content_account_receipt.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/templates_content_account_account_history.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_confirmation.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/b2b_indiciator.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/b2b_indiciator.xml deleted file mode 100644 index 81af6fda8..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/b2b_indiciator.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - After Logo Image, add Pro Indicator - 1.0.0 - 2.3.2 - loadedcommerce.com - - - ]]> - B2B' : null; ?>]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/orders_classes_orders.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/orders_classes_orders.xml new file mode 100644 index 000000000..e5382f113 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/orders_classes_orders.xml @@ -0,0 +1,75 @@ + + + Admin Orders Mods + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + + + + + + + + + query("SELECT count(o.orders_id) as total + from "); + //Purchase Orders Service Module(PO) START + if (utility::isB2B()) { + $QresultFilterTotal->appendQuery(' :table_purchase_orders_service pos, '); + $QresultFilterTotal->bindTable(':table_purchase_orders_service',DB_TABLE_PREFIX.'purchase_orders_service'); + } + //Purchase Orders Service Module(PO) END + + $QresultFilterTotal->appendQuery(" :table_orders o LEFT JOIN :table_orders_total ot + on (o.orders_id = ot.orders_id and ot.class = 'total') + LEFT JOIN :table_orders_status s + on (s.orders_status_id = o.orders_status and s.language_id = :language_id) " . + $sWhere ." group by o.orders_id "); + /* + ]]> + + + + + + + + + query("SELECT o.orders_id, o.customers_id, o.customers_ip_address, o.customers_name, o.payment_method, o.date_purchased, o.last_modified, o.customers_country_iso3, greatest(date_purchased, coalesce(last_modified, date_purchased)) as date_sort, o.currency, o.currency_value, ot.value as order_total, s.orders_status_name, s.orders_status_type from "); + + //Purchase Orders Service Module(PO) START + if (utility::isB2B()) { + $Qresult->appendQuery(' :table_purchase_orders_service pos, '); + $Qresult->bindTable(':table_purchase_orders_service',DB_TABLE_PREFIX.'purchase_orders_service'); + } + //Purchase Orders Service Module(PO) END + + $Qresult->appendQuery(" :table_orders o + LEFT JOIN :table_orders_total ot + on (o.orders_id = ot.orders_id and ot.class = 'total') + LEFT JOIN :table_orders_status s + on (s.orders_status_id = o.orders_status and s.language_id = :language_id) " . + $sWhere . " group by o.orders_id " . $sOrder . $sLimit); + /* + ]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_edit.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_edit.xml new file mode 100644 index 000000000..d3ae7fd84 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_edit.xml @@ -0,0 +1,29 @@ + + + Admin Orders Mods + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + ]]> + modCheck(DIR_FS_CATALOG . 'addons/Purchase_Orders_Service/classes/order.php')); + $po_number = lC_Order_b2b::retrievePONumber($_GET['orders']); + if($po_number != '') { + ?> +
      get('text_po_number_title'); ?> : 
    + + ]]>     +     +     +     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_invoice.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_invoice.xml new file mode 100644 index 000000000..55c859139 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_invoice.xml @@ -0,0 +1,79 @@ + + + Admin Orders Mods + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + modCheck('../addons/purchase_orders_service/classes/order.php')); + } + ]]> + + + getCustomer('email_address') . '">' . $lC_Order->getCustomer('email_address') . '    '; ?> + ]]> + + + +   + + + get('text_po_number_title'); ?> :  + + + + ]]> + + + + + + modCheck(DIR_FS_CATALOG . 'addons/Purchase_Orders_Service/classes/order.php')); + } + ]]> + + + getCustomer('email_address') . '">' . $lC_Order->getCustomer('email_address') . ''; ?> + ]]> + + + +   + + + get('text_po_number_title'); ?> :  + + + + ]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/classes/order.php b/catalog/addons/Loaded_7_B2B/classes/order.php new file mode 100644 index 000000000..5e7936b9f --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/classes/order.php @@ -0,0 +1,74 @@ +modCheck(DIR_FS_CATALOG . 'includes/classes/order.php')); + +class lC_Order_b2b extends lC_Order { + /* + * Insert the purchase order number + * + * @access public + * @return array + */ + public static function insertPONumber($id = null) { + global $lC_Database; + + if(isset($_POST['po_number']) && $_POST['po_number'] != '') { + $po_number = $_POST['po_number']; + $Qponumber = $lC_Database->query('insert into :table_po_number (po_number,orders_id) values (:po_number,:orders_id)'); + $Qponumber->bindTable(':table_po_number', DB_TABLE_PREFIX . "purchase_orders_service"); + $Qponumber->bindValue(':po_number', $po_number); + $Qponumber->bindInt(':orders_id', $id); + $Qponumber->execute(); + } + } + /* + * Get the purchase order number email string + * + * @access public + * @return string + */ + public static function getPONumber($id) { + global $lC_Language; + + $email_order = $lC_Language->get('text_po_number_title') . "\n" . + $lC_Language->get('email_order_separator') . "\n"; + $email_order .= self::retrievePONumber($id) . "\n\n"; + + return $email_order; + } + /* + * Get the purchase order number + * + * @access public + * @return string + */ + public static function retrievePONumber($id = 0) { + global $lC_Database, $lC_Customer, $lC_Language; + + if( $id > 0) { + $Qretorders = $lC_Database->query('select po_number_id, po_number from :table_po_number where orders_id = :orders_id '); + $Qretorders->bindTable(':table_po_number', DB_TABLE_PREFIX . "purchase_orders_service"); + $Qretorders->bindInt(':orders_id', $id); + $Qretorders->execute(); + + $id = $Qretorders->value('po_number'); + + $Qretorders->freeResult(); + + return $id; + } + + return false; + + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/controller.php b/catalog/addons/Loaded_7_B2B/controller.php index 8e6de109d..6e1c166f8 100644 --- a/catalog/addons/Loaded_7_B2B/controller.php +++ b/catalog/addons/Loaded_7_B2B/controller.php @@ -93,6 +93,9 @@ public function install() { $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'B2B_SETTINGS_GUEST_CATALOG_ACCESS'"); $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_GUEST_CATALOG_ACCESS', '4', '', '6', '0', '', '', now())"); + + // po number addition + $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . DB_TABLE_PREFIX . "Purchase_Orders_Service` (`po_number_id` int(11) NOT NULL AUTO_INCREMENT, `po_number` varchar(255) NOT NULL, `orders_id` int(11) NOT NULL, `po_number_status` int(1) NOT NULL DEFAULT '1', PRIMARY KEY (`po_number_id`)) "); } /** * Return the configuration parameter keys an an array diff --git a/catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml b/catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml new file mode 100644 index 000000000..241dd6dbb --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml @@ -0,0 +1,22 @@ + + + After VQMOD-001 + 1.0.0 + 2.3.2 + loadedcommerce.com + + + process(); + ]]> + + modCheck('addons/purchase_orders_service/classes/order.php')); + } + //Purchase Orders Service Module(PO) END + ]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/template_content_account_receipt.xml b/catalog/addons/Loaded_7_B2B/hooks/template_content_account_receipt.xml new file mode 100644 index 000000000..e991b65b5 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/template_content_account_receipt.xml @@ -0,0 +1,43 @@ + + + After VQMOD-001 + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + modCheck('addons/purchase_orders_service/classes/order.php')); + } + //Purchase Orders Service Module(PO) End + ]]> + + + + + get('receipt_payment_method_title'); ?> info['payment_method']; ?>
    + ]]> + +
    get('text_po_number_title'); ?> + +
    + + + ]]>     + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/templates_content_account_account_history.xml b/catalog/addons/Loaded_7_B2B/hooks/templates_content_account_account_history.xml new file mode 100644 index 000000000..f804330fa --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/templates_content_account_account_history.xml @@ -0,0 +1,60 @@ + + + After VQMOD-001 + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + ]]> + modCheck('addons/purchase_orders_service/classes/order.php')); + } + //Purchase Orders Service Module(PO) End + ?> + ]]> + + + + + get('text_total'); ?> + ]]> + + get('text_po_number_heading'); ?> + + ]]> + + + + + value('order_total')); ?> + ]]> + + + + valueInt('orders_id')); ?> + + + ]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_confirmation.xml b/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_confirmation.xml new file mode 100644 index 000000000..b5edf0a51 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_confirmation.xml @@ -0,0 +1,32 @@ + + + After VQMOD-001 + 1.0.0 + 2.3.2 + loadedcommerce.com + + + isLoggedOn() !== false) { + ]]> + +
    +

    get('text_po_numbers_service_heading'); ?>

    +

    get('text_po_numbers_service_instructions'); ?>

    + +
    + +
    +
    +     +     +     +     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml b/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml new file mode 100644 index 000000000..3f0c14c44 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml @@ -0,0 +1,44 @@ + + + After VQMOD-001 + 1.0.0 + 2.3.2 + loadedcommerce.com + + + getID()); + ]]> + modCheck('addons/purchase_orders_service/classes/order.php')); + } + //Purchase Orders Service Module(PO) End + ]]> + + + + +

    + ]]>     + +
    +

    get('text_po_number_title'); ?>

    +

    +
    + + ]]>     +     +     +     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/languages/en_US.xml b/catalog/addons/Loaded_7_B2B/languages/en_US.xml index 5d76a620c..0498bebab 100644 --- a/catalog/addons/Loaded_7_B2B/languages/en_US.xml +++ b/catalog/addons/Loaded_7_B2B/languages/en_US.xml @@ -10,6 +10,26 @@ addon_system_b2b_description checkout - + + + text_po_numbers_service_heading + + general + + + text_po_number_heading + + general + + + text_po_number_title + + general + + + text_po_numbers_service_instructions + + general + \ No newline at end of file diff --git a/catalog/includes/work/updates/runAfter/controller.php b/catalog/includes/work/updates/runAfter/controller.php index f980da481..ed0df3189 100644 --- a/catalog/includes/work/updates/runAfter/controller.php +++ b/catalog/includes/work/updates/runAfter/controller.php @@ -392,7 +392,8 @@ public static function updateDB() { parent::log("Database Update: insert into `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_GUEST_CATALOG_ACCESS', '4', '', '6', '0', '', '', now())"); } } - + + $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . $pf . "purchase_orders_service` (`po_number_id` int(11) NOT NULL AUTO_INCREMENT, `po_number` varchar(255) NOT NULL, `orders_id` int(11) NOT NULL, `po_number_status` int(1) NOT NULL DEFAULT '1', PRIMARY KEY (`po_number_id`)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci"); } } ?> \ No newline at end of file diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql index 8de3bd08f..cfe649148 100644 --- a/catalog/install/loadedcommerce.sql +++ b/catalog/install/loadedcommerce.sql @@ -746,6 +746,15 @@ CREATE TABLE lc_product_attributes ( KEY idx_pa_products_id (products_id) ) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci; +DROP TABLE IF EXISTS lc_purchase_orders_service; +CREATE TABLE lc_purchase_orders_service ( +`po_number_id` int(11) NOT NULL AUTO_INCREMENT, +`po_number` varchar(255) NOT NULL, +`orders_id` int(11) NOT NULL, +`po_number_status` int(1) NOT NULL DEFAULT '1', +PRIMARY KEY (`po_number_id`) +) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci; + DROP TABLE IF EXISTS lc_reviews; CREATE TABLE lc_reviews ( reviews_id int(11) NOT NULL AUTO_INCREMENT, diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql index eb314bf87..89f223e88 100644 --- a/catalog/install/loadedcommerce_innodb.sql +++ b/catalog/install/loadedcommerce_innodb.sql @@ -750,6 +750,15 @@ CREATE TABLE lc_product_attributes ( KEY idx_pa_products_id (products_id) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci; +DROP TABLE IF EXISTS lc_purchase_orders_service; +CREATE TABLE lc_purchase_orders_service ( +`po_number_id` int(11) NOT NULL AUTO_INCREMENT, +`po_number` varchar(255) NOT NULL, +`orders_id` int(11) NOT NULL, +`po_number_status` int(1) NOT NULL DEFAULT '1', +PRIMARY KEY (`po_number_id`) +) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci; + DROP TABLE IF EXISTS lc_reviews; CREATE TABLE lc_reviews ( reviews_id int(11) NOT NULL AUTO_INCREMENT, From 0d0840fe06a77262b0fb8ee73cf4765de68c798c Mon Sep 17 00:00:00 2001 From: datazen Date: Mon, 21 Jul 2014 14:06:12 -0400 Subject: [PATCH 081/168] merge work --- .../Loaded_7_B2B/hooks/includes_content_checkout_process.xml | 2 +- .../hooks/templates_content_checkout_checkout_success.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml b/catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml index 241dd6dbb..cfe156afb 100644 --- a/catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml +++ b/catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml @@ -13,7 +13,7 @@ modCheck('addons/purchase_orders_service/classes/order.php')); + require_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/order.php')); } //Purchase Orders Service Module(PO) END ]]> diff --git a/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml b/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml index 3f0c14c44..3f565fb11 100644 --- a/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml +++ b/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml @@ -12,7 +12,7 @@ modCheck('addons/purchase_orders_service/classes/order.php')); + require_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/order.php')); } //Purchase Orders Service Module(PO) End ]]> From cae7cd32c272ce480989e4b6c202afaf1f89d552 Mon Sep 17 00:00:00 2001 From: datazen Date: Mon, 21 Jul 2014 15:04:37 -0400 Subject: [PATCH 082/168] merge work --- catalog/addons/Loaded_7_B2B/classes/order.php | 24 +++++++++++-------- .../hooks/includes_classes_order.xml | 13 ++++++++++ ...ates_content_checkout_checkout_success.xml | 2 +- catalog/includes/classes/order.php | 2 +- .../content/checkout/confirmation.php | 6 +++++ catalog/includes/content/checkout/process.php | 2 +- 6 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml diff --git a/catalog/addons/Loaded_7_B2B/classes/order.php b/catalog/addons/Loaded_7_B2B/classes/order.php index 5e7936b9f..1dcbf01b1 100644 --- a/catalog/addons/Loaded_7_B2B/classes/order.php +++ b/catalog/addons/Loaded_7_B2B/classes/order.php @@ -7,6 +7,9 @@ @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt @version $Id: product.php v1.0 2013-08-08 datazen $ */ +error_reporting(E_ALL); +ini_set('display_errors', 1); + global $lC_Vqmod; require_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'includes/classes/order.php')); @@ -18,17 +21,18 @@ class lC_Order_b2b extends lC_Order { * @access public * @return array */ - public static function insertPONumber($id = null) { + public static function insertPONumber($id = null, $po_number = null) { global $lC_Database; - - if(isset($_POST['po_number']) && $_POST['po_number'] != '') { - $po_number = $_POST['po_number']; - $Qponumber = $lC_Database->query('insert into :table_po_number (po_number,orders_id) values (:po_number,:orders_id)'); - $Qponumber->bindTable(':table_po_number', DB_TABLE_PREFIX . "purchase_orders_service"); - $Qponumber->bindValue(':po_number', $po_number); - $Qponumber->bindInt(':orders_id', $id); - $Qponumber->execute(); - } + + if ($id == null && $po_number == null) return false; + + $Qponumber = $lC_Database->query('insert into :table_po_number (po_number,orders_id) values (:po_number,:orders_id)'); + $Qponumber->bindTable(':table_po_number', DB_TABLE_PREFIX . "purchase_orders_service"); + $Qponumber->bindValue(':po_number', $po_number); + $Qponumber->bindInt(':orders_id', $id); + $Qponumber->execute(); + + return true; } /* * Get the purchase order number email string diff --git a/catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml b/catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml new file mode 100644 index 000000000..f93b325cd --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2N/classes/order.php')); lC_Order_b2b::insertPONumber($order_id, $_POST['po_number']);}]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml b/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml index 3f565fb11..a29401ebb 100644 --- a/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml +++ b/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml @@ -27,7 +27,7 @@
    diff --git a/catalog/includes/classes/order.php b/catalog/includes/classes/order.php index 9da493a48..a5384409e 100644 --- a/catalog/includes/classes/order.php +++ b/catalog/includes/classes/order.php @@ -531,7 +531,7 @@ public function process($order_id, $status_id = '') { $Qupdate->bindInt(':products_id', $Qproducts->valueInt('products_id')); $Qupdate->execute(); } - + lC_Order::sendEmail($order_id); unset($_SESSION['prepOrderID']); diff --git a/catalog/includes/content/checkout/confirmation.php b/catalog/includes/content/checkout/confirmation.php index c1cb053c7..bd4a0741c 100644 --- a/catalog/includes/content/checkout/confirmation.php +++ b/catalog/includes/content/checkout/confirmation.php @@ -57,6 +57,12 @@ public function lC_Checkout_Confirmation() { $_SESSION['comments'] = lc_sanitize_string($_POST['comments']); } + if ( (isset($_POST['po_number'])) && (isset($_SESSION['po_number'])) && (empty($_POST['po_number'])) ) { + unset($_SESSION['po_number']); + } elseif (!empty($_POST['po_number'])) { + $_SESSION['po_number'] = lc_sanitize_string($_POST['po_number']); + } + // load the selected payment module include($lC_Vqmod->modCheck('includes/classes/payment.php')); $lC_Payment = new lC_Payment((isset($_POST['payment_method']) ? $_POST['payment_method'] : $lC_ShoppingCart->getBillingMethod('id'))); diff --git a/catalog/includes/content/checkout/process.php b/catalog/includes/content/checkout/process.php index 53fbb390e..62c313fc2 100644 --- a/catalog/includes/content/checkout/process.php +++ b/catalog/includes/content/checkout/process.php @@ -70,7 +70,7 @@ public function lC_Checkout_Process() { $lC_Payment->process(); - $lC_ShoppingCart->reset(true); + $lC_ShoppingCart->reset(true); // unregister session variables used during checkout if (isset($_SESSION['comments'])) unset($_SESSION['comments']); From 1c9bd089060b1cc4d2485f7a11f4c034dc198ccd Mon Sep 17 00:00:00 2001 From: datazen Date: Mon, 21 Jul 2014 15:09:42 -0400 Subject: [PATCH 083/168] merge work --- catalog/addons/Loaded_7_B2B/classes/order.php | 3 --- catalog/templates/core/header.php | 4 ---- 2 files changed, 7 deletions(-) diff --git a/catalog/addons/Loaded_7_B2B/classes/order.php b/catalog/addons/Loaded_7_B2B/classes/order.php index 1dcbf01b1..5912cc42f 100644 --- a/catalog/addons/Loaded_7_B2B/classes/order.php +++ b/catalog/addons/Loaded_7_B2B/classes/order.php @@ -7,9 +7,6 @@ @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt @version $Id: product.php v1.0 2013-08-08 datazen $ */ -error_reporting(E_ALL); -ini_set('display_errors', 1); - global $lC_Vqmod; require_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'includes/classes/order.php')); diff --git a/catalog/templates/core/header.php b/catalog/templates/core/header.php index 30f03cd9a..47f3536ea 100644 --- a/catalog/templates/core/header.php +++ b/catalog/templates/core/header.php @@ -230,8 +230,4 @@
    -getCustomerGroup() . ' - ' . $lC_Customer->getCustomerGroupName($lC_Customer->getCustomerGroup()) . '] access[' . $lC_Customer->getCustomerGroupAccess() . ']
    '; -?> \ No newline at end of file From 0bcbebbc3507ebd284fe3006b35551f9bf851319 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Mon, 21 Jul 2014 15:14:18 -0400 Subject: [PATCH 084/168] merged with latest develop --- .../manufacturers/classes/manufacturers.php | 13 + .../applications/orders/classes/orders.php | 149 +++++++---- .../statistics/classes/statistics.php | 14 + .../statistics/js/statistics.js.php | 129 +++++++++- .../applications/statistics/pages/main.php | 240 +++++++++++++++++- .../modules/statistics/customer_orders.php | 12 + .../statistics/inventory_cost_margin.php | 32 +++ .../en_US/modules/statistics/low_stock.php | 10 - .../modules/statistics/low_stock_report.php | 14 + .../statistics/margin_report_sales.php | 29 +++ .../en_US/modules/statistics/sales_report.php | 18 ++ .../modules/statistics/sales_tax_report.php | 19 ++ .../includes/languages/en_US/statistics.php | 13 +- .../modules/statistics/customer_orders.php | 115 +++++++++ .../statistics/inventory_cost_margin.php | 191 ++++++++++++++ .../includes/modules/statistics/low_stock.php | 65 ----- .../modules/statistics/low_stock_report.php | 76 ++++++ .../statistics/margin_report_sales.php | 161 ++++++++++++ .../modules/statistics/sales_report.php | 201 +++++++++++++++ .../modules/statistics/sales_tax_report.php | 144 +++++++++++ catalog/admin/templates/default/css/style.css | 34 ++- 21 files changed, 1535 insertions(+), 144 deletions(-) create mode 100644 catalog/admin/includes/languages/en_US/modules/statistics/customer_orders.php create mode 100644 catalog/admin/includes/languages/en_US/modules/statistics/inventory_cost_margin.php delete mode 100644 catalog/admin/includes/languages/en_US/modules/statistics/low_stock.php create mode 100644 catalog/admin/includes/languages/en_US/modules/statistics/low_stock_report.php create mode 100644 catalog/admin/includes/languages/en_US/modules/statistics/margin_report_sales.php create mode 100644 catalog/admin/includes/languages/en_US/modules/statistics/sales_report.php create mode 100644 catalog/admin/includes/languages/en_US/modules/statistics/sales_tax_report.php create mode 100644 catalog/admin/includes/modules/statistics/customer_orders.php create mode 100644 catalog/admin/includes/modules/statistics/inventory_cost_margin.php delete mode 100644 catalog/admin/includes/modules/statistics/low_stock.php create mode 100644 catalog/admin/includes/modules/statistics/low_stock_report.php create mode 100644 catalog/admin/includes/modules/statistics/margin_report_sales.php create mode 100644 catalog/admin/includes/modules/statistics/sales_report.php create mode 100644 catalog/admin/includes/modules/statistics/sales_tax_report.php diff --git a/catalog/admin/includes/applications/manufacturers/classes/manufacturers.php b/catalog/admin/includes/applications/manufacturers/classes/manufacturers.php index 862cceedb..9f4c8e1f0 100644 --- a/catalog/admin/includes/applications/manufacturers/classes/manufacturers.php +++ b/catalog/admin/includes/applications/manufacturers/classes/manufacturers.php @@ -288,5 +288,18 @@ public static function batchDelete($batch) { } return true; } + public static function getManufacturersArray() { + global $lC_Language, $lC_Database; + // build the manufacturers array + $manufacturers_array = array(); + $Qmanufacturers = $lC_Database->query('select manufacturers_id, manufacturers_name from :table_manufacturers order by manufacturers_name'); + $Qmanufacturers->bindTable(':table_manufacturers', TABLE_MANUFACTURERS); + $Qmanufacturers->execute(); + while ($Qmanufacturers->next()) { + $manufacturersArray[] = array('id' => $Qmanufacturers->valueInt('manufacturers_id'), + 'text' => $Qmanufacturers->value('manufacturers_name')); + } + return $manufacturersArray; + } } ?> \ No newline at end of file diff --git a/catalog/admin/includes/applications/orders/classes/orders.php b/catalog/admin/includes/applications/orders/classes/orders.php index 684451cda..0d522c6dd 100644 --- a/catalog/admin/includes/applications/orders/classes/orders.php +++ b/catalog/admin/includes/applications/orders/classes/orders.php @@ -46,7 +46,7 @@ public static function getAll() { $QresultTotal->freeResult(); /* Paging */ - $sLimit = " LIMIT 0,25 "; + $sLimit = ""; if (isset($_GET['iDisplayStart'])) { if ($_GET['iDisplayLength'] != -1) { $sLimit = " LIMIT " . $_GET['iDisplayStart'] . ", " . $_GET['iDisplayLength']; @@ -381,25 +381,21 @@ public static function getInfo($id) { // build the product string $result['orderProducts'] = ''; foreach ( $lC_Order->getProducts() as $products ) { - - $skuModel = (isset($products['model']) && $products['model'] != NULL) ? $products['model'] : NULL; - if ($skuModel == NULL) $skuModel = (isset($products['sku']) && $products['sku'] != NULL) ? $products['sku'] : NULL; - $result['orderProducts'] .= ' - ' . $skuModel . ' + ' . $products['model'] . ' ' . $products['name']; if ( isset($products['attributes']) && is_array($products['attributes']) && ( sizeof($products['attributes']) > 0 ) ) { foreach ( $products['attributes'] as $attributes ) { - if ($attributes['option'] != '') $result['orderProducts'] .= '
      - ' . $attributes['option'] . ': ' . $attributes['value'] . ''; + $result['orderProducts'] .= '
      - ' . $attributes['option'] . ': ' . $attributes['value'] . ''; } } if ( isset($products['options']) && is_array($products['options']) && ( sizeof($products['options']) > 0 ) ) { foreach ( $products['options'] as $key => $val ) { - if ($val['group_title'] != '') $result['orderProducts'] .= '
      - ' . $val['group_title'] . ': ' . $val['value_title'] . ''; + $result['orderProducts'] .= '
      - ' . $val['group_title'] . ': ' . $val['value_title'] . ''; } } - + $result['orderProducts'] .= ' ' . $products['quantity'] . ' ' . $lC_Currencies->format($products['price'] * $products['quantity'], $lC_Order->getCurrency(), $lC_Order->getCurrencyValue()) . ' @@ -463,18 +459,16 @@ public static function getInfo($id) { $result['orderStatusHistoryData'] = ''; $oshcnt = 0; foreach ( $lC_Order->getStatusHistory() as $status_history ) { - $result['orderStatusHistory'] .= ' ' . lC_DateTime::getShort($status_history['date_added'], true) . ' ' . $status_history['status'] . ' - ' . (substr($status_history['comment'], 0, 1) == '<') ? $status_history['comment'] : nl2br($status_history['comment']) . ' + ' . nl2br($status_history['comment']) . ' '; - // enhanced order admin additions $result['orderStatusHistoryData'][$oshcnt]['date_added'] = lC_DateTime::getShort($status_history['date_added'], false); $result['orderStatusHistoryData'][$oshcnt]['status'] = $status_history['status']; - $result['orderStatusHistoryData'][$oshcnt]['comment'] = (substr($status_history['comment'], 0, 1) == '<') ? $status_history['comment'] : nl2br($status_history['comment']); + $result['orderStatusHistoryData'][$oshcnt]['comment'] = nl2br($status_history['comment']); $result['orderStatusHistoryData'][$oshcnt]['customer_notified'] = $status_history['customer_notified']; $result['orderStatusHistoryData'][$oshcnt]['admin_name'] = $status_history['admin_name']; $result['orderStatusHistoryData'][$oshcnt]['admin_image'] = $status_history['admin_image']; @@ -655,14 +649,11 @@ private static function _updateStatus($id, $data) { // build and return the udpated status history $history = ''; $result = array(); - foreach ( $lC_Order->getStatusHistory() as $status_history ) { - - $history .= ' ' . lC_DateTime::getShort($status_history['date_added'], true) . ' ' . $status_history['status'] . ' - ' . (substr($status_history['comment'], 0, 1) == '<') ? $status_history['comment'] : nl2br($status_history['comment']) . ' + ' . nl2br($status_history['comment']) . ' '; } @@ -710,25 +701,13 @@ public static function getOrderComments($id = null) { if (is_array($data['orderStatusHistoryData'])) { foreach ($data['orderStatusHistoryData'] as $oshData) { if ($oshData['comment'] != '') { - - $tagColor = ' green-bg'; - $tagText = $lC_Language->get('text_order_comment'); - - if ($oshData['admin_id'] != null) { - $tagColor = ($oshData['append_comment'] == 1) ? ' orange-bg' : ' anthracite-bg'; - $tagText = (($oshData['append_comment'] == 1) ? $lC_Language->get('text_customer_message') : $lC_Language->get('text_admin_note')); - } else if (strstr($oshData['comment'], 'icon-newspaper')) { // is a file upload - $tagColor = ' blue-bg'; - $tagText = $lC_Language->get('text_files_uploaded'); - } - $ocData .= '
    - ' . $tagText . ' + ' . (($oshData['admin_id'] == null) ? $lC_Language->get('text_order_comment') : (($oshData['append_comment'] == 1) ? $lC_Language->get('text_customer_message') : $lC_Language->get('text_admin_note'))) . ' - ' . (($oshData['admin_image'] != '' && file_exists('images/avatar/' . $oshData['admin_image'])) ? '' . $lC_Language->get('text_comment_by') . ' ' . $oshData['admin_name'] . '' : '') . ' + ' . (($oshData['admin_image'] != '' && file_exists('images/avatar/' . $oshData['admin_image'])) ? 'Comment by ' . $oshData['admin_name'] . '' : '') . ' - ' . (($oshData['admin_id'] != null) ? $oshData['admin_name'] : $lC_Language->get('text_customer_comment')) . '' . $oshData['date_added'] . '' . (($oshData['status'] != null) ? '(' . $oshData['status'] . ')' : '') . ' + ' . (($oshData['admin_id'] != null) ? $oshData['admin_name'] : $lC_Language->get('text_customer_comment')) . '' . $oshData['date_added'] . '(' . $oshData['status'] . ')

    ' . $oshData['comment'] . '

    '; @@ -751,25 +730,13 @@ public static function getOrderStatusHistory($id = null) { if (is_array($data['orderStatusHistoryData'])) { foreach ($data['orderStatusHistoryData'] as $oshData) { - - $tagColor = ' green-bg'; - $tagText = $lC_Language->get('text_order_comment'); - - if ($oshData['admin_id'] != null) { - $tagColor = ($oshData['append_comment'] == 1) ? ' orange-bg' : ' anthracite-bg'; - $tagText = (($oshData['append_comment'] == 1) ? $lC_Language->get('text_customer_message') : $lC_Language->get('text_admin_note')); - } else if (strstr($oshData['comment'], 'icon-newspaper')) { // is a file upload - $tagColor = ' blue-bg'; - $tagText = $lC_Language->get('text_files_uploaded'); - } - $osHistory .= '
    - ' . $tagText . ' + ' . (($oshData['admin_id'] == null) ? $lC_Language->get('text_order_comment') : (($oshData['append_comment'] == 1) ? $lC_Language->get('text_customer_message') : $lC_Language->get('text_admin_note'))) . ' ' . (($oshData['admin_image'] != '' && file_exists('images/avatar/' . $oshData['admin_image'])) ? 'Comment by ' . $oshData['admin_name'] . '' : '') . ' - ' . $oshData['admin_name'] . '' . $oshData['date_added'] . '' . (($oshData['status'] != null) ? '(' . $oshData['status'] . ')' : '') . ' + ' . $oshData['admin_name'] . '' . $oshData['date_added'] . '(' . $oshData['status'] . ')

    ' . $oshData['comment'] . '

    '; @@ -959,7 +926,7 @@ public static function getOrderTransactions($id = null) { return $tData; } - public static function getOrderStatusArray() { + /* public static function getOrderStatusArray() { global $lC_Language, $lC_Database; // build the order status array @@ -980,7 +947,7 @@ public static function getOrderStatusArray() { } return $orderStatusArray; - } + } */ public static function getOrdersProducts($id) { global $lC_Language, $lC_Database; @@ -1335,6 +1302,7 @@ public static function getOrderTotalsList($oID) { $Qtotals->execute(); while ($Qtotals->next()) { + $str_flag = ($Qtotals->value('class') == 'coupon') ? ' - ' : '' ; if ($Qtotals->value('class') == 'total') { @@ -1342,21 +1310,42 @@ public static function getOrderTotalsList($oID) { } else { $total += $Qtotals->value('value'); } - $result .= '
    ' . + $result .= '
    ' . '  ' . - lc_draw_input_field("title_" . $Qtotals->value('class'), $Qtotals->value('title'), ' style="width:30%;" class="input with-small-padding"') . + lc_draw_input_field("title_" . $Qtotals->value('class'), $Qtotals->value('title'), ' style="width:30%;"') . '   ' . - lc_draw_input_field("value_" . $Qtotals->value('class'), $str_flag.$lC_Currencies->format($Qtotals->value('value')), ' id="value_'. $Qtotals->value('class'). '" class="input with-small-padding" style="width:10%;text-align:right;min-width:65px;" onkeyup="updateGrandTotal(\''.$lC_Currencies->getSymbolLeft().'\');"') . '  ' . + lc_draw_input_field("value_" . $Qtotals->value('class'), $str_flag.$lC_Currencies->format($Qtotals->value('value')), ' id = "value_'. $Qtotals->value('class'). '" style="width:10%;text-align:right;min-width:65px;" onkeyup="updateGrandTotal(\''.$lC_Currencies->getSymbolLeft().'\');"') . '  ' . ' ' . - '
    '; + '
    '; + + + } $result .= '
    ' . '
    '; if ($result != '') { - $result .= '
    ' . - ' ' . $lC_Language->get('text_grand_total') . '' . - ' ' . $lC_Currencies->format(str_replace(',','',number_format($total, DECIMAL_PLACES))) . '  ' . + $result .= '
    ' . + '
    ' . + '
    ' . + ' ' . + ' ' . $lC_Language->get('text_grand_total') . '' . + ' ' . + ' ' . $lC_Currencies->format(str_replace(',','',number_format($total, DECIMAL_PLACES))) . '' . + '
    ' . + '
    ' . + ' ' . + ' ' . + ' ' . + ' ' . + ' ' . + '
    ' . + '
    ' . '
    '; } @@ -1602,5 +1591,55 @@ public static function deleteOrderProduct() { return $data; } + public static function getOrderStatusArray() { + global $lC_Language, $lC_Database; + + // build the order status array + $orders_status_type_array = array(); + $Qstatuses_type = $lC_Database->query('select distinct(orders_status_type) as orders_status_type from :table_orders_status where language_id = :language_id'); + $Qstatuses_type->bindTable(':table_orders_status', TABLE_ORDERS_STATUS); + $Qstatuses_type->bindInt(':language_id', $lC_Language->getID()); + $Qstatuses_type->execute(); + + + + + while ($Qstatuses_type->next()) { + $orderStatusType_Array[$Qstatuses_type->value('orders_status_type')] = $Qstatuses_type->value('orders_status_type'); + } + + + $orderStatusTypeArray[] = array('id' => -1, 'text' => $lC_Language->get('text_status_type')); + foreach($orderStatusType_Array as $id => $text) { + $orderStatusTypeArray[] = array('id' => $id, 'text' => ' - '.$text); + } + + + + // build the order status array + $orders_status_array = array(); + $Qstatuses = $lC_Database->query('select orders_status_id, orders_status_name from :table_orders_status where language_id = :language_id'); + $Qstatuses->bindTable(':table_orders_status', TABLE_ORDERS_STATUS); + $Qstatuses->bindInt(':language_id', $lC_Language->getID()); + $Qstatuses->execute(); + + while ($Qstatuses->next()) { + $orders_status_array[$Qstatuses->valueInt('orders_status_id')] = $Qstatuses->value('orders_status_name'); + } + + $orderStatusArray = array(); + $orderStatusArray[] = array('id' => 0, 'text' => $lC_Language->get('text_all')); + + $orderStatusArray = array_merge($orderStatusArray,$orderStatusTypeArray); + $orderStatusArray[] = array('id' => -2, 'text' => $lC_Language->get('text_statuses')); + + + + foreach($orders_status_array as $id => $text) { + $orderStatusArray[] = array('id' => $id, 'text' => ' - '.$text); + } + + return $orderStatusArray; + } } ?> diff --git a/catalog/admin/includes/applications/statistics/classes/statistics.php b/catalog/admin/includes/applications/statistics/classes/statistics.php index 4d75e9a3d..7c8e177aa 100644 --- a/catalog/admin/includes/applications/statistics/classes/statistics.php +++ b/catalog/admin/includes/applications/statistics/classes/statistics.php @@ -74,6 +74,20 @@ public static function getData($module) { $result['aaData'][] = array("$col[0]", "$col[1]", "$col[2]", "$col[3]"); } else if ($columns == 5) { $result['aaData'][] = array("$col[0]", "$col[1]", "$col[2]", "$col[3]", "$col[4]"); + } else if ($columns == 6) { + $result['aaData'][] = array("$col[0]", "$col[1]", "$col[2]", "$col[3]", "$col[4]", "$col[5]"); + } else if ($columns == 7) { + $result['aaData'][] = array("$col[0]", "$col[1]", "$col[2]", "$col[3]", "$col[4]", "$col[5]", "$col[6]"); + } else if ($columns == 8) { + $result['aaData'][] = array("$col[0]", "$col[1]", "$col[2]", "$col[3]", "$col[4]", "$col[5]", "$col[6]", "$col[7]"); + } else if ($columns == 9) { + $result['aaData'][] = array("$col[0]", "$col[1]", "$col[2]", "$col[3]", "$col[4]", "$col[5]", "$col[6]", "$col[7]", "$col[8]"); + } else if ($columns == 10) { + $result['aaData'][] = array("$col[0]", "$col[1]", "$col[2]", "$col[3]", "$col[4]", "$col[5]", "$col[6]", "$col[7]", "$col[8]", "$col[9]"); + } else if ($columns == 11) { + $result['aaData'][] = array("$col[0]", "$col[1]", "$col[2]", "$col[3]", "$col[4]", "$col[5]", "$col[6]", "$col[7]", "$col[8]", "$col[9]", "$col[10]"); + } else if ($columns == 12) { + $result['aaData'][] = array("$col[0]", "$col[1]", "$col[2]", "$col[3]", "$col[4]", "$col[5]", "$col[6]", "$col[7]", "$col[8]", "$col[9]", "$col[10]", "$col[11]"); } } $result['total'] = $cnt; diff --git a/catalog/admin/includes/applications/statistics/js/statistics.js.php b/catalog/admin/includes/applications/statistics/js/statistics.js.php index 19f4361aa..d1be22f78 100644 --- a/catalog/admin/includes/applications/statistics/js/statistics.js.php +++ b/catalog/admin/includes/applications/statistics/js/statistics.js.php @@ -11,8 +11,13 @@ global $lC_Template, $lC_Language, $modulesArr, $accessArr, $cols; if (!empty($_GET['module'])) { // module listing ?> + modCheck('includes/applications/orders/classes/orders.php')); + require_once($lC_Vqmod->modCheck('includes/applications/manufacturers/classes/manufacturers.php')); + + $note = '

    NOTE    '. + $lC_Language->get('text1').'' .lc_go_pro().$lC_Language->get('text2').''.lc_go_pro().$lC_Language->get('text3').'

    '; + + $breakout = ' + ' . $lC_Language->get("text_breakout_by") . ' + + + + + + '; + + function get_dropdown_list_array($type) { + global $lC_Language; + + $list_arr = array(); + + switch($type) { + case 'manufacturer': + $list_str = $lC_Language->get('text_select_manufacturers'); + $list_arr = lC_Manufacturers_Admin::getManufacturersArray(); + break; + case 'supplier': + $list_str = $lC_Language->get('text_select_supplier'); + //$list_arr = lC_Orders_Admin::getOrderStatusArray(); + break; + case 'order_status': + //$list_str = $lC_Language->get('text_statuses'); + $list_arr = lC_Orders_Admin::getOrderStatusArray(); + break; + } + + $i = 0; + if($list_str != '') { + $i = 1; + $return_arr[0] = array('id' => '', + 'text' => $list_str + ); + } + + if(is_array($list_arr) && count($list_arr) > 0) { + foreach($list_arr as $k => $arr) { + $return_arr[$k+$i] = $arr; + } + } + return $return_arr; + } + + $arr_time_span = array( + array('id' => 'daily', + 'text' => $lC_Language->get('text_daily')), + array('id' => 'monthly', + 'text' => $lC_Language->get('text_monthly')), + array('id' => 'quaterly', + 'text' => $lC_Language->get('text_quarterly')), + array('id' => 'annually', + 'text' => $lC_Language->get('text_annually')) + ); + $arr_summary = array( + array('id' => 'summary', + 'text' => $lC_Language->get('text_summary')), + array('id' => 'detailed', + 'text' => $lC_Language->get('text_detailed')), + array('id' => 'detailed_amounts', + 'text' => $lC_Language->get('text_detailed_amounts')) + ); + + + $manufacturer_arr = get_dropdown_list_array('manufacturer'); + $supplier_arr = get_dropdown_list_array('supplier'); + $order_status_arr = get_dropdown_list_array('order_status'); + + $manufacturer_dropdown = lc_draw_pull_down_menu('manufacturer', $manufacturer_arr, null, 'class="input with-small-padding small-margin-bottom"') . ' '; + $supplier_dropdown = lc_draw_pull_down_menu('supplier', $supplier_arr, null, 'class="input with-small-padding small-margin-bottom"') . ' '; + $order_status_dropdown = lc_draw_pull_down_menu('order_status', $order_status_arr, null, 'class="input with-small-padding small-margin-bottom"') . ' '; + $time_span_dropdown = lc_draw_pull_down_menu('time_span', $arr_time_span, null, 'class="green-gradient select expandable-list small-margin-bottom"') . ' '; + $summary_dropdown = lc_draw_pull_down_menu('summary', $arr_summary, null, 'class="green-gradient select expandable-list"') . ' '; + + $start_date_input = ' + + + '; + $expires_date_input = ' + + + '; + + $go_date = ''; + + switch($_GET['module']) { + case 'orders': + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + + case 'products_purchased': + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + + case 'products_viewed': + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + + case 'customer_orders': + $list_criteria .= $order_status_dropdown; + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + + case 'inventory_cost_margin': + $list_criteria .= $note; + $list_criteria .= $breakout; + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + + case 'low_stock_report': + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + + case 'margin_report_sales': + $list_criteria .= $note; + $list_criteria .= $manufacturer_dropdown; + $list_criteria .= $supplier_dropdown; + $list_criteria .= $order_status_dropdown; + $list_criteria .= $time_span_dropdown; + $list_criteria .= $start_date_input; + $list_criteria .= $expires_date_input; + $list_criteria .= $go_date; + // added for mobile css per report + $dataTableTopMargin320 = '0px'; + $dataTableTopMargin480 = '0px'; + break; + + case 'sales_report': + $list_criteria .= $order_status_dropdown; + $list_criteria .= $time_span_dropdown; + $list_criteria .= $summary_dropdown; + $list_criteria .= $start_date_input; + $list_criteria .= $expires_date_input; + $list_criteria .= $go_date; + // added for mobile css per report + $dataTableTopMargin320 = '0px'; + $dataTableTopMargin480 = '0px'; + break; + + case 'sales_tax_report': + $list_criteria .= $order_status_dropdown; + $list_criteria .= $time_span_dropdown; + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + } + + ?> +
    -

    getPageTitle(); ?>

    +

    + getPageTitle(); + } else { + echo $lC_Statistics->_title; + } + ?> +

    -
    +
    +
    +
    + +
    +
    +
    @@ -40,7 +264,7 @@ - +
      
    diff --git a/catalog/admin/includes/languages/en_US/modules/statistics/customer_orders.php b/catalog/admin/includes/languages/en_US/modules/statistics/customer_orders.php new file mode 100644 index 000000000..37694a079 --- /dev/null +++ b/catalog/admin/includes/languages/en_US/modules/statistics/customer_orders.php @@ -0,0 +1,12 @@ +# @package admin::languages::modules +# @author Loaded Commerce +# @copyright Copyright 2003-2014 Loaded Commerce, LLC +# @copyright Portions Copyright 2003 osCommerce +# @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt +# @version $Id: customer_orders.php v1.0 2013-08-08 datazen $ + + +statistics_customer_orders_title = Customer Orders +statistics_customers_table_heading_customers_name = Customers Name +statistics_customers_table_heading_group = Group +statistics_customers_table_heading_order_total = Order Total diff --git a/catalog/admin/includes/languages/en_US/modules/statistics/inventory_cost_margin.php b/catalog/admin/includes/languages/en_US/modules/statistics/inventory_cost_margin.php new file mode 100644 index 000000000..331998aad --- /dev/null +++ b/catalog/admin/includes/languages/en_US/modules/statistics/inventory_cost_margin.php @@ -0,0 +1,32 @@ +# @package admin::languages::modules +# @author Loaded Commerce +# @copyright Copyright 2003-2014 Loaded Commerce, LLC +# @copyright Portions Copyright 2003 osCommerce +# @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt +# @version $Id: inventory_cost_margin.php v1.0 2013-08-08 datazen $ + + +statistics_inventory_cost_margin_title = Inventory Cost Margin +statistics_inventory_table_heading_breakout = Breakout +statistics_inventory_table_heading_of_products = #of Products +statistics_inventory_table_heading_total_qoh = Total QOH +statistics_inventory_table_heading_total_cost = Total Cost +statistics_inventory_table_heading_retail_value = Retail Value +statistics_inventory_table_heading_retail_margin = Retail Margin +statistics_inventory_table_heading_retail_special = Retail Special + +text_supplier = Supplier +text_class = Class +text_category = Category +text_product/SKU = Product/SKU +text_manufacturers = Manufacturers +text_supplier_upsell_title = Class + +text_class_upsell_title = Class +text_class_upsell_desc = Additional Images Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. + +text1 = Recommended for +text2 = This reports uses for cost data only collected and managed in +text3 = Edition. + + diff --git a/catalog/admin/includes/languages/en_US/modules/statistics/low_stock.php b/catalog/admin/includes/languages/en_US/modules/statistics/low_stock.php deleted file mode 100644 index 66ededf62..000000000 --- a/catalog/admin/includes/languages/en_US/modules/statistics/low_stock.php +++ /dev/null @@ -1,10 +0,0 @@ -# @package admin::languages::modules -# @author Loaded Commerce -# @copyright Copyright 2003-2014 Loaded Commerce, LLC -# @copyright Portions Copyright 2003 osCommerce -# @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt -# @version $Id: low_stock.php v1.0 2013-08-08 datazen $ - -statistics_low_stock_title = Low Stock -statistics_low_stock_table_heading_products = Products -statistics_low_stock_table_heading_level = Level diff --git a/catalog/admin/includes/languages/en_US/modules/statistics/low_stock_report.php b/catalog/admin/includes/languages/en_US/modules/statistics/low_stock_report.php new file mode 100644 index 000000000..186622d67 --- /dev/null +++ b/catalog/admin/includes/languages/en_US/modules/statistics/low_stock_report.php @@ -0,0 +1,14 @@ +# @package admin::languages::modules +# @author Loaded Commerce +# @copyright Copyright 2003-2014 Loaded Commerce, LLC +# @copyright Portions Copyright 2003 osCommerce +# @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt +# @version $Id: low_stock_report.php v1.0 2013-08-08 datazen $ + +statistics_low_stock_report_title = Low Stock Report +statistics_low_stock_table_heading_products = Product Name +statistics_low_stock_table_heading_qty_available = Qty Available +statistics_low_stock_table_heading_model = Model +statistics_low_stock_table_heading_sales = 60 Days Sales +statistics_low_stock_table_heading_est_stock = Est. Stock +statistics_low_stock_table_heading_status = Status diff --git a/catalog/admin/includes/languages/en_US/modules/statistics/margin_report_sales.php b/catalog/admin/includes/languages/en_US/modules/statistics/margin_report_sales.php new file mode 100644 index 000000000..735ca0e13 --- /dev/null +++ b/catalog/admin/includes/languages/en_US/modules/statistics/margin_report_sales.php @@ -0,0 +1,29 @@ +# @package admin::languages::modules +# @author Loaded Commerce +# @copyright Copyright 2003-2014 Loaded Commerce, LLC +# @copyright Portions Copyright 2003 osCommerce +# @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt +# @version $Id: margin_report_sales.php v1.0 2013-08-08 datazen $ + + +statistics_margin_title = Margin Report Sales +statistics_margin_table_heading_order_id = Order ID +statistics_margin_table_heading_item_sold = #Item Sold +statistics_margin_table_heading_sales_amount = Sales Amount +statistics_margin_table_heading_cost = Cost +statistics_margin_table_heading_margin($) = Margin($) +statistics_margin_table_heading_margin(%) = Margin(%) + +text_select_manufacturers = Select Manufacturers +text_select_supplier = Select Supplier +text_from_date =From Date +text_to_date =To Date + +text1 = Recommended for +text2 = This reports uses for cost data only collected and managed in +text3 = Edition. + +text_class_upsell_title = Class +text_class_upsell_desc = Additional Images Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. + + diff --git a/catalog/admin/includes/languages/en_US/modules/statistics/sales_report.php b/catalog/admin/includes/languages/en_US/modules/statistics/sales_report.php new file mode 100644 index 000000000..c975d8cbf --- /dev/null +++ b/catalog/admin/includes/languages/en_US/modules/statistics/sales_report.php @@ -0,0 +1,18 @@ +# @package admin::languages::modules +# @author Loaded Commerce +# @copyright Copyright 2003-2014 Loaded Commerce, LLC +# @copyright Portions Copyright 2003 osCommerce +# @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt +# @version $Id: sales_report.php v1.0 2013-08-08 datazen $ + + +statistics_sales_title = Sales Report +statistics_sales_table_heading_date = Date +statistics_sales_table_heading_orders = #Orders +statistics_sales_table_heading_items = #Items +statistics_sales_table_heading_revenue = Revenue +statistics_sales_table_heading_shipping = Shipping +statistics_sales_table_heading_discount = Discount + +text_from_date =From Date +text_to_date =To Date \ No newline at end of file diff --git a/catalog/admin/includes/languages/en_US/modules/statistics/sales_tax_report.php b/catalog/admin/includes/languages/en_US/modules/statistics/sales_tax_report.php new file mode 100644 index 000000000..f30ee67b3 --- /dev/null +++ b/catalog/admin/includes/languages/en_US/modules/statistics/sales_tax_report.php @@ -0,0 +1,19 @@ +# @package admin::languages::modules +# @author Loaded Commerce +# @copyright Copyright 2003-2014 Loaded Commerce, LLC +# @copyright Portions Copyright 2003 osCommerce +# @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt +# @version $Id: sales_tax_report.php v1.0 2013-08-08 datazen $ + +statistics_sales_tax_report_title = Sales Tax Report + +statistics_sales_tax_table_heading_month = Month +statistics_sales_tax_table_heading_day = Day +statistics_sales_tax_table_heading_gross_income= Gross Income +statistics_sales_tax_table_heading_product_sales = Product Sales +statistics_sales_tax_table_heading_non_taxed_sales = Non Taxed Sales +statistics_sales_tax_table_heading_taxed_sales = Taxed Sales +statistics_sales_tax_table_heading_taxes_collected = Taxes Collected +statistics_sales_tax_table_heading_shipping_handling = Shipping & Handling +statistics_sales_tax_table_heading_tax_shipping = Tax On Shipping +statistics_sales_tax_table_heading_gift_vouchers = Gift Vouchers \ No newline at end of file diff --git a/catalog/admin/includes/languages/en_US/statistics.php b/catalog/admin/includes/languages/en_US/statistics.php index cc9f38d76..6b571e229 100644 --- a/catalog/admin/includes/languages/en_US/statistics.php +++ b/catalog/admin/includes/languages/en_US/statistics.php @@ -10,4 +10,15 @@ table_heading_modules = Modules table_heading_action = Action -modules_location = Modules Directory: \ No newline at end of file +modules_location = Modules Directory: +text_monthly = Monthly +text_quarterly = Quarterly +text_annually = Annually +text_summary = Summary +text_detailed = Detailed +text_detailed_amounts = Detailed Amounts +text_breakout_by = Breakout by: +text_statuses = Statuses +text_status_type = Status Types +text_go = Go +text_daily = Daily \ No newline at end of file diff --git a/catalog/admin/includes/modules/statistics/customer_orders.php b/catalog/admin/includes/modules/statistics/customer_orders.php new file mode 100644 index 000000000..932d5e9ea --- /dev/null +++ b/catalog/admin/includes/modules/statistics/customer_orders.php @@ -0,0 +1,115 @@ +modCheck('includes/classes/statistics.php')); +} + +class lC_Statistics_Customer_Orders extends lC_Statistics { + + // Class constructor + public function lC_Statistics_Customer_Orders() { + global $lC_Language, $lC_Currencies, $lC_Vqmod; + + $lC_Language->loadIniFile('modules/statistics/customer_orders.php'); + + if ( !isset($lC_Currencies) ) { + if ( !class_exists('lC_Currencies') ) { + include($lC_Vqmod->modCheck('../includes/classes/currencies.php')); + } + + $lC_Currencies = new lC_Currencies(); + } + + $this->_setIcon(); + $this->_setTitle(); + } + + // Private methods + protected function _setIcon() { + $this->_icon = lc_icon_admin('reports.png'); + } + + protected function _setTitle() { + global $lC_Language; + + $this->_title = $lC_Language->get('statistics_customer_orders_title'); + } + + protected function _setHeader() { + global $lC_Language; + + $this->_header = + array($lC_Language->get('statistics_customers_table_heading_customers_name'), + $lC_Language->get('statistics_customers_table_heading_group'), + $lC_Language->get('statistics_customers_table_heading_order_total') + ); + } + + protected function _setData() { + global $lC_Database, $lC_Language, $lC_Currencies; + + $this->_data = array(); + + $this->_resultset = $lC_Database->query('select c.customers_id, c.customers_firstname, cg.customers_group_name, sum(ot.value) as orders_total from :table_customers c, :table_customers_groups cg, :table_orders o, :table_orders_total ot where cg.customers_group_id = c.customers_group_id and c.customers_id = o.customers_id and o.orders_id = ot.orders_id and ot.class = "total" '); + + if (isset($_GET['statusID'])) { + + switch($_GET['statusID']) { + + case 'Pending': + case 'Approved': + case 'Rejected': + $query = $lC_Database->query('select orders_status_id, orders_status_name from :table_orders_status where orders_status_type = "'.$_GET['statusID'].'"' ); + $query->bindTable(':table_orders_status', TABLE_ORDERS_STATUS); + $query->bindInt(':language_id', $lC_Language->getID()); + $query->execute(); + + $ids = ''; + while($query->next()) { + $ids .= $query->value('orders_status_id').","; + } + $ids = substr($ids, 0, -1); + $this->_resultset->appendQuery(' and o.orders_status IN ( :orders_status )'); + $this->_resultset->bindValue(':orders_status', $ids); + + break; + + default: + if((int)$_GET['statusID'] > 0) { + $this->_resultset->appendQuery(' and o.orders_status = :orders_status '); + $this->_resultset->bindInt(':orders_status', $_GET['statusID']); + } + } + } + + $this->_resultset->appendQuery(' group by o.customers_id order by o.customers_id '); + + $this->_resultset->bindTable(':table_customers', TABLE_CUSTOMERS); + $this->_resultset->bindTable(':table_customers_groups', + TABLE_CUSTOMERS_GROUPS); + $this->_resultset->bindTable(':table_orders', TABLE_ORDERS); + $this->_resultset->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + + $this->_resultset->setBatchLimit($_GET['page'], + MAX_DISPLAY_SEARCH_RESULTS); + $this->_resultset->execute(); + + while ( $this->_resultset->next() ) { + $this->_data[] = + array($this->_resultset->value('customers_firstname'), + $this->_resultset->value('customers_group_name'), + $lC_Currencies->format($this->_resultset->valueInt('orders_total'))); + } + } +} +?> \ No newline at end of file diff --git a/catalog/admin/includes/modules/statistics/inventory_cost_margin.php b/catalog/admin/includes/modules/statistics/inventory_cost_margin.php new file mode 100644 index 000000000..46287353d --- /dev/null +++ b/catalog/admin/includes/modules/statistics/inventory_cost_margin.php @@ -0,0 +1,191 @@ +modCheck('includes/classes/statistics.php')); +} + +class lC_Statistics_Inventory_Cost_Margin extends lC_Statistics { + + // Class constructor + public function lC_Statistics_Inventory_Cost_Margin() { + global $lC_Language, $lC_Currencies, $lC_Vqmod; + + $lC_Language->loadIniFile('modules/statistics/inventory_cost_margin.php'); + + if ( !isset($lC_Currencies) ) { + if ( !class_exists('lC_Currencies') ) { + include($lC_Vqmod->modCheck('../includes/classes/currencies.php')); + } + + $lC_Currencies = new lC_Currencies(); + } + + $this->_setIcon(); + $this->_setTitle(); + } + + // Private methods + protected function _setIcon() { + $this->_icon = lc_icon_admin('reports.png'); + } + + protected function _setTitle() { + global $lC_Language; + + $this->_title = $lC_Language->get('statistics_inventory_cost_margin_title'); + } + + protected function _setHeader() { + global $lC_Language; + + $this->_header = array($lC_Language->get('statistics_inventory_table_heading_breakout'), + $lC_Language->get('statistics_inventory_table_heading_of_products'), + $lC_Language->get('statistics_inventory_table_heading_total_qoh'), + $lC_Language->get('statistics_inventory_table_heading_total_cost'), + $lC_Language->get('statistics_inventory_table_heading_retail_value'), + $lC_Language->get('statistics_inventory_table_heading_retail_margin'), + $lC_Language->get('statistics_inventory_table_heading_retail_special') + ); + } + + protected function _setData() { + global $lC_Database, $lC_Language, $lC_Currencies; + + $this->_data = array(); + + $breakoutType = "category"; + if (isset($_GET['breakoutType'])) { + $breakoutType = $_GET['breakoutType']; + } + + switch($breakoutType) { + case 'class': + return false; + break; + case 'supplier': + return false; + break; + case 'product_sku': + $breakout_qry = $lC_Database->query('select p.products_id as id, p.products_sku as sku, p.products_quantity as qohTotal,p.products_cost as costTotal, p.products_price as valueTotal, (p.products_price-p.products_cost) as marginTotal, s.specials_new_products_price as special from :table_products p LEFT JOIN :table_specials s on(s.products_id = p.products_id) order by p.products_sku'); + $breakout_qry->bindTable(':table_products', TABLE_PRODUCTS); + $breakout_qry->bindTable(':table_specials', TABLE_SPECIALS); + $breakout_qry->execute(); + break; + case 'manufacturers': + $breakout_qry = $lC_Database->query('select m.manufacturers_id as id, m.manufacturers_name as name from :table_manufacturers m order by m.manufacturers_name'); + $breakout_qry->bindTable(':table_manufacturers', TABLE_MANUFACTURERS); + $breakout_qry->execute(); + break; + case 'category': + default: + $breakout_qry = $lC_Database->query('select cd.categories_id as id, cd.categories_name as name from :table_categories c, :table_categories_description cd where c.categories_id = cd.categories_id and c.categories_mode = :categories_mode and cd.language_id = :language_id order by cd.categories_name'); + $breakout_qry->bindTable(':table_categories_description', TABLE_CATEGORIES_DESCRIPTION); + $breakout_qry->bindTable(':table_categories', TABLE_CATEGORIES); + $breakout_qry->bindInt(':language_id', $lC_Language->getID()); + $breakout_qry->bindvalue(':categories_mode', 'category'); + $breakout_qry->execute(); + } + + + while($breakout_qry->next()) { + if($breakoutType == 'product_sku'){ + + $breakout = $breakout_qry->value('sku'); + $numOfProduct = $breakout_qry->value('-'); + $qohTotal = $breakout_qry->value('qohTotal'); + $costTotal = $breakout_qry->value('costTotal'); + $valueTotal = $breakout_qry->value('valueTotal'); + $marginTotal = $breakout_qry->value('marginTotal'); + $specialTotal = $breakout_qry->value('special'); + } else if($breakoutType == 'category' || $breakoutType == 'manufacturers') { + $id = $breakout_qry->value('id'); + $tmp_arry = $this->_getDetailsForBreakoutType($id, $breakoutType); + $breakout = $breakout_qry->value('name'); + $numOfProduct = $tmp_arry['numOfProduct']; + $qohTotal = $tmp_arry['qohTotal']; + $costTotal = $tmp_arry['costTotal']; + $valueTotal = $tmp_arry['valueTotal']; + $marginTotal = $tmp_arry['marginTotal']; + $specialTotal = $tmp_arry['specialTotal']; + } + + $this->_data[] = array($breakout, + $numOfProduct, + $qohTotal, + $lC_Currencies->format($costTotal), + $lC_Currencies->format($valueTotal), + $lC_Currencies->format($marginTotal), + $lC_Currencies->format($specialTotal) + ); + } + } + + function _getDetailsForBreakoutType($id, $breakoutType) { + global $lC_Database, $lC_Language, $lC_Currencies; + + $productDetails_qry = $lC_Database->query('select p.products_id, p.products_quantity, p.products_cost, p.products_price, (p.products_price-p.products_cost) as margin from :table_products p'); + + if ($breakoutType == 'category') { + $productDetails_qry->appendQuery(', :table_products_to_categories ptc '); + $productDetails_qry->bindTable(':table_products_to_categories', TABLE_PRODUCTS_TO_CATEGORIES); + } + + if ($breakoutType == 'manufacturers') { + $productDetails_qry->appendQuery(' where p.manufacturers_id = :manufacturers_id '); + $productDetails_qry->bindValue(':manufacturers_id',$id); + } + + if ($breakoutType == 'category') { + $productDetails_qry->appendQuery(' where p.products_id = ptc.products_id and ptc.categories_id = :categories_id' ); + $productDetails_qry->bindValue(':categories_id',$id); + } + + $productDetails_qry->bindTable(':table_products', TABLE_PRODUCTS); + $productDetails_qry->execute(); + + $numOfProduct = 0; + $qoh = 0; + $cost = 0; + $value = 0; + $margin = 0; + $specials = 0; + + while($productDetails_qry->next()) { + $numOfProduct++; + $qoh += $productDetails_qry->value('products_quantity'); + $cost += $productDetails_qry->value('products_cost'); + $value += $productDetails_qry->value('products_price'); + $margin += $productDetails_qry->value('margin'); + + $specails_qry = $lC_Database->query('select specials_new_products_price from :table_specials s where s.products_id = :products_id and (s.expires_date > now() OR s.expires_date IS NULL )'); + $specails_qry->bindTable(':table_specials', TABLE_SPECIALS); + $specails_qry->bindValue(':products_id',$productDetails_qry->value('products_id')); + $specails_qry->execute(); + + while($specails_qry->next()) { + $specials += $specails_qry->value('specials_new_products_price'); + } + } + + $return_arr = array('numOfProduct' => $numOfProduct, + 'qohTotal' => $qoh, + 'costTotal' => $cost, + 'valueTotal' => $value, + 'marginTotal' => $margin, + 'specialTotal' => $specials + ); + + return $return_arr; + } +} +?> \ No newline at end of file diff --git a/catalog/admin/includes/modules/statistics/low_stock.php b/catalog/admin/includes/modules/statistics/low_stock.php deleted file mode 100644 index 5078b5f37..000000000 --- a/catalog/admin/includes/modules/statistics/low_stock.php +++ /dev/null @@ -1,65 +0,0 @@ -modCheck('includes/classes/statistics.php')); -} - -class lC_Statistics_Low_Stock extends lC_Statistics { - - // Class constructor - public function lC_Statistics_Low_Stock() { - global $lC_Language; - - $lC_Language->loadIniFile('modules/statistics/low_stock.php'); - - $this->_setIcon(); - $this->_setTitle(); - } - - // Private methods - protected function _setIcon() { - $this->_icon = lc_icon_admin('products.png'); - } - - protected function _setTitle() { - global $lC_Language; - - $this->_title = $lC_Language->get('statistics_low_stock_title'); - } - - protected function _setHeader() { - global $lC_Language; - - $this->_header = array($lC_Language->get('statistics_low_stock_table_heading_products'), - $lC_Language->get('statistics_low_stock_table_heading_level')); - } - - protected function _setData() { - global $lC_Database, $lC_Language; - - $this->_data = array(); - - $this->_resultset = $lC_Database->query('select p.products_id, pd.products_name, products_quantity from :table_products p, :table_products_description pd where p.products_id = pd.products_id and pd.language_id = :language_id and p.products_quantity <= :stock_reorder_level order by p.products_quantity desc'); - $this->_resultset->bindTable(':table_products', TABLE_PRODUCTS); - $this->_resultset->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION); - $this->_resultset->bindInt(':language_id', $lC_Language->getID()); - $this->_resultset->bindInt(':stock_reorder_level', STOCK_REORDER_LEVEL); - $this->_resultset->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS); - $this->_resultset->execute(); - - while ( $this->_resultset->next() ) { - $this->_data[] = array(lc_link_object(lc_href_link_admin(FILENAME_DEFAULT, 'products&pID=' . $this->_resultset->valueInt('products_id') . '&action=preview'), $this->_icon . ' ' . $this->_resultset->value('products_name')), - $this->_resultset->valueInt('products_quantity')); - } - } -} -?> \ No newline at end of file diff --git a/catalog/admin/includes/modules/statistics/low_stock_report.php b/catalog/admin/includes/modules/statistics/low_stock_report.php new file mode 100644 index 000000000..32ff3373a --- /dev/null +++ b/catalog/admin/includes/modules/statistics/low_stock_report.php @@ -0,0 +1,76 @@ +modCheck('includes/classes/statistics.php')); +} + +class lC_Statistics_Low_Stock_Report extends lC_Statistics { + + // Class constructor + public function lC_Statistics_Low_Stock_Report() { + global $lC_Language; + + $lC_Language->loadIniFile('modules/statistics/low_stock_report.php'); + + $this->_setIcon(); + $this->_setTitle(); + } + + // Private methods + protected function _setIcon() { + $this->_icon = lc_icon_admin('reports.png'); + } + + protected function _setTitle() { + global $lC_Language; + + $this->_title = $lC_Language->get('statistics_low_stock_report_title'); + } + + protected function _setHeader() { + global $lC_Language; + + $this->_header = array($lC_Language->get('statistics_low_stock_table_heading_products'), + $lC_Language->get('statistics_low_stock_table_heading_qty_available'), + $lC_Language->get('statistics_low_stock_table_heading_model'), + $lC_Language->get('statistics_low_stock_table_heading_sales'), + $lC_Language->get('statistics_low_stock_table_heading_est_stock'), + $lC_Language->get('statistics_low_stock_table_heading_status')); + } + + protected function _setData() { + global $lC_Database, $lC_Language; + + $this->_data = array(); + + $this->_resultset = $lC_Database->query('select p.products_id, pd.products_name, p.products_quantity, p.products_model, count( op.products_quantity ) AS ordertotal, p.products_status from :table_products p, :table_products_description pd, :table_orders_products op LEFT JOIN :table_orders o on(op.orders_id = o.orders_id ) WHERE p.products_id = pd.products_id and pd.products_id = op.products_id and pd.language_id =1 and o.date_purchased >= DATE_SUB( CURDATE( ),INTERVAL 60 DAY) and p.products_quantity <=5 group by p.products_quantity desc'); + $this->_resultset->bindTable(':table_products', TABLE_PRODUCTS); + $this->_resultset->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION); + $this->_resultset->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); + $this->_resultset->bindTable(':table_orders', TABLE_ORDERS); + $this->_resultset->bindInt(':language_id', $lC_Language->getID()); + $this->_resultset->bindInt(':stock_reorder_level', STOCK_REORDER_LEVEL); + $this->_resultset->execute(); + + while ( $this->_resultset->next() ) { + $products_status = (($this->_resultset->valueInt('products_status') == 1) ? '' : ''); + + $this->_data[] = array($this->_resultset->value('products_name'), + $this->_resultset->valueInt('products_quantity'), + $this->_resultset->value('products_model'), + $this->_resultset->valueInt('ordertotal'), + '-', + $products_status ); + } + } +} +?> \ No newline at end of file diff --git a/catalog/admin/includes/modules/statistics/margin_report_sales.php b/catalog/admin/includes/modules/statistics/margin_report_sales.php new file mode 100644 index 000000000..af9cd3a41 --- /dev/null +++ b/catalog/admin/includes/modules/statistics/margin_report_sales.php @@ -0,0 +1,161 @@ +modCheck('includes/classes/statistics.php')); +} + +class lC_Statistics_Margin_Report_Sales extends lC_Statistics { + + // Class constructor + public function lC_Statistics_Margin_Report_Sales() { + global $lC_Language, $lC_Currencies, $lC_Vqmod; + + $lC_Language->loadIniFile('modules/statistics/margin_report_sales.php'); + + if ( !isset($lC_Currencies) ) { + if ( !class_exists('lC_Currencies') ) { + include($lC_Vqmod->modCheck('../includes/classes/currencies.php')); + } + + $lC_Currencies = new lC_Currencies(); + } + + $this->_setIcon(); + $this->_setTitle(); + } + + // Private methods + protected function _setIcon() { + $this->_icon = lc_icon_admin('reports.png'); + } + + protected function _setTitle() { + global $lC_Language; + + $this->_title = $lC_Language->get('statistics_margin_title'); + } + + protected function _setHeader() { + global $lC_Language; + + $this->_header = array($lC_Language->get('statistics_margin_table_heading_order_id'), + $lC_Language->get('statistics_margin_table_heading_item_sold'), + $lC_Language->get('statistics_margin_table_heading_sales_amount'), + $lC_Language->get('statistics_margin_table_heading_cost'), + $lC_Language->get('statistics_margin_table_heading_margin($)'), + $lC_Language->get('statistics_margin_table_heading_margin(%)')); + } + + protected function _setData() { + global $lC_Database, $lC_Language, $lC_Currencies; + + $this->_data = array(); + + $this->_resultset = $lC_Database->query('select + o.orders_id, op.products_quantity,p.products_price,p.products_cost, p.products_price-p.products_cost as margin,((p.products_price- + p.products_cost)/p.products_cost)*100 as margin_percent from + :table_orders o ,:table_products p, :table_orders_products op + where p.products_id = op.products_id and op.orders_id = o.orders_id '); + + if (isset($_GET['statusID'])) { + + switch($_GET['statusID']) { + + case 'Pending': + case 'Approved': + case 'Rejected': + $query = $lC_Database->query('select orders_status_id, orders_status_name from :table_orders_status where orders_status_type = "'.$_GET['statusID'].'"' ); + $query->bindTable(':table_orders_status', TABLE_ORDERS_STATUS); + $query->bindInt(':language_id', $lC_Language->getID()); + $query->execute(); + + $ids = ''; + while($query->next()) { + $ids .= $query->value('orders_status_id').","; + } + $ids = substr($ids, 0, -1); + + $this->_resultset->appendQuery(' and o.orders_status IN ( :orders_status )'); $this->_resultset->bindValue(':orders_status', $ids); + + break; + + default: + if((int)$_GET['statusID'] > 0) { + $this->_resultset->appendQuery(' and o.orders_status IN ( :orders_status )'); $this->_resultset->bindValue(':orders_status', $ids); + } + } + } + + if(isset($_GET['manufacturerID']) && (int)$_GET['manufacturerID'] > 0) { + $this->_resultset->appendQuery(' and p.manufacturers_id = :manufacturers_id '); + $this->_resultset->bindInt(':manufacturers_id', $_GET['manufacturerID']); + } + /*if(isset($_GET['supplierID']) && (int)$_GET['supplierID'] > 0) { + $this->_resultset->appendQuery(' and o.orders_status = :orders_status '); + $this->_resultset->bindInt(':orders_status', $_GET['statusID']); + }*/ + + + + $s_date_arr = explode('/', $_GET['startDate']); + $start = $s_date_arr['2']."-".$s_date_arr['0']."-".$s_date_arr['1']; + + $e_date_arr = explode('/', $_GET['expiresDate']); + $end = $e_date_arr['2']."-".$e_date_arr['0']."-".$e_date_arr['1']; +/* + + print("_GET "); + print_r($s_date_arr); + print(""); + print("s_date : ".$s_date.'
    '); + + + $s_date = str_replace('/', '-', $_GET['startDate']); + $start = date('Y-m-d', strtotime($s_date)); + + $e_date = str_replace('/', '-', $_GET['expiresDate']); + $end = date('Y-m-d', strtotime($e_date)); +*/ + if(isset($_GET['startDate']) && !empty($_GET['startDate']) ) { + $this->_resultset->appendQuery(' and o.date_purchased >= :start '); + $this->_resultset->bindvalue(':start', $start); + } + if(isset($_GET['expiresDate']) && !empty($_GET['expiresDate']) ) { + $this->_resultset->appendQuery(' and o.date_purchased <= :end'); + $this->_resultset->bindvalue(':end', $end); + } + $this->_resultset->appendQuery(' order by o.orders_id asc '); + + $this->_resultset->bindTable(':table_orders', TABLE_ORDERS); + $this->_resultset->bindTable(':table_products', TABLE_PRODUCTS); + $this->_resultset->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); + //$this->_resultset->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS); + $this->_resultset->execute(); + + + /*print(""); + print_r($this->_resultset); + print(""); + die('11111');*/ + + while ( $this->_resultset->next() ) { + $this->_data[] = + array($this->_resultset->value('orders_id'), + $this->_resultset->valueInt('products_quantity'), + $lC_Currencies->format($this->_resultset->value('products_price')), + $lC_Currencies->format($this->_resultset->value('products_cost')), + $lC_Currencies->format($this->_resultset->value('margin')), + $this->_resultset->valueInt('margin_percent')); + } + } +} +?> \ No newline at end of file diff --git a/catalog/admin/includes/modules/statistics/sales_report.php b/catalog/admin/includes/modules/statistics/sales_report.php new file mode 100644 index 000000000..8be2e12df --- /dev/null +++ b/catalog/admin/includes/modules/statistics/sales_report.php @@ -0,0 +1,201 @@ +modCheck('includes/classes/statistics.php')); + } + + class lC_Statistics_Sales_Report extends lC_Statistics { + + // Class constructor + public function lC_Statistics_Sales_Report() { + global $lC_Language, $lC_Currencies, $lC_Vqmod; + + $lC_Language->loadIniFile('modules/statistics/sales_report.php'); + + if (!isset($lC_Currencies)) { + if (!class_exists('lC_Currencies')) { + include($lC_Vqmod->modCheck('../includes/classes/currencies.php')); + } + + $lC_Currencies = new lC_Currencies(); + } + + $this->_setIcon(); + $this->_setTitle(); + } + + // Private methods + protected function _setIcon() { + $this->_icon = lc_icon_admin('reports.png'); + } + + protected function _setTitle() { + global $lC_Language; + + $this->_title = $lC_Language->get('statistics_sales_title'); + } + + protected function _setHeader() { + global $lC_Language; + + $this->_header = array($lC_Language->get('statistics_sales_table_heading_date'), + $lC_Language->get('statistics_sales_table_heading_orders'), + $lC_Language->get('statistics_sales_table_heading_items'), + $lC_Language->get('statistics_sales_table_heading_revenue'), + $lC_Language->get('statistics_sales_table_heading_shipping'), + $lC_Language->get('statistics_sales_table_heading_discount') + ); + } + + protected function _setData() { + global $lC_Database, $lC_Language, $lC_Currencies; + + $this->_data = array(); + + $orderDate_qry = $lC_Database->query('select o.date_purchased , count(*) as orderCount from :table_orders o where 1 '); + + + if (isset($_GET['statusID'])) { + + switch($_GET['statusID']) { + + case 'Pending': + case 'Approved': + case 'Rejected': + $query = $lC_Database->query('select orders_status_id, orders_status_name from :table_orders_status where orders_status_type = "'.$_GET['statusID'].'"' ); + $query->bindTable(':table_orders_status', TABLE_ORDERS_STATUS); + $query->bindInt(':language_id', $lC_Language->getID()); + $query->execute(); + + $ids = ''; + while($query->next()) { + $ids .= $query->value('orders_status_id').","; + } + $ids = substr($ids, 0, -1); + $orderDate_qry->appendQuery(' and o.orders_status IN ( :orders_status )'); + $orderDate_qry->bindValue(':orders_status', $ids); + + break; + + default: + if((int)$_GET['statusID'] > 0) { + $orderDate_qry->appendQuery(' and o.orders_status = :orders_status '); + $orderDate_qry->bindInt(':orders_status', $_GET['statusID']); + } + } + } + + $s_date_arr = explode('/', $_GET['startDate']); + $start = $s_date_arr['2']."-".$s_date_arr['0']."-".$s_date_arr['1']; + + $e_date_arr = explode('/', $_GET['expiresDate']); + $end = $e_date_arr['2']."-".$e_date_arr['0']."-".$e_date_arr['1']; + + if(isset($_GET['startDate']) && !empty($_GET['startDate']) ) { + $orderDate_qry->appendQuery(' and o.date_purchased >= :start '); + $orderDate_qry->bindvalue(':start', $start); + } + if(isset($_GET['expiresDate']) && !empty($_GET['expiresDate']) ) { + $orderDate_qry->appendQuery(' and o.date_purchased <= :end'); + $orderDate_qry->bindvalue(':end', $end); + } + + $orderDate_qry->appendQuery(' group by o.date_purchased '); + + $orderDate_qry->bindTable(':table_orders', TABLE_ORDERS); + $orderDate_qry->execute(); + + + while($orderDate_qry->next()) { + + $orderCount = 0; + $itemCount = 0; + $revenueTotal = 0; + $shippingTotal= 0; + $couponTotal = 0; + + $datePurchased = lC_DateTime::getShort($orderDate_qry->value('date_purchased')); + $orderCount = $orderDate_qry->value('orderCount'); + + $order_qry = $lC_Database->query('select orders_id from :table_orders where date_purchased = :date_purchased '); + + $order_qry->bindTable(':table_orders', TABLE_ORDERS); + $order_qry->bindValue(':date_purchased',$orderDate_qry->value('date_purchased')); + $order_qry->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS); + $order_qry->execute(); + + while($order_qry->next()) { + $tmp_arry = $this->_getOrdersProductsDetails_sales($order_qry->value('orders_id')); + foreach($tmp_arry as $k => $v) { + switch($k) { + case 'itemCount': + $itemCount += $v; + break; + case 'revenueTotal': + $revenueTotal += $v; + break; + case 'shippingTotal': + $shippingTotal += $v; + break; + case 'couponTotal': + $couponTotal += $v; + break; + } + } + } + $this->_data[] = array($datePurchased, + $orderCount, + $itemCount, + $lC_Currencies->format($revenueTotal), + $lC_Currencies->format($shippingTotal), + $lC_Currencies->format($couponTotal) + ); + } + } + + function _getOrdersProductsDetails_sales($orders_id) { + global $lC_Database; + + $orderProducts_qry = $lC_Database->query('select ((p.products_price-p.products_cost)* op.products_quantity) as revenue, op.products_quantity from :table_products p, :table_orders_products op where p.products_id = op.products_id and op.orders_id = :orders_id '); + $orderProducts_qry->bindTable(':table_products', TABLE_PRODUCTS); + $orderProducts_qry->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); + $orderProducts_qry->bindValue(':orders_id', $orders_id); + + while($orderProducts_qry->next()) { + $qty += $orderProducts_qry->value('products_quantity'); + $revenue += $orderProducts_qry->value('revenue'); + } + + $orderTotals_qry = $lC_Database->query('select title,text,value,class from :table_orders_total where orders_id = :orders_id and (class=:class or class=:class )'); + $orderTotals_qry->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + $orderTotals_qry->bindValue(':class', 'shipping'); + $orderTotals_qry->bindValue(':class', 'coupon'); + $orderTotals_qry->bindValue(':orders_id', $orders_id); + + while($orderTotals_qry->next()) { + if ($orderTotals_qry->value('class') == 'shipping') { + $shipping += $orderTotals_qry->value('value'); + } else if ($orderTotals_qry->value('class') == 'coupon' ) { + $coupon += $orderTotals_qry->value('value'); + } + } + + $return_arr = array('itemCount' => $qty, + 'revenueTotal' => $revenue, + 'shippingTotal' => $shipping, + 'couponTotal' => $coupon + ); + + return $return_arr; + } + } +?> \ No newline at end of file diff --git a/catalog/admin/includes/modules/statistics/sales_tax_report.php b/catalog/admin/includes/modules/statistics/sales_tax_report.php new file mode 100644 index 000000000..2ad5622d7 --- /dev/null +++ b/catalog/admin/includes/modules/statistics/sales_tax_report.php @@ -0,0 +1,144 @@ +modCheck('includes/classes/statistics.php')); +} + +class lC_Statistics_Sales_Tax_Report extends lC_Statistics { + + // Class constructor + public function lC_Statistics_Sales_Tax_Report() { + global $lC_Language, $lC_Currencies, $lC_Vqmod; + + $lC_Language->loadIniFile('modules/statistics/sales_tax_report.php'); + + if (!isset($lC_Currencies)) { + if (!class_exists('lC_Currencies')) { + include($lC_Vqmod->modCheck('../includes/classes/currencies.php')); + } + $lC_Currencies = new lC_Currencies(); + } + $this->_setIcon(); + $this->_setTitle(); + } + + // Private methods + protected function _setIcon() { + $this->_icon = lc_icon_admin('reports.png'); + } + + protected function _setTitle() { + global $lC_Language; + + $this->_title = $lC_Language->get('statistics_sales_tax_report_title'); + } + + protected function _setHeader() { + global $lC_Language; + + $this->_header = array($lC_Language->get('statistics_sales_tax_table_heading_month'), + $lC_Language->get('statistics_sales_tax_table_heading_day'), + $lC_Language->get('statistics_sales_tax_table_heading_gross_income'), + $lC_Language->get('statistics_sales_tax_table_heading_product_sales'), + $lC_Language->get('statistics_sales_tax_table_heading_non_taxed_sales'), + $lC_Language->get('statistics_sales_tax_table_heading_taxed_sales'), + $lC_Language->get('statistics_sales_tax_table_heading_taxes_collected'), + $lC_Language->get('statistics_sales_tax_table_heading_shipping_handling'), + $lC_Language->get('statistics_sales_tax_table_heading_tax_shipping'), + $lC_Language->get('statistics_sales_tax_table_heading_gift_vouchers') + ); + } + + protected function _setData() { + global $lC_Database, $lC_Language, $lC_Currencies; + $this->_data = array(); + $this->_resultset = $lC_Database->query('select o.orders_id, ot.value, op.products_price, op.products_price, MONTHNAME(o.date_purchased) as month from :table_orders o, :table_orders_products op, :table_orders_total ot where o.orders_id = op.orders_id and op.orders_id = ot.orders_id and ot.class = :class '); + + if (isset($_GET['statusID'])) { + + switch($_GET['statusID']) { + + case 'Pending': + case 'Approved': + case 'Rejected': + $query = $lC_Database->query('select orders_status_id, orders_status_name from :table_orders_status where orders_status_type = "'.$_GET['statusID'].'"' ); + $query->bindTable(':table_orders_status', TABLE_ORDERS_STATUS); + $query->bindInt(':language_id', $lC_Language->getID()); + $query->execute(); + + $ids = ''; + while($query->next()) { + $ids .= $query->value('orders_status_id').","; + } + $ids = substr($ids, 0, -1); + $this->_resultset->appendQuery(' and o.orders_status IN ( :orders_status )'); + $this->_resultset->bindValue(':orders_status', $ids); + + break; + + default: + if((int)$_GET['statusID'] > 0) { + $this->_resultset->appendQuery(' and o.orders_status = :orders_status '); + $this->_resultset->bindInt(':orders_status', $_GET['statusID']); + } + } + } + + $this->_resultset->appendQuery('order by o.date_purchased Desc'); + $this->_resultset->bindTable(':table_orders', TABLE_ORDERS); + $this->_resultset->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); + $this->_resultset->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + $this->_resultset->bindValue(':class', 'total'); + $this->_resultset->execute(); + + while($this->_resultset->next()) { + // get order tax,shipping and coupon + $orderTotal = $lC_Database->query('select o.orders_id ,ot.* from :table_orders o, :table_orders_total ot where ot.orders_id = o.orders_id and o.orders_id = :orders_id'); + $orderTotal->bindTable(':table_orders', TABLE_ORDERS); + $orderTotal->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + $orderTotal->bindInt(':orders_id', $this->_resultset->value('orders_id')); + $orderTotal->execute(); + + $tax = 0; + $shipping = 0; + $coupon = 0; + $taxed_sale = 0; + $non_taxed_sale = $this->_resultset->valueInt('products_price'); + + while($orderTotal->next()) { + if($orderTotal->value('class') == "tax") { + $taxed_sale = $this->_resultset->valueInt('products_price'); + $non_taxed_sale = 0; + $tax = $orderTotal->value('value'); + } elseif($orderTotal->value('class') == "shipping") { + $shipping = $orderTotal->value('value'); + } elseif($orderTotal->value('class') == "coupon") { + $coupon = $orderTotal->value('value'); + } + } + + $this->_data[] = array($this->_resultset->value('month'), + '-', + $lC_Currencies->format($this->_resultset->valueInt('value')), + $lC_Currencies->format($this->_resultset->valueInt('products_price')), + $lC_Currencies->format($non_taxed_sale), + $lC_Currencies->format($taxed_sale), + $lC_Currencies->format($tax), + $lC_Currencies->format($shipping), + $lC_Currencies->format($this->_resultset->valueInt('-')), + $lC_Currencies->format($coupon) + ); + } + } +} +?> \ No newline at end of file diff --git a/catalog/admin/templates/default/css/style.css b/catalog/admin/templates/default/css/style.css index b6a187e31..7af253f33 100644 --- a/catalog/admin/templates/default/css/style.css +++ b/catalog/admin/templates/default/css/style.css @@ -4764,5 +4764,35 @@ a:link { @media only screen and (max-width: 320px) { #main-title h1 { padding-top: 50px; - } - } + } +} + +/*inventory_cost_margin reports page*/ +.back-color { + background-color:#FFCC99; + height:30px; + padding-left:30px; + padding-top:18px; + padding-bottom:18px; +} +.padding-align { padding-right:10px; } +.glyphicon { + position: relative; + top: 1px; + display: inline-block; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} +.glyphicon-exclamation-sign:before { + content: "\e101"; +} +@font-face { + font-family: 'Glyphicons Halflings'; + src: url('../../../../ext/bootstrap/fonts/glyphicons-halflings-regular.eot'); + src: url('../../../../ext/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../../../ext/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../../../ext/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../../../ext/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg'); +} +/*inventory_cost_margin reports page*/ From 6676c80aa121f95d74d2b9a5984d1d44853bb042 Mon Sep 17 00:00:00 2001 From: datazen Date: Mon, 21 Jul 2014 15:27:21 -0400 Subject: [PATCH 085/168] merge work --- catalog/addons/Loaded_7_B2B/classes/order.php | 4 ++-- catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/catalog/addons/Loaded_7_B2B/classes/order.php b/catalog/addons/Loaded_7_B2B/classes/order.php index 5912cc42f..034533322 100644 --- a/catalog/addons/Loaded_7_B2B/classes/order.php +++ b/catalog/addons/Loaded_7_B2B/classes/order.php @@ -9,9 +9,9 @@ */ global $lC_Vqmod; -require_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'includes/classes/order.php')); +//require_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'includes/classes/order.php')); -class lC_Order_b2b extends lC_Order { +class lC_Order_b2b { /* * Insert the purchase order number * diff --git a/catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml b/catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml index f93b325cd..fd44d4450 100644 --- a/catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml +++ b/catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml @@ -7,7 +7,7 @@ - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2N/classes/order.php')); lC_Order_b2b::insertPONumber($order_id, $_POST['po_number']);}]]> + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/order.php')); lC_Order_b2b::insertPONumber($order_id, $_POST['po_number']);}]]> \ No newline at end of file From 423be44319512c9438853f21fff8ff975c299760 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Mon, 21 Jul 2014 15:59:13 -0400 Subject: [PATCH 086/168] formatted file syntax --- .../modules/statistics/sales_tax_report.php | 482 +++++++++--------- 1 file changed, 244 insertions(+), 238 deletions(-) diff --git a/catalog/admin/includes/modules/statistics/sales_tax_report.php b/catalog/admin/includes/modules/statistics/sales_tax_report.php index d72e678e4..f20e1e0f8 100644 --- a/catalog/admin/includes/modules/statistics/sales_tax_report.php +++ b/catalog/admin/includes/modules/statistics/sales_tax_report.php @@ -62,8 +62,9 @@ protected function _setHeader() { protected function _setData() { global $lC_Database, $lC_Language, $lC_Currencies; + $this->_data = array(); - $sel_month = isset($_GET['month']) ? $_GET['month']: '0'; + $sel_month = isset($_GET['month']) ? $_GET['month'] : '0'; // clear footer totals $footer_gross = 0; @@ -102,7 +103,7 @@ protected function _setData() { } /*******************************/ - $this->_resultset = $lC_Database->query('select sum(ot.value) as gross_sales, MONTHNAME(o.date_purchased) as row_month, YEAR(o.date_purchased) as row_year, MONTH(o.date_purchased) as i_month, DAYOFMONTH(o.date_purchased) row_day from :table_orders o left join :table_orders_total ot on (o.orders_id = ot.orders_id) where ot.class = :class'); + $this->_resultset = $lC_Database->query('select sum(ot.value) as gross_sales, MONTHNAME(o.date_purchased) as row_month, YEAR(o.date_purchased) as row_year, MONTH(o.date_purchased) as i_month, DAYOFMONTH(o.date_purchased) row_day from :table_orders o left join :table_orders_total ot on (o.orders_id = ot.orders_id) where ot.class = :class'); $orders_status_ids = ''; if (isset($_GET['statusID'])) { @@ -110,273 +111,278 @@ protected function _setData() { case 'Pending': case 'Approved': case 'Rejected': - $query = $lC_Database->query('select orders_status_id, orders_status_name from :table_orders_status where orders_status_type = "'.$_GET['statusID'].'"' ); + $query = $lC_Database->query('select orders_status_id, orders_status_name from :table_orders_status where orders_status_type = "' . $_GET['statusID'] . '"' ); $query->bindTable(':table_orders_status', TABLE_ORDERS_STATUS); $query->bindInt(':language_id', $lC_Language->getID()); $query->execute(); while($query->next()) { - $orders_status_ids .= $query->value('orders_status_id').","; + $orders_status_ids .= $query->value('orders_status_id') . ","; } $orders_status_ids = substr($orders_status_ids, 0, -1); - $this->_resultset->appendQuery(' and o.orders_status IN ('. $orders_status_ids .')'); + $this->_resultset->appendQuery(' and o.orders_status IN (' . $orders_status_ids . ')'); break; - default: - if((int)$_GET['statusID'] > 0) { - $orders_status_ids = $_GET['statusID']; - $this->_resultset->appendQuery(' and o.orders_status = :orders_status '); - $this->_resultset->bindInt(':orders_status', $_GET['statusID']); - } - } - } + default: + if ((int)$_GET['statusID'] > 0) { + $orders_status_ids = $_GET['statusID']; + $this->_resultset->appendQuery(' and o.orders_status = :orders_status '); + $this->_resultset->bindInt(':orders_status', $_GET['statusID']); + } + } + } + + if ($sel_month <> 0) { + $this->_resultset->appendQuery(' and month(o.date_purchased) = :month_purchased '); + $this->_resultset->bindInt(':month_purchased', $sel_month); + } - if ($sel_month <> 0) { - $this->_resultset->appendQuery(' and month(o.date_purchased) = :month_purchased '); - $this->_resultset->bindInt(':month_purchased', $sel_month); + $this->_resultset->appendQuery('group by YEAR(o.date_purchased), MONTH(o.date_purchased)'); + if ($sel_month <> 0) { + $this->_resultset->appendQuery(', DAYOFMONTH(o.date_purchased)'); + } + + $this->_resultset->appendQuery('order by o.date_purchased Desc'); + $this->_resultset->bindTable(':table_orders', TABLE_ORDERS); + $this->_resultset->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + $this->_resultset->bindValue(':class', $class_val_total); + $this->_resultset->execute(); + + $num_rows = $this->_resultset->numberOfRows(); + $srno = 0; + while ($this->_resultset->next()) { + $row_month = $this->_resultset->value('row_month'); + $month = $this->_resultset->value('i_month'); + $year = $this->_resultset->value('row_year'); + $day = $this->_resultset->value('row_day'); + $gross_sales = $this->_resultset->value('gross_sales'); + + if ($sel_month == 0) { + $content = $year; + $year_txt = $lC_Language->get('statistics_sales_tax_table_heading_year'); + } else { + $content = $day; + $head_year = $lC_Language->get('statistics_sales_tax_table_heading_year'); + $head_day = $lC_Language->get('statistics_sales_tax_table_heading_day'); + $this->_header = str_replace($head_year, $head_day, $this->_header ); + $year_txt = $row_month; } + + $rows++; + $srno++; - $this->_resultset->appendQuery('group by YEAR(o.date_purchased), MONTH(o.date_purchased)'); - if ($sel_month <> 0) { - $this->_resultset->appendQuery(', DAYOFMONTH(o.date_purchased)'); + if ($rows > 1 && $year <> $last_row_year) { + $this->_data[] = array('' . $srno . '', // SrNo + '' . $year_txt . '', // YEAR + '' . $last_row_year . '', // YEAR + '' . $lC_Currencies->format($footer_gross) . '', // GROSS INCOME + '' . $lC_Currencies->format($footer_sales) . '', // TOTAL OF PRODUCT PRICE + '' . $lC_Currencies->format($footer_sales_nontaxed) . '', // WITHOUT TAX PRODUCT PRICE + '' . $lC_Currencies->format($footer_sales_taxed) . '', // WITH TAX PRODUCT PRICE + '' . $lC_Currencies->format($footer_tax_coll) . '', // TAX ON PRODUCT + '' . $lC_Currencies->format($footer_shiphndl) . '', // SHIPPING VALUE + '' . $lC_Currencies->format($footer_shipping_tax) . '', // TAX ON SHIPPING + '' . $lC_Currencies->format($footer_other) . '' // COUPON + ); + // clear footer totals + $footer_gross = 0; + $footer_sales = 0; + $footer_sales_nontaxed = 0; + $footer_sales_taxed = 0; + $footer_tax_coll = 0; + $footer_shiphndl = 0; + $footer_shipping_tax = 0; + $footer_loworder = 0; + $footer_other = 0; + $srno++; } - $this->_resultset->appendQuery('order by o.date_purchased Desc'); - $this->_resultset->bindTable(':table_orders', TABLE_ORDERS); - $this->_resultset->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); - $this->_resultset->bindValue(':class', $class_val_total); - $this->_resultset->execute(); + // determine net sales for row + // Retrieve totals for products that are zero VAT rated + $net_sales_query_raw = $lC_Database->query('select sum(op.products_price * op.products_quantity) as net_sales from :table_orders o left join :table_orders_products op on (o.orders_id = op.orders_id) where op.products_tax = 0 and month(o.date_purchased) = :month_purchased and year(o.date_purchased) = :year_purchased'); + if ($orders_status_ids <> '') { + $net_sales_query_raw->appendQuery('and o.orders_status IN ('. $orders_status_ids . ')'); + } + if ($sel_month <> 0) { + $net_sales_query_raw->appendQuery('and dayofmonth(o.date_purchased) = :row_day'); + $net_sales_query_raw->bindInt(':row_day', $day); + } + $net_sales_query_raw->bindInt(':month_purchased', $month); + $net_sales_query_raw->bindInt(':year_purchased', $year); + $net_sales_query_raw->bindTable(':table_orders', TABLE_ORDERS); + $net_sales_query_raw->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); + $net_sales_query_raw->execute(); + $net_sales_this_row = 0; + if ($net_sales_query_raw->numberOfRows() > 0) { + $zero_rated_sales_this_row = $net_sales_query_raw->toArray(); + } - $num_rows = $this->_resultset->numberOfRows(); - $srno = 0; - while($this->_resultset->next()) { - $row_month = $this->_resultset->value('row_month'); - $month = $this->_resultset->value('i_month'); - $year = $this->_resultset->value('row_year'); - $day = $this->_resultset->value('row_day'); - $gross_sales = $this->_resultset->value('gross_sales'); + // Retrieve totals for products that are NOT zero VAT rated + $net_sales_query_raw1 = $lC_Database->query('select sum(op.products_price * op.products_quantity) as net_sales, sum(op.products_price * op.products_quantity * (1 + (op.products_tax / 100.0))) as gross_sales, sum((op.products_price * op.products_quantity * (1 + (op.products_tax / 100.0))) - (op.products_price * op.products_quantity)) as tax from :table_orders o left join :table_orders_products op on (o.orders_id = op.orders_id) where op.products_tax <> 0 and month(o.date_purchased) = :month_purchased and year(o.date_purchased) = :year_purchased '); + if ($orders_status_ids <> '') { + $net_sales_query_raw1->appendQuery('and o.orders_status IN (' . $orders_status_ids . ')'); + } + if ($sel_month <> 0) { + $net_sales_query_raw1->appendQuery('and dayofmonth(o.date_purchased) = :row_day'); + $net_sales_query_raw1->bindInt(':row_day', $day); + } + $net_sales_query_raw1->bindInt(':month_purchased', $month); + $net_sales_query_raw1->bindInt(':year_purchased', $year); + $net_sales_query_raw1->bindTable(':table_orders', TABLE_ORDERS); + $net_sales_query_raw1->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); + $net_sales_query_raw1->execute(); + $net_sales_this_row = 0; + if ($net_sales_query_raw1->numberOfRows() > 0) { + $net_sales_this_row = $net_sales_query_raw1->toArray(); + } - if ($sel_month==0){ - $content = $year; - $year_txt = $lC_Language->get('statistics_sales_tax_table_heading_year'); - } else { - $content = $day; - $head_year = $lC_Language->get('statistics_sales_tax_table_heading_year'); - $head_day = $lC_Language->get('statistics_sales_tax_table_heading_day'); - $this->_header = str_replace($head_year,$head_day,$this->_header ); - $year_txt = $row_month; - } - - $rows++; - $srno++; + // Total tax. This is needed so we can calculate any tax that has been added to the postage + $tax_coll_query_raw = $lC_Database->query('select sum(ot.value) as tax_coll from :table_orders o left join :table_orders_total ot on (o.orders_id = ot.orders_id) where ot.class=:class and month(o.date_purchased) = :month_purchased and year(o.date_purchased) = :year_purchased '); + if ($orders_status_ids <> '') { + $tax_coll_query_raw->appendQuery('and o.orders_status IN ('. $orders_status_ids .')'); + } + if ($sel_month <> 0) { + $tax_coll_query_raw->appendQuery('and dayofmonth(o.date_purchased) = :row_day'); + $tax_coll_query_raw->bindInt(':row_day', $day); + } + $tax_coll_query_raw->bindValue(':class', $class_val_tax); + $tax_coll_query_raw->bindInt(':month_purchased', $month); + $tax_coll_query_raw->bindInt(':year_purchased', $year); + $tax_coll_query_raw->bindTable(':table_orders', TABLE_ORDERS); + $tax_coll_query_raw->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + $tax_coll_query_raw->execute(); + $tax_this_row = 0; + if ($tax_coll_query_raw->numberOfRows() > 0) { + $tax_this_row = $tax_coll_query_raw->toArray(); + } - if ( $rows>1 && $year<>$last_row_year) { - $this->_data[] = array("".$srno."",//SrNo - "".$year_txt."",//YEAR - "".$last_row_year."",//YEAR - "".$lC_Currencies->format($footer_gross)."",//GROSS INCOME - "".$lC_Currencies->format($footer_sales)."",//TOTAL OF PRODUCT PRICE - "".$lC_Currencies->format($footer_sales_nontaxed)."",//WITHOUT TAX PRODUCT PRICE - "".$lC_Currencies->format($footer_sales_taxed)."",//WITH TAX PRODUCT PRICE - "".$lC_Currencies->format($footer_tax_coll)."",// TAX ON PRODUCT - "".$lC_Currencies->format($footer_shiphndl)."",//SHIPPING VALUE - "".$lC_Currencies->format($footer_shipping_tax)."",//TAX ON SHIPPING - "".$lC_Currencies->format($footer_other).""//COUPON - ); - // clear footer totals - $footer_gross = 0; - $footer_sales = 0; - $footer_sales_nontaxed = 0; - $footer_sales_taxed = 0; - $footer_tax_coll = 0; - $footer_shiphndl = 0; - $footer_shipping_tax = 0; - $footer_loworder = 0; - $footer_other = 0; - $srno++; - } - - // determine net sales for row - // Retrieve totals for products that are zero VAT rated - $net_sales_query_raw = $lC_Database->query('select sum(op.products_price * op.products_quantity) as net_sales from :table_orders o left join :table_orders_products op on (o.orders_id = op.orders_id) where op.products_tax = 0 and month(o.date_purchased) = :month_purchased and year(o.date_purchased) = :year_purchased'); + // shipping and handling charges for row + $shiphndl_query_raw = $lC_Database->query('select sum(ot.value) as shiphndl from :table_orders o left join :table_orders_total ot on (o.orders_id = ot.orders_id) where ot.class=:class and month(o.date_purchased) = :month_purchased and year(o.date_purchased) = :year_purchased '); + if ($orders_status_ids <> '') { + $shiphndl_query_raw->appendQuery('and o.orders_status IN ('. $orders_status_ids .')'); + } + if ($sel_month <> 0) { + $shiphndl_query_raw->appendQuery('and dayofmonth(o.date_purchased) = :row_day'); + $shiphndl_query_raw->bindInt(':row_day', $day); + } + $shiphndl_query_raw->bindValue(':class', $class_val_shiphndl); + $shiphndl_query_raw->bindInt(':month_purchased', $month); + $shiphndl_query_raw->bindInt(':year_purchased', $year); + $shiphndl_query_raw->bindTable(':table_orders', TABLE_ORDERS); + $shiphndl_query_raw->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + $shiphndl_query_raw->execute(); + $shiphndl_this_row = 0; + if ($shiphndl_query_raw->numberOfRows() > 0) { + $shiphndl_this_row = $shiphndl_query_raw->toArray(); + } + + // low order fees for row + // if ($loworder) { + if (1) { + $loworder_query_raw = $lC_Database->query('select sum(ot.value) as loworder from :table_orders o left join :table_orders_total ot on (o.orders_id = ot.orders_id) where ot.class=:class and month(o.date_purchased) = :month_purchased and year(o.date_purchased) = :year_purchased '); if ($orders_status_ids <> '') { - $net_sales_query_raw->appendQuery('and o.orders_status IN ('. $orders_status_ids .')'); + $loworder_query_raw->appendQuery('and o.orders_status IN (' . $orders_status_ids . ')'); } if ($sel_month<>0) { - $net_sales_query_raw->appendQuery('and dayofmonth(o.date_purchased) = :row_day'); $net_sales_query_raw->bindInt(':row_day',$day); + $loworder_query_raw->appendQuery('and dayofmonth(o.date_purchased) = :row_day'); + $loworder_query_raw->bindInt(':row_day', $day); } - $net_sales_query_raw->bindInt(':month_purchased', $month); - $net_sales_query_raw->bindInt(':year_purchased', $year); - $net_sales_query_raw->bindTable(':table_orders', TABLE_ORDERS); - $net_sales_query_raw->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); - $net_sales_query_raw->execute(); - $net_sales_this_row = 0; - if ($net_sales_query_raw->numberOfRows() > 0) { - $zero_rated_sales_this_row = $net_sales_query_raw->toArray(); - } - - // Retrieve totals for products that are NOT zero VAT rated - $net_sales_query_raw1 = $lC_Database->query('select sum(op.products_price * op.products_quantity) as net_sales, sum(op.products_price * op.products_quantity * (1 + (op.products_tax / 100.0))) as gross_sales, sum((op.products_price * op.products_quantity * (1 + (op.products_tax / 100.0))) - (op.products_price * op.products_quantity)) as tax from :table_orders o left join :table_orders_products op on (o.orders_id = op.orders_id) where op.products_tax <> 0 and month(o.date_purchased) = :month_purchased and year(o.date_purchased) = :year_purchased '); - if ($orders_status_ids <> '') { - $net_sales_query_raw1->appendQuery('and o.orders_status IN ('. $orders_status_ids .')'); - } - if ($sel_month<>0) { - $net_sales_query_raw1->appendQuery('and dayofmonth(o.date_purchased) = :row_day'); $net_sales_query_raw1->bindInt(':row_day',$day); - } - $net_sales_query_raw1->bindInt(':month_purchased', $month); - $net_sales_query_raw1->bindInt(':year_purchased', $year); - $net_sales_query_raw1->bindTable(':table_orders', TABLE_ORDERS); - $net_sales_query_raw1->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); - $net_sales_query_raw1->execute(); - $net_sales_this_row = 0; - if ($net_sales_query_raw1->numberOfRows() > 0) { - $net_sales_this_row = $net_sales_query_raw1->toArray(); + $loworder_query_raw->bindValue(':class', $class_val_loworder); + $loworder_query_raw->bindInt(':month_purchased', $month); + $loworder_query_raw->bindInt(':year_purchased', $year); + $loworder_query_raw->bindTable(':table_orders', TABLE_ORDERS); + $loworder_query_raw->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + $loworder_query_raw->execute(); + $loworder_this_row = 0; + if ($loworder_query_raw->numberOfRows() > 0) { + $loworder_this_row = $loworder_query_raw->toArray(); } + } - // Total tax. This is needed so we can calculate any tax that has been added to the postage - $tax_coll_query_raw = $lC_Database->query('select sum(ot.value) as tax_coll from :table_orders o left join :table_orders_total ot on (o.orders_id = ot.orders_id) where ot.class=:class and month(o.date_purchased) = :month_purchased and year(o.date_purchased) = :year_purchased '); - if ($orders_status_ids <> '') { - $tax_coll_query_raw->appendQuery('and o.orders_status IN ('. $orders_status_ids .')'); - } - if ($sel_month<>0) { - $tax_coll_query_raw->appendQuery('and dayofmonth(o.date_purchased) = :row_day'); $tax_coll_query_raw->bindInt(':row_day',$day); - } - $tax_coll_query_raw->bindValue(':class', $class_val_tax); - $tax_coll_query_raw->bindInt(':month_purchased', $month); - $tax_coll_query_raw->bindInt(':year_purchased', $year); - $tax_coll_query_raw->bindTable(':table_orders', TABLE_ORDERS); - $tax_coll_query_raw->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); - $tax_coll_query_raw->execute(); - $tax_this_row = 0; - if ($tax_coll_query_raw->numberOfRows() > 0) { - $tax_this_row = $tax_coll_query_raw->toArray(); - } - - // shipping and handling charges for row - $shiphndl_query_raw = $lC_Database->query('select sum(ot.value) as shiphndl from :table_orders o left join :table_orders_total ot on (o.orders_id = ot.orders_id) where ot.class=:class and month(o.date_purchased) = :month_purchased and year(o.date_purchased) = :year_purchased '); + // additional column if extra class value in orders_total table + if ($extra_class) { + $other_query_raw = $lC_Database->query('select sum(ot.value) as other from :table_orders o left join :table_orders_total ot on (o.orders_id = ot.orders_id) where ot.class<>:class and ot.class<>:class and ot.class<>:class and ot.class<>:class and ot.class<>:class and month(o.date_purchased) = :month_purchased and year(o.date_purchased) = :year_purchased '); if ($orders_status_ids <> '') { - $shiphndl_query_raw->appendQuery('and o.orders_status IN ('. $orders_status_ids .')'); - } - if ($sel_month<>0) { - $shiphndl_query_raw->appendQuery('and dayofmonth(o.date_purchased) = :row_day'); $shiphndl_query_raw->bindInt(':row_day',$day); - } - $shiphndl_query_raw->bindValue(':class', $class_val_shiphndl); - $shiphndl_query_raw->bindInt(':month_purchased', $month); - $shiphndl_query_raw->bindInt(':year_purchased', $year); - $shiphndl_query_raw->bindTable(':table_orders', TABLE_ORDERS); - $shiphndl_query_raw->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); - $shiphndl_query_raw->execute(); - $shiphndl_this_row = 0; - if ($shiphndl_query_raw->numberOfRows() > 0) { - $shiphndl_this_row = $shiphndl_query_raw->toArray(); + $other_query_raw->appendQuery('and o.orders_status IN ('. $orders_status_ids .')'); } - - // low order fees for row - //if ($loworder) { - if (1) { - $loworder_query_raw = $lC_Database->query('select sum(ot.value) as loworder from :table_orders o left join :table_orders_total ot on (o.orders_id = ot.orders_id) where ot.class=:class and month(o.date_purchased) = :month_purchased and year(o.date_purchased) = :year_purchased '); - if ($orders_status_ids <> '') { - $loworder_query_raw->appendQuery('and o.orders_status IN ('. $orders_status_ids .')'); - } - if ($sel_month<>0) { - $loworder_query_raw->appendQuery('and dayofmonth(o.date_purchased) = :row_day'); $loworder_query_raw->bindInt(':row_day',$day); - } - $loworder_query_raw->bindValue(':class', $class_val_loworder); - $loworder_query_raw->bindInt(':month_purchased', $month); - $loworder_query_raw->bindInt(':year_purchased', $year); - $loworder_query_raw->bindTable(':table_orders', TABLE_ORDERS); - $loworder_query_raw->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); - $loworder_query_raw->execute(); - $loworder_this_row = 0; - if ($loworder_query_raw->numberOfRows() > 0) { - $loworder_this_row = $loworder_query_raw->toArray(); - } + if ($sel_month<>0) { + $other_query_raw->appendQuery('and dayofmonth(o.date_purchased) = :row_day'); $other_query_raw->bindInt(':row_day',$day); } - - // additional column if extra class value in orders_total table - if ($extra_class) { - $other_query_raw = $lC_Database->query('select sum(ot.value) as other from :table_orders o left join :table_orders_total ot on (o.orders_id = ot.orders_id) where ot.class<>:class and ot.class<>:class and ot.class<>:class and ot.class<>:class and ot.class<>:class and month(o.date_purchased) = :month_purchased and year(o.date_purchased) = :year_purchased '); - if ($orders_status_ids <> '') { - $other_query_raw->appendQuery('and o.orders_status IN ('. $orders_status_ids .')'); - } - if ($sel_month<>0) { - $other_query_raw->appendQuery('and dayofmonth(o.date_purchased) = :row_day'); $other_query_raw->bindInt(':row_day',$day); - } - $other_query_raw->bindValue(':class', $class_val_subtotal); - $other_query_raw->bindValue(':class', $class_val_tax); - $other_query_raw->bindValue(':class', $class_val_shiphndl); - $other_query_raw->bindValue(':class', $class_val_loworder); - $other_query_raw->bindValue(':class', $class_val_total); - $other_query_raw->bindInt(':month_purchased', $month); - $other_query_raw->bindInt(':year_purchased', $year); - $other_query_raw->bindTable(':table_orders', TABLE_ORDERS); - $other_query_raw->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); - $other_query_raw->execute(); - $other_this_row = 0; - if ($other_query_raw->numberOfRows() > 0) { - $other_this_row = $other_query_raw->toArray(); - } + $other_query_raw->bindValue(':class', $class_val_subtotal); + $other_query_raw->bindValue(':class', $class_val_tax); + $other_query_raw->bindValue(':class', $class_val_shiphndl); + $other_query_raw->bindValue(':class', $class_val_loworder); + $other_query_raw->bindValue(':class', $class_val_total); + $other_query_raw->bindInt(':month_purchased', $month); + $other_query_raw->bindInt(':year_purchased', $year); + $other_query_raw->bindTable(':table_orders', TABLE_ORDERS); + $other_query_raw->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + $other_query_raw->execute(); + $other_this_row = 0; + if ($other_query_raw->numberOfRows() > 0) { + $other_this_row = $other_query_raw->toArray(); } + } - // Correct any rounding errors - $net_sales_this_row['net_sales'] = (floor(($net_sales_this_row['net_sales'] * 100) + 0.5)) / 100; - $net_sales_this_row['tax'] = (floor(($net_sales_this_row['tax'] * 100) + 0.5)) / 100; - $zero_rated_sales_this_row['net_sales'] = (floor(($zero_rated_sales_this_row['net_sales'] * 100) + 0.5)) / 100; - $tax_this_row['tax_coll'] = (floor(($tax_this_row['tax_coll'] * 100) + 0.5)) / 100; - $total_of_product_price = ($net_sales_this_row['net_sales'] + $zero_rated_sales_this_row['net_sales']); - $tax_on_shipping = ($tax_this_row['tax_coll'] - $net_sales_this_row['tax']); - - // accumulate row results in footer - $footer_gross += $gross_sales; // Gross Income - $footer_sales += $total_of_product_price; // Product Sales - $footer_sales_nontaxed += $zero_rated_sales_this_row['net_sales']; // Nontaxed Sales - $footer_sales_taxed += $net_sales_this_row['net_sales']; // Taxed Sales - $footer_tax_coll += $net_sales_this_row['tax']; // Taxes Collected - $footer_shiphndl += $shiphndl_this_row['shiphndl']; // Shipping & handling - $footer_shipping_tax += $tax_on_shipping; // Shipping Tax - $footer_loworder += $loworder_this_row['loworder']; - if ($extra_class) $footer_other += $other_this_row['other']; + // Correct any rounding errors + $net_sales_this_row['net_sales'] = (floor(($net_sales_this_row['net_sales'] * 100) + 0.5)) / 100; + $net_sales_this_row['tax'] = (floor(($net_sales_this_row['tax'] * 100) + 0.5)) / 100; + $zero_rated_sales_this_row['net_sales'] = (floor(($zero_rated_sales_this_row['net_sales'] * 100) + 0.5)) / 100; + $tax_this_row['tax_coll'] = (floor(($tax_this_row['tax_coll'] * 100) + 0.5)) / 100; + $total_of_product_price = ($net_sales_this_row['net_sales'] + $zero_rated_sales_this_row['net_sales']); + $tax_on_shipping = ($tax_this_row['tax_coll'] - $net_sales_this_row['tax']); - $this->_data[] = array($srno,//Serial No for proper Sorting - ''.$row_month.'',//Month - $content,//YEAR - $lC_Currencies->format($gross_sales),//GROSS INCOME - $lC_Currencies->format($total_of_product_price),//TOTAL OF PRODUCT PRICE - $lC_Currencies->format($zero_rated_sales_this_row['net_sales']),//WITHOUT TAX PRODUCT PRICE - $lC_Currencies->format($net_sales_this_row['net_sales']),//WITH TAX PRODUCT PRICE - $lC_Currencies->format($net_sales_this_row['tax']),// TAX ON PRODUCT - $lC_Currencies->format($shiphndl_this_row['shiphndl']),//SHIPPING VALUE - $lC_Currencies->format($tax_on_shipping),//TAX ON SHIPPING - $lC_Currencies->format($other_this_row['other'])//COUPON - ); + // accumulate row results in footer + $footer_gross += $gross_sales; // Gross Income + $footer_sales += $total_of_product_price; // Product Sales + $footer_sales_nontaxed += $zero_rated_sales_this_row['net_sales']; // Nontaxed Sales + $footer_sales_taxed += $net_sales_this_row['net_sales']; // Taxed Sales + $footer_tax_coll += $net_sales_this_row['tax']; // Taxes Collected + $footer_shiphndl += $shiphndl_this_row['shiphndl']; // Shipping & handling + $footer_shipping_tax += $tax_on_shipping; // Shipping Tax + $footer_loworder += $loworder_this_row['loworder']; + if ($extra_class) $footer_other += $other_this_row['other']; + + $this->_data[] = array($srno, // Serial No for proper Sorting + '' . $row_month . '', // Month + $content, // YEAR + $lC_Currencies->format($gross_sales), // GROSS INCOME + $lC_Currencies->format($total_of_product_price), // TOTAL OF PRODUCT PRICE + $lC_Currencies->format($zero_rated_sales_this_row['net_sales']), // WITHOUT TAX PRODUCT PRICE + $lC_Currencies->format($net_sales_this_row['net_sales']), // WITH TAX PRODUCT PRICE + $lC_Currencies->format($net_sales_this_row['tax']), // TAX ON PRODUCT + $lC_Currencies->format($shiphndl_this_row['shiphndl']), // SHIPPING VALUE + $lC_Currencies->format($tax_on_shipping), // TAX ON SHIPPING + $lC_Currencies->format($other_this_row['other']) // COUPON + ); - $last_row_year = $year; - if ($rows==$num_rows){ - $srno++; - $this->_data[] = array("".$srno."",//YEAR - "".$year_txt."",//YEAR - "".$last_row_year."",//YEAR - "".$lC_Currencies->format($footer_gross)."",//GROSS INCOME - "".$lC_Currencies->format($footer_sales)."",//TOTAL OF PRODUCT PRICE - "".$lC_Currencies->format($footer_sales_nontaxed)."",//WITHOUT TAX PRODUCT PRICE - "".$lC_Currencies->format($footer_sales_taxed)."",//WITH TAX PRODUCT PRICE - "".$lC_Currencies->format($footer_tax_coll)."",// TAX ON PRODUCT - "".$lC_Currencies->format($footer_shiphndl)."",//SHIPPING VALUE - "".$lC_Currencies->format($footer_shipping_tax)."",//TAX ON SHIPPING - "".$lC_Currencies->format($footer_other).""//COUPON - ); - // clear footer totals - $footer_gross = 0; - $footer_sales = 0; - $footer_sales_nontaxed = 0; - $footer_sales_taxed = 0; - $footer_tax_coll = 0; - $footer_shiphndl = 0; - $footer_shipping_tax = 0; - $footer_loworder = 0; - $footer_other = 0; - } + $last_row_year = $year; + if ($rows==$num_rows) { + $srno++; + $this->_data[] = array('' . $srno . '', // YEAR + '' . $year_txt . '', // YEAR + '' . $last_row_year . '', // YEAR + '' . $lC_Currencies->format($footer_gross) . '', // GROSS INCOME + '' . $lC_Currencies->format($footer_sales) . '', // TOTAL OF PRODUCT PRICE + '' . $lC_Currencies->format($footer_sales_nontaxed) . '', // WITHOUT TAX PRODUCT PRICE + '' . $lC_Currencies->format($footer_sales_taxed) . '', // WITH TAX PRODUCT PRICE + '' . $lC_Currencies->format($footer_tax_coll) . '', // TAX ON PRODUCT + '' . $lC_Currencies->format($footer_shiphndl) . '', // SHIPPING VALUE + '' . $lC_Currencies->format($footer_shipping_tax) . '', // TAX ON SHIPPING + '' . $lC_Currencies->format($footer_other) . '' // COUPON + ); + // clear footer totals + $footer_gross = 0; + $footer_sales = 0; + $footer_sales_nontaxed = 0; + $footer_sales_taxed = 0; + $footer_tax_coll = 0; + $footer_shiphndl = 0; + $footer_shipping_tax = 0; + $footer_loworder = 0; + $footer_other = 0; } + } } } ?> \ No newline at end of file From 5ec3dc08eb36451ab47410f79cba1a4c5663e030 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Mon, 21 Jul 2014 17:01:24 -0400 Subject: [PATCH 087/168] more cleanup --- .../applications/statistics/pages/main.php | 347 +++++++++--------- .../applications/statistics/statistics.php | 6 +- 2 files changed, 171 insertions(+), 182 deletions(-) diff --git a/catalog/admin/includes/applications/statistics/pages/main.php b/catalog/admin/includes/applications/statistics/pages/main.php index 11071b898..0460640fa 100644 --- a/catalog/admin/includes/applications/statistics/pages/main.php +++ b/catalog/admin/includes/applications/statistics/pages/main.php @@ -8,208 +8,201 @@ @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt @version $Id: main.php v1.0 2013-08-08 datazen $ */ - require_once($lC_Vqmod->modCheck('includes/applications/orders/classes/orders.php')); - require_once($lC_Vqmod->modCheck('includes/applications/manufacturers/classes/manufacturers.php')); +require_once($lC_Vqmod->modCheck('includes/applications/orders/classes/orders.php')); +require_once($lC_Vqmod->modCheck('includes/applications/manufacturers/classes/manufacturers.php')); - $note = '

    NOTE    '. - $lC_Language->get('text1').'' .lc_go_pro().$lC_Language->get('text2').''.lc_go_pro().$lC_Language->get('text3').'

    '; +$note = '
    + ' . $lC_Language->get('text_note') . '' . + $lC_Language->get('text1') . + '' . + lc_go_pro() . $lC_Language->get('text2') . + '' . + lc_go_pro() . $lC_Language->get('text3') . + '
    '; - $breakout = ' - ' . $lC_Language->get("text_breakout_by") . ' - - - - - - '; +$breakout = ' + ' . $lC_Language->get("text_breakout_by") . ' + + + + + + '; - function get_dropdown_list_array($type) { - global $lC_Language; +function get_dropdown_list_array($type) { + global $lC_Language; - $list_arr = array(); + $list_arr = array(); - switch($type) { - case 'manufacturer': - $list_str = $lC_Language->get('text_select_manufacturers'); - $list_arr = lC_Manufacturers_Admin::getManufacturersArray(); - break; - case 'supplier': - $list_str = $lC_Language->get('text_select_supplier'); - //$list_arr = lC_Orders_Admin::getOrderStatusArray(); - break; - case 'order_status': - //$list_str = $lC_Language->get('text_statuses'); - $list_arr = lC_Orders_Admin::getOrderStatusArray(); - break; - } + switch($type) { + case 'manufacturer': + $list_str = $lC_Language->get('text_select_manufacturers'); + $list_arr = lC_Manufacturers_Admin::getManufacturersArray(); + break; + case 'supplier': + $list_str = $lC_Language->get('text_select_supplier'); + // $list_arr = lC_Orders_Admin::getOrderStatusArray(); + break; + case 'order_status': + // $list_str = $lC_Language->get('text_statuses'); + $list_arr = lC_Orders_Admin::getOrderStatusArray(); + break; + } - $i = 0; - if($list_str != '') { - $i = 1; - $return_arr[0] = array('id' => '', + $i = 0; + if ($list_str != '') { + $i = 1; + $return_arr[0] = array('id' => '', 'text' => $list_str ); - } + } - if(is_array($list_arr) && count($list_arr) > 0) { - foreach($list_arr as $k => $arr) { - $return_arr[$k+$i] = $arr; - } + if (is_array($list_arr) && count($list_arr) > 0) { + foreach($list_arr as $k => $arr) { + $return_arr[$k+$i] = $arr; } - return $return_arr; } - - /* $arr_time_span = array( - array('id' => 'daily', - 'text' => $lC_Language->get('text_daily')), - array('id' => 'monthly', - 'text' => $lC_Language->get('text_monthly')), - array('id' => 'quaterly', - 'text' => $lC_Language->get('text_quarterly')), - array('id' => 'annually', - 'text' => $lC_Language->get('text_annually')) - );*/ - $arr_summary = array( - array('id' => 'summary', + return $return_arr; +} + + /* $arr_time_span = array( + array('id' => 'daily', + 'text' => $lC_Language->get('text_daily')), + array('id' => 'monthly', + 'text' => $lC_Language->get('text_monthly')), + array('id' => 'quaterly', + 'text' => $lC_Language->get('text_quarterly')), + array('id' => 'annually', + 'text' => $lC_Language->get('text_annually')) + );*/ + $arr_summary = array(array('id' => 'summary', 'text' => $lC_Language->get('text_summary')), array('id' => 'detailed', 'text' => $lC_Language->get('text_detailed')), array('id' => 'detailed_amounts', 'text' => $lC_Language->get('text_detailed_amounts')) ); - - - $manufacturer_arr = get_dropdown_list_array('manufacturer'); - $supplier_arr = get_dropdown_list_array('supplier'); - $order_status_arr = get_dropdown_list_array('order_status'); - - $manufacturer_dropdown = lc_draw_pull_down_menu('manufacturer', $manufacturer_arr, null, 'class="input with-small-padding small-margin-bottom"') . ' '; - $supplier_dropdown = lc_draw_pull_down_menu('supplier', $supplier_arr, null, 'class="input with-small-padding small-margin-bottom"') . ' '; - $order_status_dropdown = lc_draw_pull_down_menu('order_status', $order_status_arr, null, 'class="input with-small-padding small-margin-bottom"') . ' '; - //$time_span_dropdown = lc_draw_pull_down_menu('time_span', $arr_time_span, null, 'class="green-gradient select expandable-list small-margin-bottom"') . ' '; - $summary_dropdown = lc_draw_pull_down_menu('summary', $arr_summary, null, 'class="green-gradient select expandable-list"') . ' '; - - $start_date_input = ' + + $manufacturer_arr = get_dropdown_list_array('manufacturer'); + $supplier_arr = get_dropdown_list_array('supplier'); + $order_status_arr = get_dropdown_list_array('order_status'); + + $manufacturer_dropdown = lc_draw_pull_down_menu('manufacturer', $manufacturer_arr, null, 'class="input with-small-padding small-margin-bottom"') . ' '; + $supplier_dropdown = lc_draw_pull_down_menu('supplier', $supplier_arr, null, 'class="input with-small-padding small-margin-bottom"') . ' '; + $order_status_dropdown = lc_draw_pull_down_menu('order_status', $order_status_arr, null, 'class="input with-small-padding small-margin-bottom"') . ' '; + $summary_dropdown = lc_draw_pull_down_menu('summary', $arr_summary, null, 'class="green-gradient select expandable-list"') . ' '; + // $time_span_dropdown = lc_draw_pull_down_menu('time_span', $arr_time_span, null, 'class="green-gradient select expandable-list small-margin-bottom"') . ' '; + + $start_date_input = ' + + + '; + $expires_date_input = ' - - '; - $expires_date_input = ' - - - '; + + '; - $go_date = ''; + $go_date = ''; - switch($_GET['module']) { - case 'orders': - // added for mobile css per report - $dataTableTopMargin320 = '-30px'; - $dataTableTopMargin480 = '-30px'; - break; + switch($_GET['module']) { + case 'orders': + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + + case 'products_purchased': + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + + case 'products_viewed': + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; - case 'products_purchased': - // added for mobile css per report - $dataTableTopMargin320 = '-30px'; - $dataTableTopMargin480 = '-30px'; - break; + case 'customer_orders': + $list_criteria .= $order_status_dropdown; + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; - case 'products_viewed': - // added for mobile css per report - $dataTableTopMargin320 = '-30px'; - $dataTableTopMargin480 = '-30px'; - break; - - case 'customer_orders': - $list_criteria .= $order_status_dropdown; - // added for mobile css per report - $dataTableTopMargin320 = '-30px'; - $dataTableTopMargin480 = '-30px'; - break; - - case 'inventory_cost_margin': - $list_criteria .= $note; - $list_criteria .= $breakout; - // added for mobile css per report - $dataTableTopMargin320 = '-30px'; - $dataTableTopMargin480 = '-30px'; - break; - - case 'low_stock_report': - // added for mobile css per report - $dataTableTopMargin320 = '-30px'; - $dataTableTopMargin480 = '-30px'; - break; - - case 'margin_report_sales': - $list_criteria .= $note; - $list_criteria .= $manufacturer_dropdown; - $list_criteria .= $supplier_dropdown; - $list_criteria .= $order_status_dropdown; - $list_criteria .= $time_span_dropdown; - $list_criteria .= $start_date_input; - $list_criteria .= $expires_date_input; - $list_criteria .= $go_date; - // added for mobile css per report - $dataTableTopMargin320 = '0px'; - $dataTableTopMargin480 = '0px'; - break; - - case 'sales_report': - $list_criteria .= $order_status_dropdown; - $list_criteria .= $time_span_dropdown; - $list_criteria .= $summary_dropdown; - $list_criteria .= $start_date_input; - $list_criteria .= $expires_date_input; - $list_criteria .= $go_date; - // added for mobile css per report - $dataTableTopMargin320 = '0px'; - $dataTableTopMargin480 = '0px'; - break; - - case 'sales_tax_report': - $list_criteria .= $order_status_dropdown; - $list_criteria .= $time_span_dropdown; - // added for mobile css per report - $dataTableTopMargin320 = '-30px'; - $dataTableTopMargin480 = '-30px'; - break; - } - - + case 'inventory_cost_margin': + $list_criteria .= $note; + $list_criteria .= $breakout; + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + + case 'low_stock_report': + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + + case 'margin_report_sales': + $list_criteria .= $note; + $list_criteria .= $manufacturer_dropdown; + $list_criteria .= $supplier_dropdown; + $list_criteria .= $order_status_dropdown; + $list_criteria .= $time_span_dropdown; + $list_criteria .= $start_date_input; + $list_criteria .= $expires_date_input; + $list_criteria .= $go_date; + // added for mobile css per report + $dataTableTopMargin320 = '0px'; + $dataTableTopMargin480 = '0px'; + break; + + case 'sales_report': + $list_criteria .= $order_status_dropdown; + $list_criteria .= $time_span_dropdown; + $list_criteria .= $summary_dropdown; + $list_criteria .= $start_date_input; + $list_criteria .= $expires_date_input; + $list_criteria .= $go_date; + // added for mobile css per report + $dataTableTopMargin320 = '0px'; + $dataTableTopMargin480 = '0px'; + break; + + case 'sales_tax_report': + $list_criteria .= $order_status_dropdown; + $list_criteria .= $time_span_dropdown; + // added for mobile css per report + $dataTableTopMargin320 = '-30px'; + $dataTableTopMargin480 = '-30px'; + break; + } ?>
    -

    - getPageTitle(); - } else { - echo $lC_Statistics->_title; - } - ?> -

    +

    getPageTitle(); } else { echo $lC_Statistics->_title; } ?>

    - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php deleted file mode 100644 index f21e0eb49..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php +++ /dev/null @@ -1,219 +0,0 @@ - - - -
    - -
    -

    getPageTitle(); ?>

    -
    -
    - - -
    - - - -
    -
    - -
    - get('heading_guest_access'); ?> -
    -
    -

    - - - get('B2B_SETTINGS_ALLOW_SELF_REGISTER') == '1') ? 'checked="checked" ' : ''); - echo lc_draw_checkbox_field('allow_self_register',null, null, $checked . 'class="switch medium" data-text-on="' . strtoupper($lC_Language->get('button_yes')) . '" data-text-off="' . strtoupper($lC_Language->get('button_no')) . '"'); ?>get('info_bubble_displays_create_account_form'); ?> -

    - -

    - get('label_guest_catalog_access'); ?> - get('info_bubble_guest_catalog_access')); ?> - -

    - -
    -
    -
    - -
    -
    - get('heading_access_group_levels'); ?> - - - - - - - - - - - - - - - - - - -
    get('table_heading_id'); ?>get('table_heading_group'); ?>get('table_heading_members'); ?>get('table_heading_status'); ?>get('table_heading_action'); ?>
    -

    - - - get('button_create_new'); ?> -

    -
    - -
    -
    -
    - - - -
    -
    - -
    -
    -
    -
    -
    -

    - getModule()] < 3) ? '' : ' onclick="validateForm(\'#b2b_settings\');"'); - $close = lc_href_link_admin(FILENAME_DEFAULT, $lC_Template->getModule()); - button_save_close($save, false, $close); - ?> -

    -
    -
    -
    -
    - - - -
    -
    -loadModal($lC_Template->getModule()); ?> - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php b/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php deleted file mode 100644 index f9f64bd50..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php +++ /dev/null @@ -1,191 +0,0 @@ -modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php')); -include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/classes/category_tree.php')); - -class lC_Categories_b2b_Admin extends lC_Categories_pro_Admin { - /* - * Save the category record - * - * @param integer $id The category id on update, null on insert - * @param array $data The category information - * @access public - * @return boolean - */ - public static function save($id = null, $data) { - global $lC_Database, $lC_Language, $lC_CategoryTree; - - $category_id = lC_Categories_pro_Admin::save($id, $data); - - $error = false; - - $lC_Database->startTransaction(); - - $levels = ''; - if (is_array($data['access_levels'])) { - foreach ($data['access_levels'] as $key => $val) { - $levels .= $key . ';'; - } - $levels = substr($levels, 0, -1); - } - - $Qcat = $lC_Database->query('update :table_categories set `access_levels` = :access_levels where `categories_id` = :categories_id'); - $Qcat->bindTable(':table_categories', TABLE_CATEGORIES); - $Qcat->bindInt(':categories_id', $category_id); - $Qcat->bindValue(':access_levels', $levels); - $Qcat->setLogging($_SESSION['module'], $category_id); - $Qcat->execute(); - - if ( !$lC_Database->isError()) { - $syncAllProducts = (isset($data['sync_all_products']) && $data['sync_all_products'] == 'on') ? true: false; - $syncAllChildren = (isset($data['sync_all_children']) && $data['sync_all_children'] == 'on') ? true: false; - - if ($syncAllProducts || $syncAllChildren) { - $lC_CategoryTree = new lC_CategoryTree_Admin(); - $catArr = $lC_CategoryTree->getArray($category_id); - - foreach ($catArr as $value) { - $catID = end(explode('_', $value['id'])); - if ($syncAllChildren) self::_updateCategoryAccessLevels($catID, $levels); - if ($syncAllProducts) self::_updateProductAccessLevels($catID, $levels); - } - } - } - - if ( !$lC_Database->isError() ) { - $lC_Database->commitTransaction(); - lC_Cache::clear('categories'); - - return $category_id; // used for the save_close buttons - } - - $lC_Database->rollbackTransaction(); - - return false; - } - /* - * Update the product access levels - * - * @param integer $category_id The parent category id - * @param string $levels The access levels - * @access public - * @return boolean - */ - protected static function _updateProductAccessLevels($category_id, $levels) { - global $lC_Database; - - // get all product_id's assigned to $category_id - $Qp2c = $lC_Database->query('select products_id from :table_products_to_categories where `categories_id` = :categories_id'); - $Qp2c->bindTable(':table_products_to_categories', TABLE_PRODUCTS_TO_CATEGORIES); - $Qp2c->bindInt(':categories_id', $category_id); - $Qp2c->setLogging($_SESSION['module'], $category_id); - $Qp2c->execute(); - - $lC_Database->startTransaction(); - - if ( !$lC_Database->isError()) { - while($Qp2c->next()) { - $Qproducts = $lC_Database->query('update :table_products set `access_levels` = :access_levels where `products_id` = :products_id'); - $Qproducts->bindTable(':table_products', TABLE_PRODUCTS); - $Qproducts->bindInt(':products_id', $Qp2c->valueInt('products_id')); - $Qproducts->bindvalue(':access_levels', $levels); - $Qproducts->setLogging($_SESSION['module'], $category_id); - $Qproducts->execute(); - } - } - - $Qp2c->freeResult(); - - if ( !$lC_Database->isError() ) { - $lC_Database->commitTransaction(); - return true; - } - - $lC_Database->rollbackTransaction(); - - return false; - } - /* - * Update the category access levels - * - * @param integer $category_id The parent category id - * @param string $levels The access levels - * @access public - * @return boolean - */ - protected static function _updateCategoryAccessLevels($category_id, $levels) { - global $lC_Database; - - $lC_Database->startTransaction(); - - $Qcat = $lC_Database->query('update :table_categories set `access_levels` = :access_levels where `categories_id` = :categories_id'); - $Qcat->bindTable(':table_categories', TABLE_CATEGORIES); - $Qcat->bindInt(':categories_id', $category_id); - $Qcat->bindValue(':access_levels', $levels); - $Qcat->setLogging($_SESSION['module'], $category_id); - $Qcat->execute(); - - if ( !$lC_Database->isError() ) { - $lC_Database->commitTransaction(); - return true; - } - - $lC_Database->rollbackTransaction(); - - return false; - } - /* - * Batch update the category access levels - * - * @param integer $category_id The parent category id - * @param string $levels The access levels - * @access public - * @return boolean - */ - public static function batchEditAccess($data) { - global $lC_Database, $lC_CategoryTree; - - $levels = ''; - if (is_array($data['access_levels'])) { - foreach ($data['access_levels'] as $key => $val) { - $levels .= $key . ';'; - } - $levels = substr($levels, 0, -1); - } - - $syncAllProducts = (isset($data['sync_all_products']) && $data['sync_all_products'] == 'on') ? true: false; - $syncAllChildren = (isset($data['sync_all_children']) && $data['sync_all_children'] == 'on') ? true: false; - - foreach ( $data['batch'] as $category_id ) { - - self::_updateCategoryAccessLevels($category_id, $levels); - - if ($syncAllProducts || $syncAllChildren) { - // get the children categories - $lC_CategoryTree = new lC_CategoryTree_Admin(); - $catArr = $lC_CategoryTree->getArray($category_id); - - foreach ($catArr as $value) { - $catID = end(explode('_', $value['id'])); - if ($syncAllChildren) self::_updateCategoryAccessLevels($catID, $levels); - if ($syncAllProducts) self::_updateProductAccessLevels($catID, $levels); - } - } - } - - return true; - } -} \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/rpc.php b/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/rpc.php deleted file mode 100644 index 6a42ef319..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/rpc.php +++ /dev/null @@ -1,33 +0,0 @@ - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/categories/modal/batchAccess.php b/catalog/addons/Loaded_7_B2B/admin/applications/categories/modal/batchAccess.php deleted file mode 100644 index 419376b40..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/categories/modal/batchAccess.php +++ /dev/null @@ -1,88 +0,0 @@ -modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); - -global $lC_Language, $lC_Template; -?> - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php b/catalog/addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php deleted file mode 100644 index 9cc03977c..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php +++ /dev/null @@ -1,220 +0,0 @@ -modCheck(DIR_FS_ADMIN . 'includes/applications/customer_groups/classes/customer_groups.php')); - -class lC_Customer_groups_b2b_Admin extends lC_Customer_groups_Admin { - - /* - * Return the data used on the dialog forms - * - * @param integer $id The customer groups id - * @param boolean $edit True = called from edit dialog else called from delete dialog - * @access public - * @return array - */ - public static function getFormData($id = null, $edit = false) { - global $lC_Database, $lC_Language, $lC_Addons; - - $result = parent::getFormData($id, $edit); - - // get the access levels - $Qlevels = $lC_Database->query('select * from :table_customers_access where status = :status'); - $Qlevels->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); - $Qlevels->bindInt(':status', 1); - $Qlevels->execute(); - - $accessHtml = ''; - $levels = array(); - if (is_array($result['cgData'])) { - $levels = explode(';', $result['cgData']['customers_access_levels']); - } - - while ($Qlevels->next()) { - $checked = ( (in_array($Qlevels->valueInt('id'), $levels)) ? ' checked="checked" ' : '' ); - $accessHtml .= '
    '; - } - - $Qlevels->freeResult(); - - // get the payment/shipping addons for the group - $paymentHtml = ''; - $shippingHtml = ''; - foreach($lC_Addons->getAddons('enabled') as $name => $data) { - if ($data['type'] == 'payment' || $data['type'] == 'paypal') { - $checked = (strstr($result['cgData']['payment_modules'], $name)) ? ' checked="checked" ' : ''; - $paymentHtml .= '
    '; - } else if ($data['type'] == 'shipping') { - $checked = (strstr($result['cgData']['shipping_modules'], $name)) ? ' checked="checked" ' : ''; - $shippingHtml .= '
    '; - } - } - $taxStatus = (isset($result['cgData']['taxable']) && $result['cgData']['taxable'] == 1) ? ' checked="checked" ' : ''; - $hpnChecked = (isset($result['cgData']['hidden_products_notification']) && $result['cgData']['hidden_products_notification'] == 1) ? ' checked="checked" ' : ''; - if ($hpnChecked == '' && !isset($_GET['cgid'])) $hpnChecked = ' checked="checked" '; - - $result['extraFormHtml'] = '
    ' . - ' ' . $lC_Language->get('legend_checkout_options') . '' . - '
    ' . - '
    ' . - '
    ' . $lC_Language->get('heading_payment_methods_available') . lc_show_info_bubble($lC_Language->get('info_bubble_payment_methods_available'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . - '

    ' . $paymentHtml . '

    ' . - '
    ' . - '
    ' . - '
    ' . $lC_Language->get('heading_shipping_methods_available') . lc_show_info_bubble($lC_Language->get('info_bubble_shipping_methods_available'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . - '

    ' . $shippingHtml . '

    ' . - '
    ' . $lC_Language->get('heading_taxable_status') . lc_show_info_bubble($lC_Language->get('info_bubble_taxable_status'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . - '

    ' . - '
    ' . - '
    ' . - '
    ' . - '
    ' . - ' ' . $lC_Language->get('legend_catalog_visibility') . '' . - '
    ' . - '
    ' . - '
    ' . $lC_Language->get('heading_access_group_visibility') . lc_show_info_bubble($lC_Language->get('info_bubble_access_group_visibility'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . - '

    ' . $accessHtml . '

    ' . - '
    ' . - '
    ' . - '
    ' . $lC_Language->get('heading_hidden_product_notification') . lc_show_info_bubble($lC_Language->get('info_bubble_hidden_product_notification'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . - '
    ' . - ' ' . - '
    ' . - '

    ' . $lC_Language->get('text_hidden_product_notification_info') . '

    ' . - '
    ' . - '
    ' . - '
    '; - - return $result; - } - - public static function getCustomerAccessLevelsHtml($section = 'customer_groups') { - global $lC_Database, $lC_Language, $pInfo, $cInfo; - - $lC_Language->loadIniFile('customer_groups.php'); - - $levels = array(); - if (isset($pInfo)) { - $levels = explode(';', $pInfo->get('access_levels')); - } else if (isset($cInfo)) { - $levels = explode(';', $cInfo['access_levels']); - } - - // get the access levels - $Qlevels = $lC_Database->query('select * from :table_customers_access where status = :status'); - $Qlevels->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); - $Qlevels->bindInt(':status', 1); - $Qlevels->execute(); - - $accessHtml = '
    '; - - while ($Qlevels->next()) { - $checked = ( (in_array($Qlevels->valueInt('id'), $levels)) ? ' checked="checked" ' : '' ); - $accessHtml .= '
    '; - } - - $Qlevels->freeResult(); - - if ($section == 'categories') { - $accessHtml .= self::_getSyncHtml(); - } - - return $accessHtml; - } - - protected static function _getSyncHtml() { - global $lC_Language; - - $lC_Language->loadIniFile('categories.php'); - - $html = '' . - '
    ' . - ' ' . - ' ' . lc_show_info_bubble($lC_Language->get('info_bubble_sync_products'), null, 'info-spot on-left grey margin-left margin-right') . - '
    ' . - '
    ' . - ' ' . - ' ' . lc_show_info_bubble($lC_Language->get('info_bubble_sync_children'), null, 'info-spot on-left grey margin-left margin-right') . - '
    '; - - return $html; - } - /* - * Save the customer group information - * - * @param integer $id The customer group id used on update, null on insert - * @param array $data An array containing the customer group information - * @param boolean $default True = set the customer group to be the default - * @access public - * @return boolean - */ - public static function save($id = null, $data, $default = false) { - global $lC_Database, $lC_Language; - - $customers_group_id = parent::save($id, $data, $default); - - $error = false; - - $lC_Database->startTransaction(); - - $Qdel = $lC_Database->query('delete from :table_customers_groups_data where customers_group_id = :customers_group_id'); - $Qdel->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); - $Qdel->bindInt(':customers_group_id', $customers_group_id); - $Qdel->execute(); - - $Qgdata = $lC_Database->query('insert into :table_customers_groups_data (customers_group_id, baseline_discount, customers_access_levels, hidden_products_notification, taxable, payment_modules, shipping_modules) values (:customers_group_id, :baseline_discount, :customers_access_levels, :hidden_products_notification, :taxable, :payment_modules, :shipping_modules)'); - $Qgdata->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); - $Qgdata->bindInt(':customers_group_id', $customers_group_id); - $Qgdata->bindFloat(':baseline_discount', $data['baseline']); - $Qgdata->bindValue(':customers_access_levels', self::_arr2str($data['level'])); - $Qgdata->bindInt(':hidden_products_notification', (($data['hidden_products_notification'] == 'on') ? true : false)); - $Qgdata->bindInt(':taxable', $data['taxable']); - $Qgdata->bindValue(':payment_modules', self::_arr2str($data['payment'])); - $Qgdata->bindValue(':shipping_modules', self::_arr2str($data['shipping'])); - $Qgdata->setLogging($_SESSION['module'], $customers_group_id); - $Qgdata->execute(); - - if ( $lC_Database->isError() ) { - $error = true; - } - - if ( $error === false ) { - $lC_Database->commitTransaction(); - - return $customers_group_id; - } - - $lC_Database->rollbackTransaction(); - - return false; - } - /* - * format the array to semi-colo separated string - * - * @param array $arr The array to format - * @access private - * @return string - */ - private static function _arr2str($arr) { - if (!is_array($arr)) return false; - $str = ''; - foreach ($arr as $key => $val) { - $str .= $key . ';'; - } - $str = substr($str, 0, -1); - - return $str; - } -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php b/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php deleted file mode 100644 index 89d010a8d..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php +++ /dev/null @@ -1,431 +0,0 @@ -modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/applications/products/classes/products.php')); -include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/applications/products/classes/products.php')); -include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/applications/customer_groups/classes/customer_groups.php')); - -class lC_Products_b2b_Admin extends lC_Products_pro_Admin { - /* - * Save the product - * - * @param integer $id The products id to update, null on insert - * @param array $data The products information - * @access public - * @return boolean - */ - public static function save($id = null, $data) { - global $lC_Database, $lC_Language; - - $products_id = lC_Products_pro_Admin::save($id, $data); - - $error = false; - - $lC_Database->startTransaction(); - - // remove all old pricing records - $Qpricing = $lC_Database->query('delete from :table_products_pricing where products_id = :products_id or parent_id = :products_id'); - $Qpricing->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpricing->bindInt(':products_id', $products_id); - $Qpricing->bindInt(':products_id', $products_id); - $Qpricing->setLogging($_SESSION['module'], $products_id); - $Qpricing->execute(); - - $qpb_pricing_enabled = (isset($data['qpb_pricing_switch']) && $data['qpb_pricing_switch'] == 1) ? true : false; - $groups_pricing_enabled = (isset($data['groups_pricing_switch']) && $data['groups_pricing_switch'] == 1) ? true : false; - $specials_pricing_enabled = (isset($data['specials_pricing_switch']) && $data['specials_pricing_switch'] == 1) ? true : false; - - if ( $lC_Database->isError() ) { - $error = true; - } else { - // add qty price breaks - if (is_array($data['products_qty_break_point']) && !empty($data['products_qty_break_point'])) { - if ($products_id != null) { - - // add the new records - foreach($data['products_qty_break_point'] as $group => $values) { - if (is_array($data['products_qty_break_point'][$group]) && $data['products_qty_break_point'][$group][1] != null) { - foreach($values as $key => $val) { - - if ($val == -1) continue; - if ($data['products_qty_break_point'][$group][$key] == null) continue; - if ((int)$data['products_qty_break_point'][$group][$key] == 1) continue; // do not save qty 1, base price is same - - $price = (is_array($data['options_pricing']) && !empty($data['options_pricing'])) ? 0.00 : $data['products_qty_break_price'][$group][$key]; // for options support - - $Qpb = $lC_Database->query('insert into :table_products_pricing (products_id, group_id, tax_class_id, qty_break, price_break, date_added) values (:products_id, :group_id, :tax_class_id, :qty_break, :price_break, :date_added)'); - $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpb->bindInt(':products_id', $products_id ); - $Qpb->bindInt(':group_id', $group); - $Qpb->bindInt(':tax_class_id', $data['tax_class_id'] ); - $Qpb->bindValue(':qty_break', $data['products_qty_break_point'][$group][$key] ); - $Qpb->bindFloat(':price_break', $price ); - $Qpb->bindRaw(':date_added', 'now()'); - $Qpb->setLogging($_SESSION['module'], $products_id); - $Qpb->execute(); - - if ( $lC_Database->isError() ) { -die($lC_Database->getError()); - - $error = true; - break 2; - } - } - } - } - - // add qpb for options - if (is_array($data['options_pricing']) && !empty($data['options_pricing'])) { - - $parent_id = $products_id; - - foreach($data['options_pricing'] as $product_id => $groups) { - foreach($groups as $group_id => $gdata) { - foreach($gdata as $qty_break => $price) { - $Qpb2 = $lC_Database->query('insert into :table_products_pricing (products_id, parent_id, group_id, tax_class_id, qty_break, price_break, date_added) values (:products_id, :parent_id, :group_id, :tax_class_id, :qty_break, :price_break, :date_added)'); - $Qpb2->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpb2->bindInt(':products_id', $product_id ); - $Qpb2->bindInt(':parent_id', $parent_id ); - $Qpb2->bindInt(':group_id', $group_id); - $Qpb2->bindInt(':tax_class_id', $data['tax_class_id'] ); - $Qpb2->bindValue(':qty_break', $qty_break ); - $Qpb2->bindFloat(':price_break', number_format($price, DECIMAL_PLACES) ); - $Qpb2->bindRaw(':date_added', 'now()'); - $Qpb2->setLogging($_SESSION['module'], $product_id); - $Qpb2->execute(); - - if ( $lC_Database->isError() ) { -die($lC_Database->getError()); - $error = true; - break 3; - } - } - } - } - } - } - } - } - if ($error === false) { - // add group pricing - if (is_array($data['group_pricing']) && !empty($data['group_pricing'])) { - if ($products_id != null) { - // add the new records - foreach($data['group_pricing'] as $group => $values) { - $Qgp = $lC_Database->query('insert into :table_products_pricing (products_id, qty_break, price_break, group_id, tax_class_id, group_status, group_price, date_added) values (:products_id, :qty_break, :price_break, :group_id, :tax_class_id, :group_status, :group_price, :date_added)'); - $Qgp->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qgp->bindInt(':products_id', $products_id ); - $Qgp->bindInt(':qty_break', -1); - $Qgp->bindFloat(':price_break', number_format(0, DECIMAL_PLACES)); - $Qgp->bindInt(':group_id', $group); - $Qgp->bindInt(':tax_class_id', $data['tax_class_id'] ); - $Qgp->bindValue(':group_status', (($values['enable'] == 'on') ? 1 : 0)); - $Qgp->bindValue(':group_price', number_format($values['price'], DECIMAL_PLACES)); - $Qgp->bindRaw(':date_added', 'now()'); - $Qgp->setLogging($_SESSION['module'], $products_id); - $Qgp->execute(); - - if ( $lC_Database->isError() ) { -die($lC_Database->getError()); - - $error = true; - break; - } - } - } - } - } - - if ($error === false) { - // add special pricing - if (is_array($data['products_special_pricing']) && !empty($data['products_special_pricing'])) { - if ($products_id != null) { - - // add the new records - foreach($data['products_special_pricing'] as $group => $values) { - - $start_date = (isset($values['start_date']) && empty($values['start_date']) === false) ? $values['start_date'] : '0000-00-00 00:00:00'; - $expires_date = (isset($values['expires_date']) && empty($values['expires_date']) === false) ? $values['expires_date'] : '0000-00-00 00:00:00'; - - $Qsp = $lC_Database->query('insert into :table_products_pricing (products_id, qty_break, price_break, group_id, tax_class_id, special_status, special_price, special_start, special_end, date_added) values (:products_id, :qty_break, :price_break, :group_id, :tax_class_id, :special_status, :special_price, :special_start, :special_end, :date_added)'); - $Qsp->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qsp->bindInt(':products_id', $products_id ); - $Qsp->bindInt(':qty_break', -1); - $Qsp->bindFloat(':price_break', number_format(0, DECIMAL_PLACES)); - $Qsp->bindInt(':group_id', $group); - $Qsp->bindInt(':tax_class_id', $data['tax_class_id'] ); - $Qsp->bindValue(':special_status', (($values['enable'] == 'on') ? 1 : 0)); - $Qsp->bindValue(':special_price', number_format($values['price'], DECIMAL_PLACES)); - $Qsp->bindRaw(':date_added', 'now()'); - $Qsp->bindRaw(':special_start', "'" . ((strstr($start_date, '/')) ? lC_DateTime::toDateTime($start_date) : $start_date) . "'"); - $Qsp->bindRaw(':special_end', "'" . ((strstr($expires_date, '/')) ? lC_DateTime::toDateTime($expires_date) : $expires_date) . "'"); - $Qsp->setLogging($_SESSION['module'], $products_id); - $Qsp->execute(); - - if ( $lC_Database->isError() ) { -die($lC_Database->getError()); - $error = true; - break; - } - } - } - } - } - - if ($error === false) { - // add options special pricing - if (is_array($data['specials_pricing']) && !empty($data['specials_pricing'])) { - if ($products_id != null) { - // add the new records - foreach($data['specials_pricing'] as $products_id => $val) { - foreach($val as $group_id => $special_price) { - - if ($special_price == null) continue; - - $Qgp = $lC_Database->query('insert into :table_products_pricing (products_id, parent_id, group_id, tax_class_id, special_status, special_price, date_added) values (:products_id, :parent_id, :group_id, :tax_class_id, :special_status, :special_price, :date_added)'); - $Qgp->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qgp->bindInt(':products_id', $products_id ); - $Qgp->bindInt(':parent_id', $parent_id ); - $Qgp->bindInt(':group_id', $group_id); - $Qgp->bindInt(':tax_class_id', $data['tax_class_id'] ); - $Qgp->bindValue(':special_status', 1); - $Qgp->bindValue(':special_price', number_format($special_price, DECIMAL_PLACES)); - $Qgp->bindRaw(':date_added', 'now()'); - $Qgp->setLogging($_SESSION['module'], $products_id); - $Qgp->execute(); - - if ( $lC_Database->isError() ) { - die($lC_Database->getError()); - - $error = true; - break; - } - } - } - } - } - } - - if ( $error === false ) { - $lC_Database->commitTransaction(); - - lC_Cache::clear('categories'); - lC_Cache::clear('category_tree'); - lC_Cache::clear('also_purchased'); - - return $products_id; // Return the products id for use with the save_close buttons - } - - $lC_Database->rollbackTransaction(); - } - /* - * Batch update the category access levels - * - * @param integer $category_id The parent category id - * @param string $levels The access levels - * @access public - * @return boolean - */ - public static function batchEditAccess($data) { - global $lC_Database; - - $levels = ''; - if (is_array($data['access_levels'])) { - foreach ($data['access_levels'] as $key => $val) { - $levels .= $key . ';'; - } - $levels = substr($levels, 0, -1); - } - - $lC_Database->startTransaction(); - - foreach ( $data['batch'] as $products_id ) { - $Qproduct = $lC_Database->query('update :table_products set `access_levels` = :access_levels where `products_id` = :products_id'); - $Qproduct->bindTable(':table_products', TABLE_PRODUCTS); - $Qproduct->bindInt(':products_id', $products_id); - $Qproduct->bindvalue(':access_levels', $levels); - $Qproduct->setLogging($_SESSION['module'], $products_id); - $Qproduct->execute(); - } - - if ( !$lC_Database->isError() ) { - $lC_Database->commitTransaction(); - return true; - } - - $lC_Database->rollbackTransaction(); - - return false; - } - /* - * Return the product simple options accordian price listing content - * - * @access public - * @return array - */ - public static function getGroupPricingContent($base_price) { - global $lC_Language, $lC_Currencies, $lC_Database, $pInfo; - - $products_id = (isset($pInfo)) ? $pInfo->get('products_id') : null; - - $content = ''; - $groups = lC_Customer_groups_Admin::getAll(); - - foreach($groups['entries'] as $key => $value) { - $group_status = 0; - if ($products_id != null) { - $Qpricing = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id and group_id = :group_id and group_status != :group_status order by qty_break asc'); - $Qpricing->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpricing->bindInt(':products_id', $products_id); - $Qpricing->bindInt(':group_id', $value['customers_group_id']); - $Qpricing->bindInt(':group_status', -1); - $Qpricing->execute(); - - $group_status = $Qpricing->valueInt('group_status'); - $diff = (float)$base_price - $Qpricing->valueDecimal('group_price'); - $discount_text = number_format(round(($diff / $base_price) * 100, DECIMAL_PLACES), DECIMAL_PLACES); - $discounted_price = $Qpricing->valueDecimal('group_price'); - - } else { - $discount = round((float)$base_price * ((float)$value['baseline_discount'] * .01), DECIMAL_PLACES); - $discounted_price = $base_price - $discount; - $discount_text = number_format($value['baseline_discount'], DECIMAL_PLACES); - } - - $checked = ($group_status == 0) ? null : 'checked="checked"'; - - $content .= '
    ' . - ' ' . - ' ' . - '
    ' . - ' ' . $lC_Currencies->getSymbolLeft() . '' . - ' ' . - '
    ' . - ' ' . $lC_Language->get('text_price') . '-' . $discount_text . '%' . - '
    '; - } - - return $content; - } - /* - * Return the product specials price listing content - * - * @access public - * @return array - */ - public static function getSpecialPricingContent() { - global $lC_Language, $lC_Currencies, $lC_Database, $pInfo; - - $products_id = (isset($pInfo)) ? $pInfo->get('products_id') : null; - - $content = ''; - $groups = lC_Customer_groups_Admin::getAll(); - - $has_options = (isset($pInfo) && (lC_Products_pro_Admin::hasComboOptions($products_id) || lC_Products_pro_Admin::hasSubProducts($products_id))) ? true : false; - - foreach($groups['entries'] as $key => $value) { - - $special_status = 0; - $base = (isset($pInfo)) ? (float)$pInfo->get('products_price') : 0.00; - - if ($products_id != null) { - $Qpricing = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id and group_id = :group_id and special_status != :special_status order by group_id asc'); - $Qpricing->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpricing->bindInt(':products_id', $products_id); - $Qpricing->bindInt(':group_id', $value['customers_group_id']); - $Qpricing->bindInt(':special_status', -1); - $Qpricing->execute(); - - $special_status = ($Qpricing->valueInt('special_status') == 1) ? ' checked' : ''; - $special_price = number_format($Qpricing->valueDecimal('special_price'), DECIMAL_PLACES); - - $start_date_formatted = null; - if ($Qpricing->value('special_start') != null && $Qpricing->value('special_start') != '0000-00-00 00:00:00') { - $start_date_formatted = lC_DateTime::getShort($Qpricing->value('special_start')); - } - $expires_date_formatted = null; - if ($Qpricing->value('special_end') != null && $Qpricing->value('special_end') != '0000-00-00 00:00:00') { - $expires_date_formatted = lC_DateTime::getShort($Qpricing->value('special_end')); - } - - } else { - $special_status = (isset($pInfo) && $pInfo->get('products_special_status') != 0) ? ' checked' : null; - $special_price = (isset($pInfo)) ? number_format($pInfo->get('products_special_price'), DECIMAL_PLACES) : 0.00; - $start_date_formatted = (isset($pInfo) && $pInfo->get('products_special_expires_date') != '0000-00-00 00:00:00') ? lC_DateTime::getShort($pInfo->get('products_special_start_date')) : null; - $expires_date_formatted = (isset($pInfo) && $pInfo->get('products_special_expires_date') != '0000-00-00 00:00:00') ? lC_DateTime::getShort($pInfo->get('products_special_expires_date')) : null; - } - - $discount = (isset($base) && $base > 0.00) ? round( ((($base - $special_price) / $base) * 100), DECIMAL_PLACES) : 0.00; - - $checked = ($special_status == 0) ? null : 'checked="checked"'; - - $content .= '' . - '
    ' . - '
    ' . - ' '; -// if ($has_options === false) { - $content .= '
    ' . - ' ' . $lC_Currencies->getSymbolLeft() . '' . - ' ' . - '
    ' . - ' ' . $lC_Language->get('text_special_price') . '-' . number_format($discount, DECIMAL_PLACES) . '%'; -// } - $content .= '
    ' . - '
    ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - '
    ' . - '
    '; - } - - return $content; - } - /* - * Determine if product has group pricing - * - * @param integer $id The product id - * @access public - * @return boolean - */ - public static function hasGroupPricing($id) { - global $lC_Database; - - $Qgp = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id and group_status = :group_status limit 1'); - $Qgp->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qgp->bindInt(':products_id', $id); - $Qgp->bindInt(':group_status', 1); - $Qgp->execute(); - - $rows = $Qgp->numberOfRows(); - - $Qgp->freeResult(); - - if ( $rows > 0 ) { - return true; - } - - return false; - } -} \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/rpc.php b/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/rpc.php deleted file mode 100644 index 590c3c74f..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/rpc.php +++ /dev/null @@ -1,33 +0,0 @@ - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/products/modal/batchAccess.php b/catalog/addons/Loaded_7_B2B/admin/applications/products/modal/batchAccess.php deleted file mode 100644 index 9a314faf5..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/products/modal/batchAccess.php +++ /dev/null @@ -1,88 +0,0 @@ -modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); - -global $lC_Language, $lC_Template; -?> - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/products/pages/tabs/relationships_access_levels.inc.php b/catalog/addons/Loaded_7_B2B/admin/applications/products/pages/tabs/relationships_access_levels.inc.php deleted file mode 100644 index 37c5e41c2..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/products/pages/tabs/relationships_access_levels.inc.php +++ /dev/null @@ -1,33 +0,0 @@ -modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); -?> -
    - get('section_access_levels_overrides'); ?> -
    -
    -
    get('subsection_access'); ?>
    -

    -
    -
    -
    - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/classes/access.php b/catalog/addons/Loaded_7_B2B/admin/classes/access.php deleted file mode 100644 index 4fd96283a..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/classes/access.php +++ /dev/null @@ -1,16 +0,0 @@ - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_edit.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_edit.xml deleted file mode 100644 index 65542aed1..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_edit.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - Enable B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - get('text_access_levels_upsell_title'); ?>" upselldesc="get('text_access_levels_upsell_desc'); ?>">]]> - ]]> - - - get('access_levels_registered'); ?>

    get('access_levels_wholesale'); ?>

    get('access_levels_dealer'); ?>

    ]]>     - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); echo '

    ' . lC_Customer_groups_b2b_Admin::getCustomerAccessLevelsHtml('categories') . '

    '; ?>]]>     -     - - ]]> - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php')); echo lC_Categories_pro_Admin::getProductRelatedHtml($_GET['categories']); ?>]]> - -     -     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_main.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_main.xml deleted file mode 100644 index 669030f76..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_main.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Enable B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - get('text_with_selected'); ?>]]> - get('text_edit_access'); ?>]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_new.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_new.xml deleted file mode 100644 index c01a3ec52..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_new.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - Enable B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - get('text_access_levels_upsell_title'); ?>" upselldesc="get('text_access_levels_upsell_desc'); ?>">]]> - ]]> - - - get('access_levels_registered'); ?>

    get('access_levels_wholesale'); ?>

    get('access_levels_dealer'); ?>

    ]]>     - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); echo '

    ' . lC_Customer_groups_b2b_Admin::getCustomerAccessLevelsHtml() . '

    '; ?>]]>     -     -     -     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_classes_rpc.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_classes_rpc.xml deleted file mode 100644 index ebdf2f65f..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_classes_rpc.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php'));]]> - - - - - - - - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_modal_edit.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_modal_edit.xml deleted file mode 100644 index 3a83ba41d..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_modal_edit.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - Enable B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - ]]> - ]]> - - - - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/orders_classes_orders.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/orders_classes_orders.xml deleted file mode 100644 index e5382f113..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/orders_classes_orders.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - Admin Orders Mods - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - - - - - - - - - query("SELECT count(o.orders_id) as total - from "); - //Purchase Orders Service Module(PO) START - if (utility::isB2B()) { - $QresultFilterTotal->appendQuery(' :table_purchase_orders_service pos, '); - $QresultFilterTotal->bindTable(':table_purchase_orders_service',DB_TABLE_PREFIX.'purchase_orders_service'); - } - //Purchase Orders Service Module(PO) END - - $QresultFilterTotal->appendQuery(" :table_orders o LEFT JOIN :table_orders_total ot - on (o.orders_id = ot.orders_id and ot.class = 'total') - LEFT JOIN :table_orders_status s - on (s.orders_status_id = o.orders_status and s.language_id = :language_id) " . - $sWhere ." group by o.orders_id "); - /* - ]]> - - - - - - - - - query("SELECT o.orders_id, o.customers_id, o.customers_ip_address, o.customers_name, o.payment_method, o.date_purchased, o.last_modified, o.customers_country_iso3, greatest(date_purchased, coalesce(last_modified, date_purchased)) as date_sort, o.currency, o.currency_value, ot.value as order_total, s.orders_status_name, s.orders_status_type from "); - - //Purchase Orders Service Module(PO) START - if (utility::isB2B()) { - $Qresult->appendQuery(' :table_purchase_orders_service pos, '); - $Qresult->bindTable(':table_purchase_orders_service',DB_TABLE_PREFIX.'purchase_orders_service'); - } - //Purchase Orders Service Module(PO) END - - $Qresult->appendQuery(" :table_orders o - LEFT JOIN :table_orders_total ot - on (o.orders_id = ot.orders_id and ot.class = 'total') - LEFT JOIN :table_orders_status s - on (s.orders_status_id = o.orders_status and s.language_id = :language_id) " . - $sWhere . " group by o.orders_id " . $sOrder . $sLimit); - /* - ]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_edit.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_edit.xml deleted file mode 100644 index d3ae7fd84..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_edit.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - Admin Orders Mods - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - ]]> - modCheck(DIR_FS_CATALOG . 'addons/Purchase_Orders_Service/classes/order.php')); - $po_number = lC_Order_b2b::retrievePONumber($_GET['orders']); - if($po_number != '') { - ?> -
      get('text_po_number_title'); ?> : 
    - - ]]>     -     -     -     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_invoice.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_invoice.xml deleted file mode 100644 index 55c859139..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_invoice.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - Admin Orders Mods - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - modCheck('../addons/purchase_orders_service/classes/order.php')); - } - ]]> - - - getCustomer('email_address') . '">' . $lC_Order->getCustomer('email_address') . ''; ?> - ]]> - - - -   - - - get('text_po_number_title'); ?> :  - - - - ]]> - - - - - - modCheck(DIR_FS_CATALOG . 'addons/Purchase_Orders_Service/classes/order.php')); - } - ]]> - - - getCustomer('email_address') . '">' . $lC_Order->getCustomer('email_address') . ''; ?> - ]]> - - - -   - - - get('text_po_number_title'); ?> :  - - - - ]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_main.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_main.xml deleted file mode 100644 index 1a7dabf9f..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_main.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Enable B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - get('text_with_selected'); ?>]]> - get('text_edit_access'); ?>]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_pricing.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_pricing.xml deleted file mode 100644 index 342ae6202..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_pricing.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - Enable B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_relationships.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_relationships.xml deleted file mode 100644 index b8527156b..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_relationships.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Enable B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/templates_default_header.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/templates_default_header.xml deleted file mode 100644 index 81af6fda8..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/templates_default_header.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - After Logo Image, add Pro Indicator - 1.0.0 - 2.3.2 - loadedcommerce.com - - - ]]> - B2B' : null; ?>]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php deleted file mode 100644 index bf90364a8..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: b2b_settings.php v1.0 2011-11-04 datazen $ -# -# LoadedCommerce, Innovative eCommerce Solutions -# http://www.loadedcommerce.com -# -# Copyright (c) 2014 LoadedCommerce.com -# -# @author LoadedCommerce Team -# @copyright (c) 2014 LoadedCommerce Team -# @license http://loadedcommerce.com/license.html - -heading_title = B2B Settings - -access_b2b_settings_title = B2B Settings - -heading_customers = Customers -heading_products = Products -heading_guest_access = Guest Access -heading_access_group_levels = Access Group Levels - -table_heading_id = ID -table_heading_group = Access Level -table_heading_members = Members -table_heading_status = Status -table_heading_action = Action - -label_allow_self_registrations = Allow Self Registrations -label_guest_catalog_access = Guest Catalog Access -label_guest = Guest -label_status = Status -label_active = Active -label_registered = Registered -label_new_access_level = New Access Level - -button_create_new = Create New - -modal_heading_delete_customer_access_level = Delete Customer Access Level -modal_heading_edit_customer_access_level = Edit Customer Access Level - -introduction_edit_customer_access_level = Please make the necessary changes for this customer access level. -introduction_delete_customer_access_level = Please verify the removal of this customer access level. -delete_error_customer_access_level_prohibited = Error: The system customer access levels cannot be removed. -delete_error_customer_access_level_in_use = Error: This customer access level is currently assigned to -delete_error_customer_access_level_in_use_end = customers and cannot be removed. - -info_bubble_displays_create_account_form = Displays Create Account Form -info_bubble_guest_catalog_access = Control Guest Access to the Catalog - -text_add_to_cart = Add to Cart -text_members = Members -text_none = None -text_see_pricing = See Pricing -text_view_catalog = View Catalog -text_enable_level = Enable Level -text_disable_level = Disable Level diff --git a/catalog/addons/Loaded_7_B2B/admin/languages/en_US/modules/access/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/languages/en_US/modules/access/b2b_settings.php deleted file mode 100644 index fe908d5af..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/languages/en_US/modules/access/b2b_settings.php +++ /dev/null @@ -1,12 +0,0 @@ -# $Id: b2b_settings.php v1.0 2013-01-01 datazen $ -# -# LoadedCommerce, Innovative eCommerce Solutions -# http://www.loadedcommerce.com -# -# Copyright (c) 2014 Loaded Commerce, LLC -# -# @author LoadedCommerce Team -# @copyright (c) 2014 LoadedCommerce Team -# @license http://loadedcommerce.com/license.html - -access_b2b_settings_title = B2B Settings \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/modules/access/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/modules/access/b2b_settings.php deleted file mode 100644 index 28d15d098..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/modules/access/b2b_settings.php +++ /dev/null @@ -1,23 +0,0 @@ -_title = $lC_Language->get('access_b2b_settings_title'); - } -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/classes/order.php b/catalog/addons/Loaded_7_B2B/classes/order.php deleted file mode 100644 index 034533322..000000000 --- a/catalog/addons/Loaded_7_B2B/classes/order.php +++ /dev/null @@ -1,75 +0,0 @@ -modCheck(DIR_FS_CATALOG . 'includes/classes/order.php')); - -class lC_Order_b2b { - /* - * Insert the purchase order number - * - * @access public - * @return array - */ - public static function insertPONumber($id = null, $po_number = null) { - global $lC_Database; - - if ($id == null && $po_number == null) return false; - - $Qponumber = $lC_Database->query('insert into :table_po_number (po_number,orders_id) values (:po_number,:orders_id)'); - $Qponumber->bindTable(':table_po_number', DB_TABLE_PREFIX . "purchase_orders_service"); - $Qponumber->bindValue(':po_number', $po_number); - $Qponumber->bindInt(':orders_id', $id); - $Qponumber->execute(); - - return true; - } - /* - * Get the purchase order number email string - * - * @access public - * @return string - */ - public static function getPONumber($id) { - global $lC_Language; - - $email_order = $lC_Language->get('text_po_number_title') . "\n" . - $lC_Language->get('email_order_separator') . "\n"; - $email_order .= self::retrievePONumber($id) . "\n\n"; - - return $email_order; - } - /* - * Get the purchase order number - * - * @access public - * @return string - */ - public static function retrievePONumber($id = 0) { - global $lC_Database, $lC_Customer, $lC_Language; - - if( $id > 0) { - $Qretorders = $lC_Database->query('select po_number_id, po_number from :table_po_number where orders_id = :orders_id '); - $Qretorders->bindTable(':table_po_number', DB_TABLE_PREFIX . "purchase_orders_service"); - $Qretorders->bindInt(':orders_id', $id); - $Qretorders->execute(); - - $id = $Qretorders->value('po_number'); - - $Qretorders->freeResult(); - - return $id; - } - - return false; - - } -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/classes/product.php b/catalog/addons/Loaded_7_B2B/classes/product.php deleted file mode 100644 index 56a8f6938..000000000 --- a/catalog/addons/Loaded_7_B2B/classes/product.php +++ /dev/null @@ -1,182 +0,0 @@ -modCheck(DIR_FS_CATALOG . 'includes/classes/product.php')); - -class lC_Product_b2b extends lC_Product { - /* - * Check to see if product has restricted accesa - * - * @access public - * @return array - */ - public static function hasProductAccess($products_id, $customers_group_id) { - global $lC_Database, $lC_Customer; - - $valid = false; - - if ($lC_Customer->isLoggedOn() === false) $customers_group_id = 0; - - if ($customers_group_id > 0) { // not guest - - // get the access levels for the group - $Qcg = $lC_Database->query('select customers_access_levels from :table_customers_groups_data where customers_group_id = :customers_group_id limit 1'); - $Qcg->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); - $Qcg->bindInt(':customers_group_id', $customers_group_id); - $Qcg->execute(); - - $cg_access_levels = explode(';', $Qcg->value('customers_access_levels')); - - $Qcg->freeResult(); - - // get the product access levels - $Qproduct = $lC_Database->query('select access_levels from :table_products where products_id = :products_id limit 1'); - $Qproduct->bindTable(':table_products', TABLE_PRODUCTS); - $Qproduct->bindInt(':products_id', $products_id); - $Qproduct->execute(); - - $product_access_levels = explode(';', $Qproduct->value('access_levels')); - - $Qproduct->freeResult(); - - // check if product has access - $valid = false; - if ($Qproduct->value('access_levels') == '') { // if nothing set, valid = true - $valid = true; - } else { - foreach ($product_access_levels as $id) { - if ($id != '') { - if (in_array($id, $cg_access_levels)) { - $valid = true; - break; - } - } - } - } - } else { - $guestAccess = (defined('B2B_SETTINGS_GUEST_CATALOG_ACCESS') && B2B_SETTINGS_GUEST_CATALOG_ACCESS > 0) ? (int)B2B_SETTINGS_GUEST_CATALOG_ACCESS : 0; - - if ($guestAccess > 0) { - // get the access levels - $Qproduct = $lC_Database->query('select access_levels from :table_products where products_id = :products_id limit 1'); - $Qproduct->bindTable(':table_products', TABLE_PRODUCTS); - $Qproduct->bindInt(':products_id', $products_id); - $Qproduct->execute(); - - $product_access_levels = explode(';', $Qproduct->value('access_levels')); - - $Qproduct->freeResult(); - - if ($Qproduct->value('access_levels') == '') { // if nothing set, valid = true - $valid = true; - } else if (in_array('1', $product_access_levels)) { // has guest access at the category level - $valid = true; - } - - } - } - - return $valid; - } - /* - * Check to see if category has restricted accesa - * - * @access public - * @return array - */ - public static function hasCategoryAccess($categories_id, $customers_group_id) { - global $lC_Database, $lC_Customer; - - $valid = false; - - if ($lC_Customer->isLoggedOn() === false) $customers_group_id = 0; - - if ($customers_group_id > 0) { // not guest - - // get the access levels for the group - $Qcg = $lC_Database->query('select customers_access_levels from :table_customers_groups_data where customers_group_id = :customers_group_id limit 1'); - $Qcg->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); - $Qcg->bindInt(':customers_group_id', $customers_group_id); - $Qcg->execute(); - - $cg_access_levels = explode(';', $Qcg->value('customers_access_levels')); - - $Qcg->freeResult(); - - // get the category access levels - $Qcat = $lC_Database->query('select access_levels from :table_categories where categories_id = :categories_id limit 1'); - $Qcat->bindTable(':table_categories', TABLE_CATEGORIES); - $Qcat->bindInt(':categories_id', $categories_id); - $Qcat->execute(); - - $category_access_levels = explode(';', $Qcat->value('access_levels')); - - $Qcat->freeResult(); - - // check if product has access - if ($Qcat->value('access_levels') == '') { // if nothing set, valid = true - $valid = true; - } else { - foreach ($category_access_levels as $id) { - if ($id != '') { - if (in_array($id, $cg_access_levels)) { - $valid = true; - break; - } - } - } - } - - } else { - $guestAccess = (defined('B2B_SETTINGS_GUEST_CATALOG_ACCESS') && B2B_SETTINGS_GUEST_CATALOG_ACCESS > 0) ? (int)B2B_SETTINGS_GUEST_CATALOG_ACCESS : 0; - - if ($guestAccess > 0) { - // get the category access levels - $Qcat = $lC_Database->query('select access_levels from :table_categories where categories_id = :categories_id limit 1'); - $Qcat->bindTable(':table_categories', TABLE_CATEGORIES); - $Qcat->bindInt(':categories_id', $categories_id); - $Qcat->execute(); - - $category_access_levels = explode(';', $Qcat->value('access_levels')); - - $Qcat->freeResult(); - - if ($Qcat->value('access_levels') == '') { // if nothing set, valid = true - $valid = true; - } else if (in_array('1', $category_access_levels)) { // has guest access at the category level - $valid = true; - } - - } - } - - return $valid; - } - - public static function restrictCategories($customers_group_id, $data) { -echo "
    ";
-print_r($data);
-echo "
    "; -die('55'); - - foreach ($data[0] as $key => $top) { - foreach ($data[$key] as $ckey => $child) { -// if ($child['item_id'] != NULL && self::hasCategoryAccess($child['item_id'], $customers_group_id) === false) unset($data[$key][$ckey]); - } - - if ($top['item_id'] != NULL && self::hasCategoryAccess($top['item_id'], $customers_group_id) === false) unset($data[0][$key]); - } - - return $data; - } - -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/controller.php b/catalog/addons/Loaded_7_B2B/controller.php deleted file mode 100644 index 6e1c166f8..000000000 --- a/catalog/addons/Loaded_7_B2B/controller.php +++ /dev/null @@ -1,156 +0,0 @@ -modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/controller.php')); -if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/product.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/product.php')); -if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); -if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php')); - -class Loaded_7_B2B extends Loaded_7_Pro { - /* - * Class constructor - */ - public function Loaded_7_B2B() { - global $lC_Language, $lC_Database; - /** - * The addon type (category) - * valid types; payment, shipping, themes, checkout, catalog, admin, reports, connectors, other - */ - $this->_type = 'systems'; - /** - * The addon class name - */ - $this->_code = 'Loaded_7_B2B'; - /** - * The addon title used in the addons store listing - */ - $this->_title = $lC_Language->get('addon_system_b2b_title'); - /** - * The addon description used in the addons store listing - */ - $this->_description = $lC_Language->get('addon_system_b2b_description'); - /** - * The developers name - */ - $this->_author = 'Loaded Commerce, LLC'; - /** - * The developers web address - */ - $this->_authorWWW = 'http://www.loadedcommerce.com'; - /** - * The addon version - */ - $this->_version = '1.0.0'; - /** - * The Loaded 7 core compatibility version - */ - $this->_compatibility = '7.002.2.0'; // the addon is compatible with this core version and later - /** - * The base64 encoded addon image used in the addons store listing - */ - $this->_thumbnail = lc_image(DIR_WS_CATALOG . 'addons/' . $this->_code . '/images/loaded7-b2b.png', $this->_title); - /** - * The addon enable/disable switch - */ - $this->_enabled = $this->_checkAndActivate(); - if ($this->_enabled && !defined('ADDONS_SYSTEM_LOADED_7_B2B_STATUS')) $this->install(); - /** - * Automatically install the module - */ - // $this->_auto_install = true; - } - /** - * Checks to see if the addon has been installed - * - * @access public - * @return boolean - */ - public function isInstalled() { - return (bool)defined('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); - } - /** - * Install the addon - * - * @access public - * @return void - */ - public function install() { - global $lC_Database; - - $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Enable AddOn', 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS', '1', 'Do you want to enable this addon?', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())"); - - $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'B2B_SETTINGS_ALLOW_SELF_REGISTER'"); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_ALLOW_SELF_REGISTER', '1', '', '6', '0', '', '', now())"); - - $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'B2B_SETTINGS_GUEST_CATALOG_ACCESS'"); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_GUEST_CATALOG_ACCESS', '4', '', '6', '0', '', '', now())"); - - // po number addition - $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . DB_TABLE_PREFIX . "Purchase_Orders_Service` (`po_number_id` int(11) NOT NULL AUTO_INCREMENT, `po_number` varchar(255) NOT NULL, `orders_id` int(11) NOT NULL, `po_number_status` int(1) NOT NULL DEFAULT '1', PRIMARY KEY (`po_number_id`)) "); - } - /** - * Return the configuration parameter keys an an array - * - * @access public - * @return array - */ - public function getKeys() { - if (!isset($this->_keys)) { - $this->_keys = array('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); - } - - return $this->_keys; - } - /** - * Check if the config key is already in the database - * - * @access protected - * @return boolean - */ - private function _isConfigInstalled($key) { - global $lC_Database; - - $Qcfg = $lC_Database->query('select configuration_id from :table_configuration where configuration_key = :configuration_key'); - $Qcfg->bindTable(':table_configuration', TABLE_CONFIGURATION); - $Qcfg->bindValue(':configuration_key', $key); - $Qcfg->execute(); - - $status = ($Qcfg->numberOfRows() > 0) ? true : false; - - $Qcfg->freeResult(); - - return $status; - } - /** - * Check if the Pro addon is active - * - * @access public - * @return array - */ - protected function _checkAndActivate() { - - $isPro = utility::isPro(); - $isB2B = utility::isB2B(); - - $enabled = false; - if ($isPro) { - $enabled = true; - if ($isB2B) { - } else { - $this->install(); - } - } - - return $enabled; - } -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/account.xml b/catalog/addons/Loaded_7_B2B/hooks/account.xml deleted file mode 100644 index 9eb21f8c8..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/account.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - load('account');]]> - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/application_bottom.xml b/catalog/addons/Loaded_7_B2B/hooks/application_bottom.xml deleted file mode 100644 index d413779e2..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/application_bottom.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - stopServices();]]> - isLoggedOn() === false && $page != 'login') { if (defined('B2B_SETTINGS_ALLOW_SELF_REGISTER') && B2B_SETTINGS_ALLOW_SELF_REGISTER == 1 && $page != 'create') { $lC_NavigationHistory->setSnapshot(); lc_redirect(lc_href_link(FILENAME_ACCOUNT, 'login', 'SSL')); }}} if (file_exists('addons/Loaded_7_B2B/javascript/general.js.php')) { include_once('addons/Loaded_7_B2B/javascript/general.js.php'); }}]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml b/catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml deleted file mode 100644 index fd44d4450..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/order.php')); lC_Order_b2b::insertPONumber($order_id, $_POST['po_number']);}]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml b/catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml deleted file mode 100644 index cfe156afb..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - After VQMOD-001 - 1.0.0 - 2.3.2 - loadedcommerce.com - - - process(); - ]]> - - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/order.php')); - } - //Purchase Orders Service Module(PO) END - ]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/includes_content_index.xml b/catalog/addons/Loaded_7_B2B/hooks/includes_content_index.xml deleted file mode 100644 index d72bae846..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/includes_content_index.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - _page_contents = 'category_listing.php';]]> - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/product.php')); if (!lC_Product_b2b::hasCategoryAccess($current_category_id, $lC_Customer->getCustomerGroup($id))) { $this->_page_contents = 'category_not_found.php'; }]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_actions_cart_add.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_actions_cart_add.xml deleted file mode 100644 index e813fe089..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/modules_actions_cart_add.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/product.php')); if (!lC_Product_b2b::hasProductAccess($id, $lC_Customer->getCustomerGroup($id))) { $lC_ShoppingCart->reset(); lc_redirect(lc_href_link(FILENAME_INFO, 'permissions')); }]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_featured_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_featured_products.xml deleted file mode 100644 index 79295187c..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_featured_products.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - valueInt('products_id'));]]> - valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) $this->_content = ''; return true;]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_specials.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_specials.xml deleted file mode 100644 index da9914e2e..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_specials.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - toArray();]]> - valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) $this->_content = ''; return true;]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_whats_new.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_whats_new.xml deleted file mode 100644 index 7dfe38fa2..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_whats_new.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - valueInt('products_id'));]]> - valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) $this->_content = ''; return true;]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_content_also_purchased_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_content_also_purchased_products.xml deleted file mode 100644 index 985bc601e..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/modules_content_also_purchased_products.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - _content .= '
    ' . "\n";]]> - getID(), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) continue;]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_content_featured_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_content_featured_products.xml deleted file mode 100644 index 9b06d371e..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/modules_content_featured_products.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - valueInt('products_id'));]]> - valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) continue;]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_content_new_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_content_new_products.xml deleted file mode 100644 index 5ce2c9b3d..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/modules_content_new_products.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - valueInt('products_id'));]]> - valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) continue;]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_recently_visited_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_recently_visited_products.xml deleted file mode 100644 index f1f289268..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/modules_recently_visited_products.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - getCustomerGroup($lC_Customer->getID()))) continue;]]> - - - - getCustomerGroup($lC_Customer->getID()))) continue;]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_upcoming_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_upcoming_products.xml deleted file mode 100644 index c81c8e104..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/modules_upcoming_products.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - valueInt('products_id'));]]> - valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) continue;]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/template_content_account_receipt.xml b/catalog/addons/Loaded_7_B2B/hooks/template_content_account_receipt.xml deleted file mode 100644 index e991b65b5..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/template_content_account_receipt.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - After VQMOD-001 - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - modCheck('addons/purchase_orders_service/classes/order.php')); - } - //Purchase Orders Service Module(PO) End - ]]> - - - - - get('receipt_payment_method_title'); ?> info['payment_method']; ?>
    - ]]>     - -
    get('text_po_number_title'); ?> - -
    - - - ]]>     -     -     -     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/templates_content_account_account_history.xml b/catalog/addons/Loaded_7_B2B/hooks/templates_content_account_account_history.xml deleted file mode 100644 index f804330fa..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/templates_content_account_account_history.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - After VQMOD-001 - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - ]]> - modCheck('addons/purchase_orders_service/classes/order.php')); - } - //Purchase Orders Service Module(PO) End - ?> - ]]> - - - - - get('text_total'); ?> - ]]> - - get('text_po_number_heading'); ?> - - ]]> - - - - - value('order_total')); ?> - ]]> - - - - valueInt('orders_id')); ?> - - - ]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_confirmation.xml b/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_confirmation.xml deleted file mode 100644 index b5edf0a51..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_confirmation.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - After VQMOD-001 - 1.0.0 - 2.3.2 - loadedcommerce.com - - - isLoggedOn() !== false) { - ]]> - -
    -

    get('text_po_numbers_service_heading'); ?>

    -

    get('text_po_numbers_service_instructions'); ?>

    - -
    - -
    -
    -     -     -     -     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml b/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml deleted file mode 100644 index a29401ebb..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - After VQMOD-001 - 1.0.0 - 2.3.2 - loadedcommerce.com - - - getID()); - ]]> - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/order.php')); - } - //Purchase Orders Service Module(PO) End - ]]> - - - - -

    - ]]>     - -
    -

    get('text_po_number_title'); ?>

    -

    -
    - - ]]>     -     -     -     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/images/loaded7_b2b.png b/catalog/addons/Loaded_7_B2B/images/loaded7_b2b.png deleted file mode 100644 index ff32445bac3c8609ae0eb6d58958b1ca8e32e297..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3220 zcmaJ^c|4SB8=fKCG?FFTA!8~_*~V@%24iO|Gb4K$Gh>WpX3UH|%MnLIva}r(iaLdZ z6Ov>tOCqIX%My_#vPFgPjZSsGKfb>A_rCA5{I2V|@B6v0e;&4@y`>;X8Uz3U1g)*i zFr3km^BMBJ~!qR+MVR!}!U_zw%kRaAUcrpn?!V@EcpO6dz0B$G+ z=gM+L+rbI6AT|6hMlC#u&S7)Jkl}PZA%Mh!_>jmHDgwG#+W>`7hzO{Q4q5|EN0Iy} zR*?)6HqstPhzuYY5TQsTh+#OKBM?Ml;UVEcfm9|u90C2R3+K#tx7DGLuMk!M0{Tx< zu4qRHipC&8bkwv|2^ugML|0c0rmdr^3sZq;YQQwrH8`)XDoh)$qYKy6gM53SoM;T9 zFC1fL@hui-g@F38Sai6$dRSPPT9}p^jX_q285kJsYG`VzauBM_2r3I7u1aMd`mSI` zViFh>I*UT1LUtALKC}=P0?NtspAv%TKV+%QZ^y(rF!gXeT^**Tv0Ku2AR7Jup+P}E z&`cJF^l!fZQ<#a1pp(=wBql9{LEtpb_t0)AIvm9y;aM~Wjz$aoeu|EMG!~8NN25bf zSY3#c3x!Igg)x=C;?ZchHI>Q2Qwbz%GX#{Qphlq(;X3B#<}h7-4Va0x84PBwWuRlB zfzsF4(9}ZdqO`S9-??TqLP!va%KFYF{>z2^l)Gz%AUY?q8Hqs&B@rzcv>?dWlHrt} z=Avi*Q@w9o;!ktYv-l}jos*3EZe#ze(ciZ??%AFGuq|it!}ugB$L$P`tyhA3-2eaq zerq!mT==Vb&j6;3<$*c`qPFMV)?LDr^C}H-kAn@&o%9v-fuIhYsndGnMD;TJD9ET; zqPduhef=zV0uUR`#2)1$dw@8?SkdkRhp>50A+)Xg%f!kh0-mDU?MMo9II0#(}lsVhMRFomtE2AsQN z*!Yb$f3oV*{&0X$6-g((#In%bWEH%sJP-UL zXJ0hP)lrsM&G)=77nplD?a0|Eg14vHt2R}YdZ{=FVyWGj+*B@*!KR;QhqXJ`U%`2# z)m{dVs%5Am54ZHs=nl(Khx1A%GS|f8)0~vv67%x9ql?GV0orUksANPIt_?esE`YU7 z-WM3>Er-rf?ILIz3aE;@1aXV8u0fjJ-U2=AyRSvuV8pU->syAtHyXTjoallK`2^gf zL(j!6QoJ)>`*!l%SDK0;Op!vKa^c;nsP|YWGqDV+8SLb%uCNOTQsg`(a$0l_9H2`vbY{tbpZwm+r9Ey?Q zm$@|6uCgVu^(A#)X2aN9wm|4mqQRQGpG~!BNadM7ErESJnsw7k57w|Z-VU`F+GC=- zGo>Hik4DP2S*6w4n7npNrfw(9KT7k`IC98c(sC0byf1Z{kGtFH%W^kh5=oC$zLbL4 zF!mj@->2z2?eN%GcB0fr6ZL!4;XvxvHXttc#YoykiO_1vc00L|0`G-1x)EFQVyNz7 zcV}yy;FHN;h*P5yT?B7jw{nj|tj9pb^53DLr5KUW@drGLQ&wcHSnf}w#zn7D!Ai*% zMY%BGF($H9h&Qh-DmLLX&!F3QmD_!5fu5@;{_v!OytlDenjVm!zqKght0S`+i1ST+ z0ffNFkdd`M?xK=Urg1D4|FrNlEny9`WUj$Z^dNAiSU|ymfryN z-n*BrptWO0Iw>L*3jgg2yd>vbNaTS^9j=y^f`>};{^jzW@NjD>zM(%)OJKISV#?Ng zcyhDoW62eb$736HeYIL2Rr8$bc50^_C~JDUW)k)c6=0vT;4HN^t0NN|3gGuRW~MmymwqqMRC5OISI+C)N_w+= zD%0&6D{iO_Xe|6GMQjy0akTOoiIwIe=DRGKOdfBrNueP9KP2U+<QVZHw?TDj#I9`D_!>tHKw61O}nZ zkqhQ%m_q?IH@FP@ z)Dau99pkrq9V+1H7mv%7@uI2$fg>}wZ1$F$zErX)zGDO}U#DWc+IS30TOVwR%odyy zrm$OMk0jd94xcwEu^ks@>W5ss_oU-+{U_ZPD2?WEy2JlN%L`sV;* zxwQ2ZvT^g(O&KXXrG4yLq`51mRxCv^1|>Y;f_E>t+{mYvie*iQdB3~HdI_MUI;R_j zO11436XPxJh0DY^mAEuJM@rmz*bSb9!qWUk(FJm#+h1zADsXuI`QtSi6u^noqn(@H ze+=~s=(jX15jvVq+nSe^gTQQsla?J`%#9)z^PWa-xNc5xg<*!cGLg4uw4@6pdS*hs zS7mWb@VMo3FFf)bYfguVoh9!#5F8wtYg{+^82P5A!%g*QWBlZU;ON8k4xjR_f0rdUgd%F z0lRnJDJ%#vzEQqMNxCF4%hqX+-MW0-Lc;s|@oyNHny>GrhR9od5}q8BEu2_X&RxG^ zck;5&(O?D7w{e6XeLSx^JGfatGg&)-DE9(&s3fM{^=7+%`|MkLm9Fhu8i8PmB$+b` zb{Y7m`H#kJZx;>HgcSEyAC|7cmVrL7c4}1kJKakwy(!^uesN6rDBbOMH7MSx8ld$d zRk@I;zY=n{j@;AbAtEGsaO-YKla?!Uzl*|On(i5^MxKIVPBFi(W~5-i#JiqmAQbxJ zl(-|k^o&{EMdYS5B{%RwkVf>pNMrbmzdC)d+E>ZNHxwr4G=*gAxjJbR8=OvPxv#qD z+!^p(%1p|`xy3>(9%MJKowQXRw7xttsTvvx4z$;fNQD-X_eHiP7R+82^~h4yb-j6f z)VXvTxcD)_gWIQHUTCl09m8c08*#5C5%K+8hLzfp&_NIp}$l|=9=fmiF&suK;J47^ zbPJf8?GbX+p>q;_#a@d%3-XE1A - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/languages/en_US.xml b/catalog/addons/Loaded_7_B2B/languages/en_US.xml deleted file mode 100644 index 0498bebab..000000000 --- a/catalog/addons/Loaded_7_B2B/languages/en_US.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - addon_system_b2b_title - - checkout - - - addon_system_b2b_description - - checkout - - - text_po_numbers_service_heading - - general - - - text_po_number_heading - - general - - - text_po_number_title - - general - - - text_po_numbers_service_instructions - - general - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php b/catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php deleted file mode 100644 index eef60e63a..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php +++ /dev/null @@ -1,124 +0,0 @@ -modCheck(DIR_FS_ADMIN . 'includes/applications/categories/classes/categories.php')); -include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/classes/category_tree.php')); - -class lC_Categories_pro_Admin extends lC_Categories_Admin { - /* - * Save the category record - * - * @param integer $id The category id on update, null on insert - * @param array $data The category information - * @access public - * @return boolean - */ - public static function save($id = null, $data) { - global $lC_Database, $lC_Language; - - $category_id = parent::save($id, $data); - - return $category_id; - } - /* - * Get related products/categories html - * - * @access public - * @return string - */ - public static function getProductRelatedHtml($cid = '') { - global $lC_Language; - - $lC_Language->loadIniFile('categories.php'); - - $pData = self::_getProductsRelated($cid); - - $html = '' . - '
    ' . - ' ' . $lC_Language->get('field_products_related') . '' . - '
    ' . - '
    ' . - '
    ' . - '
    ' . number_format($pData['products_in_category'], 0) . '
    ' . - '
    ' . $lC_Language->get('field_products_in_category') . '
    ' . - '
    ' . - '
    ' . - '
    ' . number_format($pData['number_of_sub_categories'], 0) . '
    ' . - '
    ' . $lC_Language->get('field_sub_categories') . '
    ' . - '
    ' . - '
    ' . - '
    ' . number_format($pData['products_in_sub_categories'], 0) . '
    ' . - '
    ' . $lC_Language->get('field_products_in_sub_categories') . '
    ' . - '
    ' . - '
    ' . - '
    ' . number_format($pData['total_products'], 0) . '
    ' . - '
    ' . $lC_Language->get('field_total_products') . '
    ' . - '
    ' . - '
    ' . - '
    ' . - '
    '; - - return $html; - } - - protected static function _getProductsRelated($cid) { - global $lC_Database, $lC_CategoryTree; - - $total = 0; - $pData = array(); - if (!is_numeric($cid)) return false; - - // get number of products in this category - $Qp2c = $lC_Database->query('select count(*) as total from :table_products_to_categories where `categories_id` = :categories_id'); - $Qp2c->bindTable(':table_products_to_categories', TABLE_PRODUCTS_TO_CATEGORIES); - $Qp2c->bindInt(':categories_id', $cid); - $Qp2c->execute(); - - $pData['products_in_category'] = $Qp2c->valueInt('total'); - $total = (int)$total + $Qp2c->valueInt('total'); - - // get the number of sub categories under this category - $lC_CategoryTree = new lC_CategoryTree_Admin(); - $catArr = $lC_CategoryTree->getArray($cid); - $pData['number_of_sub_categories'] = count($catArr); - - $pCnt = 0; - foreach ($catArr as $value) { - $catID = end(explode('_', $value['id'])); - $pCnt = (int)$pCnt + self::_numberofProducts($catID); - } - $pData['products_in_sub_categories'] = $pCnt; - $total = (int)$total + $pCnt; - - $pData['total_products'] = $total; - - return $pData; - } - - protected static function _numberofProducts($cid) { - global $lC_Database; - - // get number of products in this category - $Qp2c = $lC_Database->query('select count(*) as total from :table_products_to_categories where `categories_id` = :categories_id'); - $Qp2c->bindTable(':table_products_to_categories', TABLE_PRODUCTS_TO_CATEGORIES); - $Qp2c->bindInt(':categories_id', $cid); - $Qp2c->execute(); - - $total = $Qp2c->valueInt('total'); - - $Qp2c->freeResult(); - - return (int)$total; - } -} \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php deleted file mode 100644 index 7e8bf8374..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php +++ /dev/null @@ -1,219 +0,0 @@ -query('select * from :table_product_classes where language_id = :language_id order by name'); - $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); - $Qclasses->bindInt(':language_id', $lC_Language->getID()); - $Qclasses->execute(); - - $result = array('aaData' => array()); - while ( $Qclasses->next() ) { - $name = $Qclasses->value('name'); - if ( $Qclasses->valueInt('id') == DEFAULT_PRODUCT_CLASSES_ID ) { - $name .= '' . $lC_Language->get('default_entry') . ''; - } - - $title = '' . $name . ''; - $comment = '' . $Qclasses->value('comment') . ''; - $usage = ' '; - $action = ' - ' . (($media === 'mobile-portrait' || $media === 'mobile-landscape') ? NULL : $lC_Language->get('icon_edit')) . ' - - '; - - $result['aaData'][] = array("$title", "$comment", "$usage", "$action"); - $result['entries'][] = $Qclasses->toArray(); - } - - $Qclasses->freeResult(); - - return $result; - } - /* - * Return the data used on the dialog forms - * - * @param integer $id The customer groups id - * @param boolean $edit True = called from edit dialog else called from delete dialog - * @access public - * @return array - */ - public static function getFormData($id = null, $edit = false) { - global $lC_Database, $lC_Language; - - $result = array(); - if (isset($id) && $id != null) { - if ($edit === true) { - $Qclasses = $lC_Database->query('select language_id, name, comment from :table_product_classes where id = :id'); - $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); - $Qclasses->bindInt(':id', $id); - $Qclasses->execute(); - - $status_name = array(); - $result['editComment'] = ''; - while ( $Qclasses->next() ) { - $status_name[$Qclasses->valueInt('language_id')] = $Qclasses->value('name'); - $result['editComment'] = $Qclasses->value('comment'); - } - $result['editNames'] = ''; - foreach ( $lC_Language->getAll() as $l ) { - $result['editNames'] .= '' . lc_draw_input_field('name[' . $l['id'] . ']', (isset($status_name[$l['id']]) ? $status_name[$l['id']] : null), 'class="input-unstyled"') . '
    '; - } - } else { - $Qclasses = $lC_Database->query('select count(*) as total from :table_products where product_class_id = :product_class_id'); - $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); - $Qclasses->bindInt(':product_class_id', $id); - $Qclasses->execute(); - - if ( $Qclasses->valueInt('total') > 0 ) { - $result['totalProducts'] = $Qclasses->valueInt('total'); - $result['rpcStatus'] = -2; - } - } - } else { - $result['names'] = ''; - foreach ( $lC_Language->getAll() as $l ) { - $result['names'] .= '' . lc_draw_input_field('name[' . $l['id'] . ']', null, 'class="input-unstyled"') . '
    '; - } - } - - return $result; - } - /* - * Get the customer group information - * - * @param integer $id The customer group id - * @access public - * @return array - */ - public static function getData($id) { - global $lC_Database, $lC_Language; - - $Qclasses = $lC_Database->query('select* from :table_product_classes where id = :id and language_id = :language_id order by name'); - $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); - $Qclasses->bindInt(':id', $id); - $Qclasses->bindInt(':language_id', $lC_Language->getID()); - - $data = $Qclasses->toArray(); - - $Qclasses->freeResult(); - - return $data; - } - /* - * Save the customer group information - * - * @param integer $id The customer group id used on update, null on insert - * @param array $data An array containing the customer group information - * @param boolean $default True = set the customer group to be the default - * @access public - * @return boolean - */ - public static function save($id = null, $data, $default = false) { - global $lC_Database, $lC_Language; - - $error = false; - - $lC_Database->startTransaction(); - - if ( is_numeric($id) ) { - $product_class_id = $id; - } else { - $Qpc = $lC_Database->query('select max(id) as product_class_id from :table_product_classes'); - $Qpc->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); - $Qpc->execute(); - - $product_class_id = $Qpc->valueInt('product_class_id') + 1; - } - - foreach ( $lC_Language->getAll() as $l ) { - if ( is_numeric($id) ) { - $Qpc = $lC_Database->query('update :table_product_classes set name = :name, comment = :comment where id = :id and language_id = :language_id'); - } else { - $Qpc = $lC_Database->query('insert into :table_product_classes (name, comment, language_id) values (:name, :comment, :language_id)'); - } - - $Qpc->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); - $Qpc->bindInt(':id', $product_class_id); - $Qpc->bindValue(':name', $data['name'][$l['id']]); - $Qpc->bindValue(':comment', $data['comment']); - $Qpc->bindInt(':language_id', $l['id']); - $Qpc->setLogging($_SESSION['module'], $product_class_id); - $Qpc->execute(); - - if ( $lC_Database->isError() ) { - $error = true; - break; - } - } - - if ( $error === false ) { - if ( $default === true ) { - $Qupdate = $lC_Database->query('update :table_configuration set configuration_value = :configuration_value where configuration_key = :configuration_key'); - $Qupdate->bindTable(':table_configuration', TABLE_CONFIGURATION); - $Qupdate->bindInt(':configuration_value', $product_class_id); - $Qupdate->bindValue(':configuration_key', 'DEFAULT_PRODUCT_CLASSES_ID'); - $Qupdate->setLogging($_SESSION['module'], $product_class_id); - $Qupdate->execute(); - - if ( $lC_Database->isError() ) { - $error = true; - } - } - } - - if ( $error === false ) { - $lC_Database->commitTransaction(); - - if ( $default === true ) { - lC_Cache::clear('configuration'); - } - - return true; - } - - $lC_Database->rollbackTransaction(); - - return false; - } - /* - * Delete the customer group record - * - * @param integer $id The customer group id to delete - * @access public - * @return boolean - */ - public static function delete($id) { - global $lC_Database; - - $Qclasses = $lC_Database->query('delete from :table_product_classes where id = :id'); - $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); - $Qclasses->bindInt(':id', $id); - $Qclasses->setLogging($_SESSION['module'], $id); - $Qclasses->execute(); - - if ( $lC_Database->isError() ) { - return false; - } - - return true; - } -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php deleted file mode 100644 index c418dc4ef..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php +++ /dev/null @@ -1,78 +0,0 @@ - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php deleted file mode 100644 index faf5f69e2..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php +++ /dev/null @@ -1,39 +0,0 @@ - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php deleted file mode 100644 index 6895ceaa9..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php +++ /dev/null @@ -1,94 +0,0 @@ - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php deleted file mode 100644 index 33b2e1160..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php +++ /dev/null @@ -1,117 +0,0 @@ - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php deleted file mode 100644 index c9f8bede6..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php +++ /dev/null @@ -1,115 +0,0 @@ - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php deleted file mode 100644 index 9836d1d27..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php +++ /dev/null @@ -1,60 +0,0 @@ - - -
    - -
    -

    getPageTitle(); ?>

    -
    - -
    -
    - - - - - - - - - - - - - - - - -
    get('table_heading_name'); ?>get('table_heading_comment'); ?>get('table_heading_usage'); ?>  get('table_heading_action'); ?>
     
    -
    -
    - -
    -
    -loadModal($lC_Template->getModule()); ?> - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php deleted file mode 100644 index fa1be3dfe..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php +++ /dev/null @@ -1,28 +0,0 @@ -_page_title = $lC_Language->get('heading_title'); - } -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php deleted file mode 100644 index 96842cc45..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php +++ /dev/null @@ -1,1094 +0,0 @@ -modCheck(DIR_FS_ADMIN . 'includes/applications/products/classes/products.php')); -include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/applications/customer_groups/classes/customer_groups.php')); - -class lC_Products_pro_Admin extends lC_Products_Admin { - /* - * Save the product - * - * @param integer $id The products id to update, null on insert - * @param array $data The products information - * @access public - * @return boolean - */ - public static function save($id = null, $data) { - global $lC_Database, $lC_Language, $lC_Image; - - $error = false; - - $products_id = parent::save($id, $data); - - $group = (defined('DEFAULT_CUSTOMERS_GROUP_ID') && DEFAULT_CUSTOMERS_GROUP_ID != null) ? (int)DEFAULT_CUSTOMERS_GROUP_ID : 1; - - // qty price breaks - if (is_array($data['products_qty_break_point'][$group]) && $data['products_qty_break_point'][$group][1] != null) { - if ($products_id != null) { - - $lC_Database->startTransaction(); - - // remove any old pricing records - $Qpricing = $lC_Database->query('delete from :table_products_pricing where products_id = :products_id'); - $Qpricing->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpricing->bindInt(':products_id', $products_id); - $Qpricing->setLogging($_SESSION['module'], $products_id); - $Qpricing->execute(); - - if ( $lC_Database->isError() ) { - $error = true; - } else { - // add the new records - - foreach($data['products_qty_break_point'][$group] as $key => $val) { - - if ($data['products_qty_break_point'][$group][$key] == null) continue; - if ($data['products_qty_break_point'][$group][$key] == '1') continue; - - $Qpb = $lC_Database->query('insert into :table_products_pricing (products_id, group_id, tax_class_id, qty_break, price_break, date_added) values (:products_id, :group_id, :tax_class_id, :qty_break, :price_break, :date_added)'); - $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpb->bindInt(':products_id', $products_id ); - $Qpb->bindInt(':group_id', $group); - $Qpb->bindInt(':tax_class_id', $data['tax_class_id'] ); - $Qpb->bindValue(':qty_break', $data['products_qty_break_point'][$group][$key] ); - $Qpb->bindValue(':price_break', $data['products_qty_break_price'][$group][$key] ); - $Qpb->bindRaw(':date_added', 'now()'); - $Qpb->setLogging($_SESSION['module'], $products_id); - $Qpb->execute(); - } - } - - if ( $error === false ) { - $lC_Database->commitTransaction(); - } - - $lC_Database->rollbackTransaction(); - } - } - - // subproducts - if ( $error === false ) { - if (isset($data['sub_products_name'])) { - - if (is_numeric($id)) { - // first delete the subproducts that have been removed and not in the post data - $Qchk = $lC_Database->query('select products_id from :table_products where parent_id = :parent_id'); - $Qchk->bindTable(':table_products', TABLE_PRODUCTS); - $Qchk->bindInt(':parent_id', $products_id); - $Qchk->execute(); - - while( $Qchk->next() ) { - if (! @in_array($Qchk->valueInt('products_id'), $data['sub_products_id'])) { - self::delete($Qchk->valueInt('products_id')); - } - } - } else { - // delete any possible ghosts for sanity - $Qdel = $lC_Database->query('delete from :table_products where parent_id = :products_id and is_subproduct = :is_subproduct'); - $Qdel->bindTable(':table_products', TABLE_PRODUCTS); - $Qdel->bindInt(':parent_id', $products_id); - $Qdel->bindInt(':is_subproduct', 1); - $Qdel->execute(); - } - - for ($i=0; $i < sizeof($data['sub_products_name']); $i++) { - if ($data['sub_products_name'][$i] == '') continue; - - if (is_numeric($id) && @in_array($data['sub_products_id'][$i], $data['sub_products_id'])) { - // update the subproduct record - $Qsubproduct = $lC_Database->query('update :table_products set products_quantity = :products_quantity, products_cost = :products_cost, products_price = :products_price, products_sku = :products_sku, products_weight = :products_weight, products_weight_class = :products_weight_class, products_status = :products_status, products_tax_class_id = :products_tax_class_id, products_date_added = :products_date_added, is_subproduct = :is_subproduct where parent_id = :parent_id and products_id = :products_id'); - $Qsubproduct->bindInt(':products_id', $data['sub_products_id'][$i]); - } else { - // add new subproduct record - $Qsubproduct = $lC_Database->query('insert into :table_products (parent_id, products_quantity, products_cost, products_price, products_sku, products_weight, products_weight_class, products_status, products_tax_class_id, products_ordered, products_date_added, is_subproduct) values (:parent_id, :products_quantity, :products_cost, :products_price, :products_sku, :products_weight, :products_weight_class, :products_status, :products_tax_class_id, :products_ordered, :products_date_added, :is_subproduct)'); - $Qsubproduct->bindInt(':products_ordered', $data['products_ordered'][$i]); - } - - $Qsubproduct->bindTable(':table_products', TABLE_PRODUCTS); - $Qsubproduct->bindInt(':parent_id', $products_id); - $Qsubproduct->bindInt(':products_quantity', $data['sub_products_qoh'][$i]); - $Qsubproduct->bindFloat(':products_cost', preg_replace('/[^0-9]\./', '', $data['sub_products_cost'][$i])); - $Qsubproduct->bindFloat(':products_price', preg_replace('/[^0-9]\./', '', $data['sub_products_price'][1][$i])); // retail group - other prices go into pricing table - $Qsubproduct->bindValue(':products_sku', $data['sub_products_sku'][$i]); - $Qsubproduct->bindFloat(':products_weight', $data['sub_products_weight'][$i]); - $Qsubproduct->bindInt(':products_weight_class', $data['weight_class']); - $Qsubproduct->bindInt(':products_status', $data['sub_products_status'][$i]); - $Qsubproduct->bindInt(':products_tax_class_id', $data['tax_class_id']); - $Qsubproduct->bindRaw(':products_date_added', 'now()'); - $Qsubproduct->bindInt(':is_subproduct', ($data['sub_products_default'][$i] == '1' || sizeof($data['sub_products_name']) == 2) ? 2 : 1); - $Qsubproduct->setLogging($_SESSION['module'], $products_id); - $Qsubproduct->execute(); - - if ( $lC_Database->isError() ) { - $error = true; - } else { - if ( is_numeric($id) && @in_array($data['sub_products_id'][$i], $data['sub_products_id']) ) { - $sub_products_id = $data['sub_products_id'][$i]; - } else { - $sub_products_id = self::_getLastID(); - } - // subproduct description - foreach ($lC_Language->getAll() as $l) { - if (is_numeric($id) && @in_array($data['sub_products_id'][$i], $data['sub_products_id'])) { - $Qpd = $lC_Database->query('update :table_products_description set products_name = :products_name where products_id = :products_id and language_id = :language_id'); - } else { - $Qpd = $lC_Database->query('insert into :table_products_description (products_id, language_id, products_name) values (:products_id, :language_id, :products_name)'); - } - $Qpd->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION); - $Qpd->bindInt(':products_id', $sub_products_id); - $Qpd->bindInt(':language_id', $l['id']); - $Qpd->bindValue(':products_name', $data['sub_products_name'][$i]); - $Qpd->setLogging($_SESSION['module'], $sub_products_id); - $Qpd->execute(); - - if ( $lC_Database->isError() ) { - $error = true; - break; - } - } - } - - //subproduct images - if ( $error === false ) { - if (empty($_FILES['sub_products_image']['name'][$i]) === false) { - $images = array(); - $file = array('name' => $_FILES['sub_products_image']['name'][$i], - 'type' => $_FILES['sub_products_image']['type'][$i], - 'size' => $_FILES['sub_products_image']['size'][$i], - 'tmp_name' => $_FILES['sub_products_image']['tmp_name'][$i]); - - $products_image = new upload($file); - - $products_image->set_extensions(array('gif', 'jpg', 'jpeg', 'png')); - - if ( $products_image->exists() ) { - $products_image->set_destination(realpath('../images/products/originals')); - - if ( $products_image->parse() && $products_image->save() ) { - $images[] = $products_image->filename; - } - } - - $default_flag = 1; - - foreach ($images as $image) { - $Qimage = $lC_Database->query('insert into :table_products_images (products_id, image, default_flag, sort_order, date_added) values (:products_id, :image, :default_flag, :sort_order, :date_added)'); - $Qimage->bindTable(':table_products_images', TABLE_PRODUCTS_IMAGES); - $Qimage->bindInt(':products_id', $sub_products_id); - $Qimage->bindValue(':image', $image); - $Qimage->bindInt(':default_flag', $default_flag); - $Qimage->bindInt(':sort_order', 0); - $Qimage->bindRaw(':date_added', 'now()'); - $Qimage->setLogging($_SESSION['module'], $products_id); - $Qimage->execute(); - - if ( $lC_Database->isError() ) { - $error = true; - } else { - foreach ($lC_Image->getGroups() as $group) { - if ($group['id'] != '1') { - $lC_Image->resize($image, $group['id']); - } - } - } - $default_flag = 0; - } - } - } - } - } - } - - // combo variants - if ( $error === false ) { - $variants_array = array(); - $default_variant_combo = null; - - if ( isset($data['variants']) && !empty($data['variants']) ) { - foreach ( $data['variants'] as $key => $combo ) { - if (isset($data['variants'][$key]['product_id']) && $data['variants'][$key]['product_id'] != 0) { - $Qsubproduct = $lC_Database->query('update :table_products set products_quantity = :products_quantity, products_cost = :products_cost, products_price = :products_price, products_msrp = :products_msrp, products_model = :products_model, products_sku = :products_sku, products_weight = :products_weight, products_weight_class = :products_weight_class, products_status = :products_status, products_tax_class_id = :products_tax_class_id where products_id = :products_id'); - $Qsubproduct->bindInt(':products_id', $data['variants'][$key]['product_id']); - } else { - $Qsubproduct = $lC_Database->query('insert into :table_products (parent_id, products_quantity, products_cost, products_price, products_msrp, products_model, products_sku, products_weight, products_weight_class, products_status, products_tax_class_id, products_date_added) values (:parent_id, :products_quantity, :products_cost, :products_price, :products_msrp, :products_model, :products_sku, :products_weight, :products_weight_class, :products_status, :products_tax_class_id, :products_date_added)'); - $Qsubproduct->bindInt(':parent_id', $products_id); - $Qsubproduct->bindRaw(':products_date_added', 'now()'); - } - - $price = 0.00; - if (is_array($data['variants'][$key]['price'])) $price = $data['variants'][$key]['price'][0]; - - $Qsubproduct->bindTable(':table_products', TABLE_PRODUCTS); - $Qsubproduct->bindInt(':products_quantity', $data['variants'][$key]['qoh']); - $Qsubproduct->bindFloat(':products_cost', $data['variants'][$key]['cost']); - $Qsubproduct->bindFloat(':products_price', $price); - $Qsubproduct->bindFloat(':products_msrp', $data['variants'][$key]['msrp']); - $Qsubproduct->bindValue(':products_model', $data['variants'][$key]['model']); - $Qsubproduct->bindValue(':products_sku', $data['variants'][$key]['sku']); - $Qsubproduct->bindFloat(':products_weight', $data['variants'][$key]['weight']); - $Qsubproduct->bindInt(':products_weight_class', $data['weight_class']); - $Qsubproduct->bindInt(':products_status', $data['variants'][$key]['status']); - $Qsubproduct->bindInt(':products_tax_class_id', $data['tax_class_id']); - $Qsubproduct->setLogging($_SESSION['module'], $products_id); - $Qsubproduct->execute(); - - if ( isset($data['variants'][$key]['product_id']) && $data['variants'][$key]['product_id'] != '0') { - $subproduct_id = $data['variants'][$key]['product_id']; - } else { - $Qnext = $lC_Database->query('select max(products_id) as maxID from :table_products'); - $Qnext->bindTable(':table_products', TABLE_PRODUCTS); - $Qnext->execute(); - $subproduct_id = $Qnext->valueInt('maxID'); - $Qnext->freeResult(); - } - - if ( $data['variants'][$key]['default_combo'] == 1) { - $default_variant_combo = $subproduct_id; - } - - foreach ( $data['variants'][$key]['values'] as $values_id => $values_text ) { - - $variants_array[$subproduct_id][] = $values_id; - - $check_combos_array[] = $values_id; - - $Qcheck = $lC_Database->query('select products_id from :table_products_variants where products_id = :products_id and products_variants_values_id = :products_variants_values_id'); - $Qcheck->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); - $Qcheck->bindInt(':products_id', $subproduct_id); - $Qcheck->bindInt(':products_variants_values_id', $values_id); - $Qcheck->execute(); - - if ( $Qcheck->numberOfRows() < 1 ) { - - $Qvcombo = $lC_Database->query('insert into :table_products_variants (products_id, products_variants_values_id) values (:products_id, :products_variants_values_id)'); - $Qvcombo->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); - $Qvcombo->bindInt(':products_id', $subproduct_id); - $Qvcombo->bindInt(':products_variants_values_id', $values_id); - $Qvcombo->setLogging($_SESSION['module'], $products_id); - $Qvcombo->execute(); - - if ( $lC_Database->isError() ) { - $error = true; - break 2; - } - } - } - - } - } - - if ( $error === false ) { - if ( empty($variants_array) ) { - $Qcheck = $lC_Database->query('select pv.* from :table_products p, :table_products_variants pv where p.parent_id = :parent_id and p.products_id = pv.products_id'); - $Qcheck->bindTable(':table_products', TABLE_PRODUCTS); - $Qcheck->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); - $Qcheck->bindInt(':parent_id', $products_id); - $Qcheck->execute(); - - while ( $Qcheck->next() ) { - $Qdel = $lC_Database->query('delete from :table_products_variants where products_id = :products_id'); - $Qdel->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); - $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); - $Qdel->execute(); - - $Qdel = $lC_Database->query('delete from :table_products where products_id = :products_id'); - $Qdel->bindTable(':table_products', TABLE_PRODUCTS); - $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); - $Qdel->execute(); - - } - } else { - $Qcheck = $lC_Database->query('select pv.* from :table_products p, :table_products_variants pv where p.parent_id = :parent_id and p.products_id = pv.products_id and pv.products_id not in (":products_id")'); - $Qcheck->bindTable(':table_products', TABLE_PRODUCTS); - $Qcheck->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); - $Qcheck->bindInt(':parent_id', $products_id); - $Qcheck->bindRaw(':products_id', implode('", "', array_keys($variants_array))); - $Qcheck->execute(); - - while ( $Qcheck->next() ) { - $Qdel = $lC_Database->query('delete from :table_products_variants where products_id = :products_id and products_variants_values_id = :products_variants_values_id'); - $Qdel->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); - $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); - $Qdel->bindInt(':products_variants_values_id', $Qcheck->valueInt('products_variants_values_id')); - $Qdel->execute(); - - $Qdel = $lC_Database->query('delete from :table_products where products_id = :products_id'); - $Qdel->bindTable(':table_products', TABLE_PRODUCTS); - $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); - $Qdel->execute(); - - } - - foreach ( $variants_array as $key => $values ) { - $Qdel = $lC_Database->query('delete from :table_products_variants where products_id = :products_id and products_variants_values_id not in (":products_variants_values_id")'); - $Qdel->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); - $Qdel->bindInt(':products_id', $key); - $Qdel->bindRaw(':products_variants_values_id', implode('", "', $values)); - $Qdel->execute(); - } - } - } - - $Qupdate = $lC_Database->query('update :table_products set has_children = :has_children where products_id = :products_id'); - $Qupdate->bindTable(':table_products', TABLE_PRODUCTS); - $Qupdate->bindInt(':has_children', (empty($variants_array)) ? 0 : 1); - $Qupdate->bindInt(':products_id', $products_id); - $Qupdate->execute(); - - } - - if ( $error === false ) { - $Qupdate = $lC_Database->query('update :table_products_variants set default_combo = :default_combo where products_id in (":products_id")'); - $Qupdate->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); - $Qupdate->bindInt(':default_combo', 0); - $Qupdate->bindRaw(':products_id', implode('", "', array_keys($variants_array))); - $Qupdate->execute(); - - if ( is_numeric($default_variant_combo) ) { - $Qupdate = $lC_Database->query('update :table_products_variants set default_combo = :default_combo where products_id = :products_id'); - $Qupdate->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); - $Qupdate->bindInt(':default_combo', 1); - $Qupdate->bindInt(':products_id', $default_variant_combo); - $Qupdate->execute(); - } - } - - // customer access levels (B2B) - if ( $error === false ) { - $levels = ''; - if (is_array($data['access_levels'])) { - foreach($data['access_levels'] as $key => $val) { - $levels .= $key . ';'; - } - $levels = substr($levels, 0, -1); - } - - $Qupdate = $lC_Database->query('update :table_products set access_levels = :access_levels where products_id = :products_id'); - $Qupdate->bindTable(':table_products', TABLE_PRODUCTS); - $Qupdate->bindValue(':access_levels', $levels); - $Qupdate->bindInt(':products_id', $products_id); - $Qupdate->execute(); - } - - return $products_id; // Return the products id for use with the save_close buttons - - } - /* - * Return the product simple options accordian price listing content - * - * @access public - * @return array - */ - public static function getOptionsPricingContent() { - global $lC_Language, $pInfo; - - $content = ''; - $groups = lC_Customer_groups_Admin::getAll(); - foreach($groups['entries'] as $key => $value) { - $content .= '
    ' . $value['customers_group_name'] . '
    ' . - '
    ' . - '
    '; - - if (isset($pInfo) && is_array($pInfo->get('simple_options'))) { - $content .= '
    ' . - '
    ' . $lC_Language->get('text_simple_options') . '
    ' . - ' ' . - ' ' . lC_Products_Admin::getSimpleOptionsPricingTbody($pInfo->get('simple_options'), $value['customers_group_id']) . '' . - '
    ' . - '
    '; - - } - - if (isset($pInfo) && $pInfo->get('has_subproducts') == '1') { - $content .= '
    ' . - '
    ' . $lC_Language->get('text_sub_products') . '
    ' . - ' ' . - ' ' . lC_Products_pro_Admin::getSubProductsPricingTbody($pInfo, $value['customers_group_id']) . '' . - '
    ' . - '
    '; - - } - - if (isset($pInfo) && $pInfo->get('has_children') == '1') { - $content .= '
    ' . - '
    ' . $lC_Language->get('text_combo_options') . '
    ' . - ' ' . - ' ' . lC_Products_pro_Admin::getComboOptionsPricingTbody($pInfo, $value['customers_group_id']) . '' . - '
    ' . - '
    '; - } - - if ( (!isset($pInfo)) || (isset($pInfo) && $pInfo->get('has_subproducts') != '1' && $pInfo->get('has_children') != '1' && !is_array($pInfo->get('simple_options'))) ) { - $content .= '
    ' . $lC_Language->get('text_no_options_defined') . '
    '; - } - - $content .= '
    ' . - '
    '; - } - - return $content; - } - - /* - * Returns the icons used in the product listing - * - * @param integer $id The products id - * @access public - * @return string - */ - public static function getlistingIcons($products_id) { - global $lC_Language; - - $icons = parent::getlistingIcons($products_id); - - if (self::hasSubProducts($products_id)) { - $icons .= ''; - } - if (self::hasComboOptions($products_id)) { - $icons .= ''; - } - - return $icons; - } - /* - * Returns the price info used in the product listing - * - * @param integer $data The product data array - * @access public - * @return string - */ - public function getProductsListingPrice($data) { - global $lC_Database, $lC_Language, $lC_Currencies; - - if (self::hasSubProducts($data['products_id']) === false && self::hasComboOptions($data['products_id']) === false) { - $price = parent::getProductsListingPrice($data); - } else { - $mm = self::getMinMaxPrice($data['products_id']); - $price = ($mm['min'] == $mm['max']) ? $lC_Currencies->format($mm['min']) : '(' . $lC_Currencies->format($mm['min']) . ' - ' . $lC_Currencies->format($mm['max']) . ')'; - } - - return $price; - } - /* - * Returns the min/max price used in the product listing - * - * @param integer $id The product id - * @access public - * @return string - */ - public static function getMinMaxPrice($id) { - global $lC_Database; - - $Qproducts = $lC_Database->query('select MAX(products_price) as max, MIN(products_price) as min from :table_products where parent_id = :parent_id'); - $Qproducts->bindTable(':table_products', TABLE_PRODUCTS); - $Qproducts->bindInt(':parent_id', $id); - $Qproducts->execute(); - - $result = $Qproducts->toArray(); - - $Qproducts->freeResult(); - - return $result; - } - /* - * Returns the price info used in the product listing - * - * @param integer $data The product data array - * @access public - * @return string - */ - public function getProductsListingQty($data) { - global $lC_Database; - - if (self::hasSubProducts($data['products_id']) === false && self::hasComboOptions($data['products_id']) === false) { - $result = $data['products_quantity']; - } else { - $Qproducts = $lC_Database->query('select SUM(products_quantity) as total from :table_products where parent_id = :parent_id'); - $Qproducts->bindTable(':table_products', TABLE_PRODUCTS); - $Qproducts->bindInt(':parent_id', $data['products_id']); - $Qproducts->execute(); - - $result = '(' . $Qproducts->valueInt('total') . ')'; - - $Qproducts->freeResult(); - } - - return $result; - } - /* - * Determine if product has qty price breaks - * - * @param integer $id The product id - * @access public - * @return boolean - */ - public static function hasQPBPricing($id) { - global $lC_Database; - - $Qpb = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id and qty_break != :qty_break limit 1'); - $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpb->bindInt(':products_id', $id); - $Qpb->bindInt(':qty_break', -1); - $Qpb->execute(); - - $rows = $Qpb->numberOfRows(); - - $Qpb->freeResult(); - - if ( $rows > 0 ) { - return true; - } - - return false; - } - /* - * Retrieve qty price breaks - * - * @param integer $id The product id - * @param integer $group The customer group id - * @access public - * @return array - */ - public static function getQPBPricing($id, $group = null) { - global $lC_Database; - - if ($group == null) $group = (defined('DEFAULT_CUSTOMERS_GROUP_ID') && DEFAULT_CUSTOMERS_GROUP_ID != null) ? (int)DEFAULT_CUSTOMERS_GROUP_ID : 1; - - $Qpb = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id and group_id = :group_id and qty_break != :qty_break order by qty_break asc'); - $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpb->bindInt(':products_id', $id); - $Qpb->bindInt(':group_id', $group); - $Qpb->bindInt(':qty_break', -1); - $Qpb->execute(); - - $data = array(); - while($Qpb->next()) { - $data[] = $Qpb->toArray(); - } - - $Qpb->freeResult(); - - return $data; - } - /* - * Return the qty price breaks listing content - * - * @access public - * @return array - */ - public static function getQPBPricingContent() { - global $lC_Language, $lC_Currencies, $pInfo; - - $content = ''; - $groups = lC_Customer_groups_Admin::getAll(); - foreach($groups['entries'] as $key => $value) { - $cnt = 0; - $show_line = false; - if (utility::isB2B()) { - if (count($groups['entries'] > 1) && $cnt != count($groups['entries']) ) $show_line = true; - } else { - if ($value['customers_group_id'] != DEFAULT_CUSTOMERS_GROUP_ID) continue; // locked to default for Pro - } - - $base = (isset($pInfo)) ? (float)$pInfo->get('products_price') : 0.00; - $special = (isset($pInfo)) ? (float)$pInfo->get('products_special_price') : 0.00; - - $has_options = (isset($pInfo) && (self::hasComboOptions($pInfo->get('products_id')) || self::hasSubProducts($pInfo->get('products_id')))) ? true : false; - - $content .= '' . - - '
    ' . - '
    ' . - '
    ' . - ' #' . - ' ' . - '
    ' . - ' Qty'; - if ($has_options === false) { - $content .= '
    ' . - ' ' . $lC_Currencies->getSymbolLeft() . '' . - ' ' . - '
    ' . - ' Price'; - } - $content .= '
    '; - - if ( isset($pInfo) && self::hasQPBPricing($pInfo->get('products_id')) ) { - - $qpbData = self::getQPBPricing($pInfo->get('products_id'), $value['customers_group_id']); - - foreach ($qpbData as $key => $val) { - $content .= self::_getNewQPBPricingRow($val['group_id'], $cnt+1, $val); - $cnt++; - } - // add a new row - $content .= self::_getNewQPBPricingRow($value['customers_group_id'], $cnt+1); - } else { // no qpb recorded, setup new - $content .= self::_getNewQPBPricingRow($value['customers_group_id'], 1); - } - - $content .= '
    '; - - if ($show_line) $content .= '
    '; - - $cnt++; - } - - return $content; - } - /* - * Generate qty price break row - * - * @param integer $group The customer group id - * @param integer $cnt The product id - * @param array $data The product data - * @access private - * @return string - */ - private static function _getNewQPBPricingRow($group, $cnt, $data = array()) { - global $lC_Currencies, $pInfo; - - $has_options = (isset($pInfo) && (self::hasComboOptions($pInfo->get('products_id')) || self::hasSubProducts($pInfo->get('products_id')))) ? true : false; - - $content = '
    ' . - '
    ' . - ' #' . - ' ' . - '
    ' . - ' Qty'; - if ($has_options === false) { - $content .= '
    ' . - ' ' . $lC_Currencies->getSymbolLeft() . '' . - ' ' . - '
    ' . - ' Price'; - } - $content .= ' ' . - '
    '; - - return $content; - } - /* - * Determine if the product has combo options - * - * @param integer $id The product id - * @access public - * @return boolean - */ - public static function hasComboOptions($id) { - global $lC_Database; - - $Qchk = $lC_Database->query('select has_children from :table_products where parent_id = :parent_id and products_id = :products_id limit 1'); - $Qchk->bindTable(':table_products', TABLE_PRODUCTS); - $Qchk->bindInt(':parent_id', 0); - $Qchk->bindInt(':products_id', $id); - $Qchk->execute(); - - return ( $Qchk->valueInt('has_children') === 1 ); - } - /* - * Return the combo options listing content - * - * @param array $options The multi sku options array - * @access public - * @return array - */ - public static function getComboOptionsContent($options = array()) { - $content = ''; - - $content .= self::_getComboOptionsTbody($options); - - return $content; - } - /* - * Return the combo options pricing content - * - * @param array $data The product data object - * @access public - * @return string - */ - public static function getComboOptionsPricingTbody($pInfo, $customers_group_id) { - global $lC_Currencies; - - if ($customers_group_id == '') return false; - - $products_id = (isset($pInfo)) ? $pInfo->get('products_id') : null; - - $hasQPBPricing = self::hasQPBPricing($products_id); - - if (utility::isB2B()) { - $ok = true; - $input_class = null; - $readonly = null; - } else if (utility::isPro()) { - $ok = true; - $input_class = (($customers_group_id == DEFAULT_CUSTOMERS_GROUP_ID) ? null : ' disabled'); - $readonly = (($customers_group_id == '1' && $ok) ? '' : ' READONLY'); - } - - $tbody = ''; - $cnt = 0; - $bpArr = array(); - if (isset($pInfo) && $pInfo->get('has_children') == '1') { - - foreach ($pInfo->get('variants') as $product_id => $val) { - $title = ''; - if (is_array($val['values'])) { - foreach ($val['values'] as $group_id => $value_id) { - foreach ($value_id as $value) { - $title .= $value['value_title'] . ', '; - } - } - } - if (strstr($title, ',')) $title = substr($title, 0, -2); - - if ((isset($title) && $title != NULL)) { - if (isset($pInfo) && $hasQPBPricing && $cnt == 0) { - $qpbData = self::getQPBPricing($pInfo->get('products_id'), $customers_group_id); - $tbody .= '' . - '  ' . - ' Qty 1'; - foreach ($qpbData as $qkey => $qval) { - $bpArr[] = $qval['qty_break']; - $tbody .= ' Qty ' . $qval['qty_break'] . ''; - } - - // added for options w/special price - if (utility::isB2B()) { - $tbody .= ' Special Price'; - } - - $tbody .= ''; - } - - if (utility::isB2B()) { - $default_value = number_format($val['data']['price'], DECIMAL_PLACES); - } else if (utility::isPro()) { - $default_value = (($customers_group_id == DEFAULT_CUSTOMERS_GROUP_ID) ? number_format($val['data']['price'], DECIMAL_PLACES) : number_format(0, DECIMAL_PLACES)); - } - - $tbody .= '' . - ' ' . $title . ''; - - $tbody .= self::_getNewQPBPricingCol($product_id, $customers_group_id, $bpArr); - - // added for options w/special price - if (utility::isB2B()) { - $tbody .= self::_getNewSpecialPricingCol($product_id, $customers_group_id); - } - - $tbody .= ''; - - $cnt++; - } - } - } - - return $tbody; - } - /* - * Generate special price column - * - * @param integer $group The customer group id - * @param integer $cnt The product id - * @param array $data The product data - * @access private - * @return string - */ - private static function _getNewSpecialPricingCol($product_id, $group_id) { - global $lC_Currencies; - - $content .= ' ' . - '
    ' . - ' ' . $lC_Currencies->getSymbolLeft() . '' . - ' ' . - '
    ' . - ' '; - - return $content; - } - /* - * Generate qty price break column - * - * @param integer $group The customer group id - * @param integer $cnt The product id - * @param array $data The product data - * @access private - * @return string - */ - private static function _getNewQPBPricingCol($product_id, $group_id, $bpArr) { - global $lC_Currencies, $lC_Database, $pInfo; - - $content = ''; - if (is_array($bpArr)) { - - $content .= ' ' . - '
    ' . - ' ' . $lC_Currencies->getSymbolLeft() . '' . - ' ' . - '
    ' . - ' '; - - $cnt = 0; - reset($bpArr); - foreach($bpArr as $qty_break) { - - $Qpb = $lC_Database->query('select price_break from :table_products_pricing where products_id = :products_id and group_id = :group_id and qty_break = :qty_break limit 1'); - $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpb->bindInt(':products_id', $product_id); - $Qpb->bindInt(':group_id', $group_id); - $Qpb->bindInt(':qty_break', $qty_break); - $Qpb->execute(); - - if ($Qpb->numberOfRows() > 0) { - $default_value = number_format($Qpb->valueDecimal('price_break'), DECIMAL_PLACES); - } else { - $default_value = number_format(0, DECIMAL_PLACES); - } - - $Qpb-> freeResult(); - - $content .= ' ' . - '
    ' . - ' ' . $lC_Currencies->getSymbolLeft() . '' . - ' ' . - '
    ' . - ' '; - $cnt++; - } - } - - return $content; - } - /* - * Return the product simple options tbody content - * - * @param array $options The product simple options array - * @access public - * @return string - */ - private static function _getComboOptionsTbody($options) { - global $lC_Currencies, $lC_Language; - - $tbody = ''; - $sort = 10; - $cnt = 0; - if (isset($options) && !empty($options)) { - foreach ($options as $product_id => $mso) { - $combo = ''; - $default = ''; - $module = ''; - $comboInput = ''; - if (is_array($mso['values'])) { - foreach ($mso['values'] as $group_id => $value_id) { - foreach ($value_id as $key => $data) { - $combo .= $data['value_title'] . ', '; - $module = $data['module']; - $default = $data['default']; - $default_visual = $data['default_visual']; - $comboInput .= ''; - $comboInput .= ''; - } - } - if (strstr($combo, ',')) $combo = substr($combo, 0, -2); - - $statusIcon = (isset($mso['data']['status']) && $mso['data']['status'] == '1') ? '' : ''; - $defaultIcon = (isset($default) && $default == '1') ? '' : ''; - - $tbody .= '' . $comboInput . - ' ' . - ' ' . $combo . '' . - ' ' . $defaultIcon . '' . - ' -
    - - ' . lC_Weight::getCode(SHIPPING_WEIGHT_UNIT) . ' -
    - ' . - ' ' . - ' ' . - ' -
    - ' . $lC_Currencies->getSymbolLeft() . ' - -
    - ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . $statusIcon . '' . - ' - - - ' . - ''; - } - $sort = ($sort + 10); - $cnt++; - } - } - - return $tbody; - } - /* - * Determine if the product has subproducts - * - * @param integer $id The product id - * @access public - * @return boolean - */ - public static function hasSubProducts($id) { - global $lC_Database; - - $Qchk = $lC_Database->query('select products_id from :table_products where parent_id = :parent_id and is_subproduct > :is_subproduct limit 1'); - $Qchk->bindTable(':table_products', TABLE_PRODUCTS); - $Qchk->bindInt(':parent_id', $id); - $Qchk->bindInt(':is_subproduct', 0); - $Qchk->execute(); - - if ( $Qchk->numberOfRows() === 1 ) { - return true; - } - - return false; - } - /* - * Return the sub products pricing content - * - * @param array $data The product data object - * @access public - * @return string - */ - public static function getSubProductsPricingTbody($pInfo, $customers_group_id) { - global $lC_Currencies; - - if ($customers_group_id == '') return false; - - $products_id = (isset($pInfo)) ? $pInfo->get('products_id') : null; - - $hasQPBPricing = self::hasQPBPricing($products_id); - - if (utility::isB2B()) { - $ok = true; - $input_class = null; - $readonly = null; - } else if (utility::isPro()) { - $ok = true; - $input_class = (($customers_group_id == DEFAULT_CUSTOMERS_GROUP_ID) ? null : ' disabled'); - $readonly = (($customers_group_id == '1' && $ok) ? '' : ' READONLY'); - } - - $tbody = ''; - $cnt = 0; - $bpArr = array(); - - if (isset($pInfo) && $pInfo->get('has_subproducts') == '1') { - foreach ($pInfo->get('subproducts') as $key => $sub) { - if ((isset($sub['products_name']) && $sub['products_name'] != NULL)) { - - if (isset($pInfo) && $hasQPBPricing && $cnt == 0) { - $qpbData = self::getQPBPricing($pInfo->get('products_id'), $customers_group_id); - $tbody .= '' . - '  ' . - ' Qty 1'; - foreach ($qpbData as $qkey => $qval) { - $bpArr[] = $qval['qty_break']; - $tbody .= ' Qty ' . $qval['qty_break'] . ''; - } - - // added for options w/special price - if (utility::isB2B()) { - $tbody .= ' Special Price'; - } - - $tbody .= ''; - } - - $default_value = (isset($sub['products_price']) ? number_format($sub['products_price'], DECIMAL_PLACES) : number_format(0, DECIMAL_PLACES)); - - $tbody .= '' . - ' ' . $sub['products_name'] . ''; - - $tbody .= self::_getNewQPBPricingCol($sub['products_id'], $customers_group_id, $bpArr); - - // added for options w/special price - if (utility::isB2B()) { - $tbody .= self::_getNewSpecialPricingCol($sub['products_id'], $customers_group_id); - } - - $tbody .= ''; - - $cnt++; - } - } - } - - return $tbody; - } - /* - * Get the QPB options product price - * - * @param integer $id The product id - * @access public - * @return boolean - */ - private static function _getQPBOptionPrice($products_id, $group_id, $qty_break) { - global $lC_Database; - - $Qproducts = $lC_Database->query('select price_break from :table_products_pricing where products_id = :products_id and group_id = :group_id and qty_break = :qty_break limit 1'); - $Qproducts->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qproducts->bindInt(':products_id', $products_id); - $Qproducts->bindInt(':group_id', $group_id); - $Qproducts->bindInt(':qty_break', $qty_break); - $Qproducts->execute(); - - $result = 0; - if ($Qproducts->numberOfRows() > 0) { - $result = $Qproducts->valueDecimal('price_break'); - } - - $Qproducts->freeResult(); - - return number_format($result, DECIMAL_PLACES); - } - - /* - * Get the special options product price - * - * @param integer $products_id The product id - * @param integer $group_id The customer group id - * @access public - * @return boolean - */ - private static function _getSpecialOptionPrice($products_id, $group_id) { - global $lC_Database; - - $Qproducts = $lC_Database->query('select special_price from :table_products_pricing where products_id = :products_id and group_id = :group_id and special_status = :special_status limit 1'); - $Qproducts->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qproducts->bindInt(':products_id', $products_id); - $Qproducts->bindInt(':group_id', $group_id); - $Qproducts->bindInt(':special_status', 1); - $Qproducts->execute(); - - $result = 0; - if ($Qproducts->numberOfRows() > 0) { - $result = $Qproducts->valueDecimal('special_price'); - } - - $Qproducts->freeResult(); - - return number_format($result, DECIMAL_PLACES); - } -} \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php deleted file mode 100644 index 4c2e2fc1b..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php +++ /dev/null @@ -1,30 +0,0 @@ - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php deleted file mode 100644 index 8ede8347c..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php +++ /dev/null @@ -1,603 +0,0 @@ - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php deleted file mode 100644 index eb9762b92..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php +++ /dev/null @@ -1,347 +0,0 @@ - -
    - - -
    - -
    - get('button_setup'); ?> - - - - - - - - - - - - - - - - get('variants')) : null); ?> -
     get('table_heading_option_set_name'); ?> get('table_heading_weight'); ?>get('table_heading_sku'); ?>get('table_heading_qoh'); ?>get('table_heading_price'); ?>get('table_heading_img'); ?>get('table_heading_status'); ?>get('table_heading_action'); ?>
    -
    - -
    - - - - - - - - - - - - - - -
    get('table_heading_name'); ?>get('table_heading_status'); ?>get('table_heading_weight'); ?>get('table_heading_sku'); ?>get('table_heading_qoh'); ?>get('table_heading_base_price'); ?>get('table_heading_img'); ?>get('table_heading_action'); ?>
    -
    - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php deleted file mode 100644 index af9a472c2..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php +++ /dev/null @@ -1,143 +0,0 @@ - -
    - - get('info_bubble_pricing_qty_price_breaks'), null, 'info-spot on-left grey margin-left'); ?> - -
    -     -
    - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml deleted file mode 100644 index 105dfd5e7..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - Categories Save - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php'));]]> - - - - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml deleted file mode 100644 index 496b547ae..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Modify Customers Listing Page - 1.0.0 - 2.3.2 - loadedcommerce.com - - - get('icon_login_as_customer') . ' (PRO)">]]> - value('customers_email_address')) . '" class="button icon-monitor with-tooltip' . ((int)($_SESSION['admin']['access'][$_module] < 4) ? ' disabled' : NULL) . '" title="' . $lC_Language->get('icon_login_as_customer') . '">]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml deleted file mode 100644 index 41ee6411f..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Add Pro DB Tables - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml deleted file mode 100644 index dd08bab59..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - extend products save() - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/products/classes/products.php')); if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php'));]]> - - - _module]) && is_numeric($_GET[$this->_module]) ? $_GET[$this->_module] : null), $data);]]> - _module]) && is_numeric($_GET[$this->_module]) ? $_GET[$this->_module] : null), $data); } else { $id = (int)lC_Products_pro_Admin::save((isset($_GET[$this->_module]) && is_numeric($_GET[$this->_module]) ? $_GET[$this->_module] : null), $data); }]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml deleted file mode 100644 index 38c0134f4..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - After Image Groups, add Product Classes - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - loadIniFile(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php', null, null, true);]]> - $lC_Template->setSubOf('product_settings'); - - - - '?image_groups'),]]> - 'classes.png', - 'title' => $lC_Language->get('access_product_classes_title'), - 'identifier' => '?product_classes'), ]]> - - - - - 0) { $ok = TRUE;]]> - 0) { $ok = TRUE;]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml deleted file mode 100644 index 4ea50ef92..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - Enable Multi SKU Inv Control - 1.0.0 - 2.3.2 - loadedcommerce.com - - - get('text_multi_sku'); ?>" upselldesc="get('text_multi_sku_desc'); ?>" for="ic_radio_2" class="upsellinfo disabled oicb button red-activegetInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> - getInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> - - - get('text_multi_sku') . '' . lc_go_pro() . ''; ?>]]> - get('text_multi_sku'); ?>]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml deleted file mode 100644 index f98547c16..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - Enable Pro on Images Tab - 1.0.0 - 2.3.2 - loadedcommerce.com - - - get('text_additional_images'); ?>]]> - get('text_additional_images'); ?>]]> - - - ]]> -
    get('subsection_original_images'); ?>
    get('subsection_images'); ?>
    ]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml deleted file mode 100644 index 22a99b369..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - Enable Pro on Options Tab - 1.0.0 - 2.3.2 - loadedcommerce.com - - - get('text_multi_sku'); ?>" upselldesc="get('text_multi_sku_desc'); ?>" for="ioc_radio_2" class="upsellinfo disabled oicb button red-activegetInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> - getInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> - - - get('text_multi_sku') . '' . lc_go_pro() . ''; ?>]]> - get('text_multi_sku'); ?>]]> - - - ]]> - ]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml deleted file mode 100644 index 4e12adc5d..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - QPB Pricing - 1.0.0 - 2.3.2 - loadedcommerce.com - - - ]]> - ]]> - - - ]]> - ]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml deleted file mode 100644 index 920126449..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - Products Class - 1.0.0 - 2.3.2 - loadedcommerce.com - - - valueInt('products_id'));]]> - valueInt('products_id'));]]> - - - toArray());]]> - toArray());]]> - - - toArray());]]> - toArray());]]> - - - - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/products/classes/products.php')); if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php'));]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml deleted file mode 100644 index 83959d3d1..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hide Pro Template Pack - 1.0.0 - 2.3.2 - loadedcommerce.com - - - $type ) {]]> - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_file_upload.inc.php b/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_file_upload.inc.php deleted file mode 100644 index 9187ab10e..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_file_upload.inc.php +++ /dev/null @@ -1,59 +0,0 @@ - $val) { - if (isset($val['group_title']) && empty($val['group_title']) === false) { - $group_title = $val['group_title']; - break; - } - } - - $string = '
    ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - '
    '; - - reset($data); - $cnt = 0; - foreach($data as $key => $val) { - $price_ind = ((float)$val['price_modifier'] < 0.00) ? '-' : '+'; - $price_formatted = ((float)$val['price_modifier'] != 0.00) ? $price_ind . $lC_Currencies->format(number_format($val['price_modifier'], DECIMAL_PLACES), $lC_Currencies->getCode()) : null; - $options[$val['value_id']] = $val['price_modifier']; - $group_id = $val['group_id']; - $group_title = $val['group_title']; - - $string .= '
    ' . - ' ' . - '
    '; - $cnt++; - } - - $string .= '
    ' . - '
    '; - - } else { - - $string = '
    '; - $cnt = 0; - foreach ( $data['data'] as $field ) { - $string .= '
    ' . - ' ' . - ' ' . - ' ' . - ' ' . - '
    '; - $cnt++; - } - $string .= '
    '; - } -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_multiple_file_upload.inc.php b/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_multiple_file_upload.inc.php deleted file mode 100644 index 3b8400312..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_multiple_file_upload.inc.php +++ /dev/null @@ -1,59 +0,0 @@ - $val) { - if (isset($val['group_title']) && empty($val['group_title']) === false) { - $group_title = $val['group_title']; - break; - } - } - - $string = '
    ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - '
    '; - - reset($data); - $cnt = 0; - foreach($data as $key => $val) { - $price_ind = ((float)$val['price_modifier'] < 0.00) ? '-' : '+'; - $price_formatted = ((float)$val['price_modifier'] != 0.00) ? $price_ind . $lC_Currencies->format(number_format($val['price_modifier'], DECIMAL_PLACES), $lC_Currencies->getCode()) : null; - $options[$val['value_id']] = $val['price_modifier']; - $group_id = $val['group_id']; - $group_title = $val['group_title']; - - $string .= '
    ' . - ' ' . - '
    '; - $cnt++; - } - - $string .= '
    ' . - '
    '; - - } else { - - $string = '
    '; - $cnt = 0; - foreach ( $data['data'] as $field ) { - $string .= '
    ' . - ' ' . - ' ' . - ' ' . - ' ' . - '
    '; - $cnt++; - } - $string .= '
    '; - } -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php deleted file mode 100644 index 7dc443b88..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php +++ /dev/null @@ -1,12 +0,0 @@ -# $Id: product_classes.php v1.0 2013-01-01 datazen $ -# -# LoadedCommerce, Innovative eCommerce Solutions -# http://www.loadedcommerce.com -# -# Copyright (c) 2013 Loaded Commerce, LLC -# -# @author LoadedCommerce Team -# @copyright (c) 2013 LoadedCommerce Team -# @license http://loadedcommerce.com/license.html - -access_product_classes_title = Product Classes \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php deleted file mode 100644 index c0acd0786..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php +++ /dev/null @@ -1,12 +0,0 @@ -# $Id: product_classes.php v1.0 2013-01-01 datazen $ -# -# LoadedCommerce, Innovative eCommerce Solutions -# http://www.loadedcommerce.com -# -# Copyright (c) 2013 Loaded Commerce, LLC -# -# @author LoadedCommerce Team -# @copyright (c) 2013 LoadedCommerce Team -# @license http://loadedcommerce.com/license.html - -product_attributes_product_classes_title = Product Classes \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php deleted file mode 100644 index c15fcc747..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: product_classes.php v1.0 2011-11-04 datazen $ -# -# LoadedCommerce, Innovative eCommerce Solutions -# http://www.loadedcommerce.com -# -# Copyright (c) 2011 LoadedCommerce.com -# -# @author LoadedCommerce Team -# @copyright (c) 2011 LoadedCommerce Team -# @license http://loadedcommerce.com/license.html - -heading_title = Product Classes - -access_product_classes_title = Product Classes - -table_heading_name = Name -table_heading_comment = Comment -table_heading_usage = Usage -table_heading_action = Action - -modal_heading_new_class = New Product Class -modal_heading_edit_class = Edit Product Class -modal_heading_delete_class = Delete Product Class - -field_name = Name: -field_comment = Comment: -field_status = Status: -field_set_as_default = Set as Default? - -button_new_class = New Class - -introduction_new_class = Please fill in the following information for the new class. -introduction_edit_class = Please make the necessary changes for this class. -introduction_delete_class = Please verify the removal of this classe. - -delete_error_class_prohibited = Error: The default class cannot be removed. -delete_error_class_in_use_1 = Error: This class is currently assigned to -delete_error_class_in_use_2 = product(s) and cannot be removed. \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php deleted file mode 100644 index 16087e42f..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php +++ /dev/null @@ -1,45 +0,0 @@ -_section = 'dataManagementSettings'; - } - - public function setFunction($value) { - global $lC_Database, $lC_Language; - - $string = ''; - - if (defined('ADDONS_SYSTEM_LOADED_7_PRO_STATUS') && ADDONS_SYSTEM_LOADED_7_PRO_STATUS == '1') { - $Qclass = $lC_Database->query('select id, name from :table_product_classes where language_id = :language_id order by name'); - $Qclass->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); - $Qclass->bindInt(':language_id', $lC_Language->getID()); - $Qclass->execute(); - - $classes = array(); - while ( $Qclass->next() ) { - $classes[] = array('id' => $Qclass->valueInt('id'), - 'text' => $Qclass->value('name')); - } - - if ( !empty($classes) ) { - $string = lc_draw_pull_down_menu('attributes[' . self::getID() . ']', $classes, $value, 'class="select full-width"'); - } - } - - return $string; - } -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/content/account/login.inc.php b/catalog/addons/Loaded_7_Pro/content/account/login.inc.php deleted file mode 100644 index 053cfed2d..000000000 --- a/catalog/addons/Loaded_7_Pro/content/account/login.inc.php +++ /dev/null @@ -1,67 +0,0 @@ -query('select user_password from :table_administrators'); - $Qadmin->bindTable(':table_administrators', TABLE_ADMINISTRATORS); - $Qadmin->execute(); - - $validated = false; - while ( $Qadmin->next()) { - if ( _validateAdminPassword($password, $Qadmin->value('user_password')) ) { - $validated = true; - break; - } - } - - return $validated; -} - -// check for admin session -if (isset($_SESSION['admin_login'])) unset($_SESSION['admin_login']); -if (validateAdminPassword($_POST['password'])) { - $_SESSION['admin_login'] = true; - } - } -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/controller.php b/catalog/addons/Loaded_7_Pro/controller.php deleted file mode 100644 index 069c3eb5c..000000000 --- a/catalog/addons/Loaded_7_Pro/controller.php +++ /dev/null @@ -1,288 +0,0 @@ -modCheck(DIR_FS_CATALOG . 'includes/classes/transport.php')); -if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php')); -if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php')); - -class Loaded_7_Pro extends lC_Addon { // your addon must extend lC_Addon - /* - * Class constructor - */ - public function Loaded_7_Pro() { - global $lC_Language, $lC_Database; - /** - * The addon type (category) - * valid types; payment, shipping, themes, checkout, catalog, admin, reports, connectors, other - */ - $this->_type = 'systems'; - /** - * The addon class name - */ - $this->_code = 'Loaded_7_Pro'; - /** - * The addon title used in the addons store listing - */ - $this->_title = $lC_Language->get('addon_system_pro_title'); - /** - * The addon description used in the addons store listing - */ - $this->_description = $lC_Language->get('addon_system_pro_description'); - /** - * The developers name - */ - $this->_author = 'Loaded Commerce, LLC'; - /** - * The developers web address - */ - $this->_authorWWW = 'http://www.loadedcommerce.com'; - /** - * The addon version - */ - $this->_version = '1.2.0'; - /** - * The Loaded 7 core compatibility version - */ - $this->_compatibility = '7.002.0.0'; // the addon is compatible with this core version and later - /** - * The base64 encoded addon image used in the addons store listing - */ - $this->_thumbnail = lc_image(DIR_WS_CATALOG . 'addons/' . $this->_code . '/images/loaded7_pro.png', $this->_title); - /** - * The addon enable/disable switch - */ - if (defined('INSTALLATION_ID') && INSTALLATION_ID != '') { - // if ($this->_timeToCheck() === true) { - // $this->_enabled = $this->_validateSerial(INSTALLATION_ID); - // if ($this->_enabled) $this->_updateLastChecked(); - // } else { - $this->_enabled = (defined('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS') && @constant('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS') == '1') ? true : false; - // } - // if (!$this->_enabled) { - // $lC_Database->simpleQuery("update " . TABLE_CONFIGURATION . " set configuration_value = '0' where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); - // } else { - // $lC_Database->simpleQuery("update " . TABLE_CONFIGURATION . " set configuration_value = '1' where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); - // } - } else { - $this->_enabled = false; - } - /** - * Automatically install the module - */ - $this->_auto_install = true; - } - /** - * Checks to see if the addon has been installed - * - * @access public - * @return boolean - */ - public function isInstalled() { - return (bool)defined('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); - } - /** - * Install the addon - * - * @access public - * @return void - */ - public function install() { - global $lC_Database; - - if (isset($_SESSION['remove_loaded_7_pro']) && $_SESSION['remove_loaded_7_pro'] == true) { - unset($_SESSION['remove_loaded_7_pro']); - $this->_clearCache(); - } else if (!$this->_checkStatus()) { - $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Enable AddOn', 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS', '1', 'Do you want to enable this addon?', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())"); - $lC_Database->simpleQuery("delete from " . TABLE_TEMPLATES_BOXES . " where modules_group like '%Loaded_7_Pro%'"); - $lC_Database->simpleQuery("insert into " . TABLE_TEMPLATES_BOXES . " (title, code, author_name, author_www, modules_group) values ('Loaded 7 Pro', '" . $this->_type . "', '" . $this->_author . "','" . $this->_authorWWW . "', 'systems|Loaded_7_Pro')"); - // product classes - if (!defined('DEFAULT_PRODUCT_CLASSES_ID')) { - $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'DEFAULT_PRODUCT_CLASSES_ID'"); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'DEFAULT_PRODUCT_CLASSES_ID', '1', '', '6', '0', '', '', now())"); - $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . DB_TABLE_PREFIX . "product_classes` (id int(11) NOT NULL AUTO_INCREMENT,`name` varchar(128) NOT NULL DEFAULT '', `comment` varchar(255) DEFAULT NULL, `status` tinyint(1) NOT NULL DEFAULT '0', language_id int(11) NOT NULL DEFAULT '1', PRIMARY KEY (id)) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci AUTO_INCREMENT=2;"); - $lC_Database->simpleQuery("delete from `" . DB_TABLE_PREFIX . "product_classes` where id = '1'"); - $lC_Database->simpleQuery("insert into `" . DB_TABLE_PREFIX . "product_classes` (id, name, comment, status, language_id) VALUES ('1', 'Common', 'Common Class', 1, 1);"); - $lC_Database->simpleQuery("delete from " . TABLE_TEMPLATES_BOXES . " where code = 'product_classes'"); - $lC_Database->simpleQuery("insert into " . TABLE_TEMPLATES_BOXES . " (title, code, author_name, author_www, modules_group) VALUES ('Product Classes', 'product_classes', 'Loaded Commerce, LLC', 'http://www.loadedcommerce.com', 'product_attributes')"); - $lC_Database->simpleQuery("alter table " . TABLE_PRODUCTS . " ADD `is_subproduct` TINYINT( 1 ) NOT NULL DEFAULT '0'"); - } - // skip shipping - if (!defined('SKIP_CHECKOUT_SHIPPING_PAGE')) { - $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'SKIP_CHECKOUT_SHIPPING_PAGE'"); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Skip Shipping Page', 'SKIP_CHECKOUT_SHIPPING_PAGE', '-1', 'Bypass the checkout shipping page? No shipping will be charged.', 19, 0, NULL, now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); - } - // qty breaks config - if (!defined('PRODUCT_PRICING_QPB_FORMAT')) { - $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'PRODUCT_PRICING_QPB_FORMAT'"); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Price Break Format', 'PRODUCT_PRICING_QPB_FORMAT', 'Range', 'The price break format shown on the product listing pages.', 8, 11, NULL, now(), NULL, 'lc_cfg_set_boolean_value(array(''None'', ''Range'', ''Starts At'', ''Low As''))')"); - } - - $this->_clearCache(); - } - } - /** - * Return the configuration parameter keys an an array - * - * @access public - * @return array - */ - public function getKeys() { - global $lC_Database; - - if (!isset($this->_keys)) { - $this->_keys = array('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); - } - - return $this->_keys; - } - /** - * Remove the addon - * - * @access public - * @return void - */ - public function remove() { - global $lC_Database, $lC_Language; - - if ($this->hasKeys()) { - $Qdel = $lC_Database->query('delete from :table_configuration where configuration_key in (":configuration_key")'); - $Qdel->bindTable(':table_configuration', TABLE_CONFIGURATION); - $Qdel->bindRaw(':configuration_key', implode('", "', $this->getKeys())); - $Qdel->execute(); - } - - if (file_exists(DIR_FS_CATALOG . 'addons/' . $this->_code . '/languages/' . $lC_Language->getCode() . '.xml')) { - foreach ($lC_Language->extractAddonDefinitions(DIR_FS_CATALOG . 'addons/' . $this->_code . '/languages/' . $lC_Language->getCode() . '.xml') as $def) { - $Qdel = $lC_Database->query('delete from :table_languages_definitions where definition_key = :definition_key and content_group = :content_group'); - $Qdel->bindTable(':table_languages_definitions', TABLE_LANGUAGES_DEFINITIONS); - $Qdel->bindValue(':definition_key', $def['key']); - $Qdel->bindValue(':content_group', $def['group']); - $Qdel->execute(); - } - } - // product classes - $lC_Database->simpleQuery("DROP TABLE IF EXISTS `" . DB_TABLE_PREFIX . "product_classes`"); - $lC_Database->simpleQuery("alter table " . TABLE_PRODUCTS . " DROP COLUMN `is_subproduct`"); - $lC_Database->simpleQuery("delete from " . TABLE_TEMPLATES_BOXES . " where modules_group like '%Loaded_7_Pro%'"); - $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'DEFAULT_PRODUCT_CLASSES_ID'"); - $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'SKIP_CHECKOUT_SHIPPING_PAGE'"); - - $_SESSION['remove_loaded_7_pro'] = true; - - $this->_clearCache(); - } - /** - * Clear the cache - * - * @access public - * @return void - */ - private function _clearCache() { - lC_Cache::clear('configuration'); - lC_Cache::clear('languages'); - lC_Cache::clear('addons'); - lC_Cache::clear('vqmoda'); - } - /** - * Check the addon install status - * - * @access public - * @return void - */ - private function _checkStatus() { - $addons = ''; - if (file_exists('../includes/work/cache/addons.cache')) { - $addons = @file_get_contents('../includes/work/cache/addons.cache'); - } - - return (strstr($addons, 'Loaded_7_Pro/controller.php') != '') ? true : false; - } - /** - * Validate the serial is valid and active - * - * @access private - * @return boolean - */ - private function _validateSerial($serial) { - $result = array(); - $validateArr = array('serial' => $serial, - 'storeName' => STORE_NAME, - 'storeEmail' => STORE_OWNER_EMAIL_ADDRESS, - 'storeWWW' => HTTP_SERVER . DIR_WS_HTTP_CATALOG); - - $checksum = hash('sha256', json_encode($validateArr)); - $validateArr['checksum'] = $checksum; - - $resultXML = transport::getResponse(array('url' => 'https://api.loadedcommerce.com/1_0/check/serial/?product=pro', 'method' => 'post', 'parameters' => $validateArr)); - $result = utility::xml2arr($resultXML); - - if ($result['data']['error'] == '1') return false; - - return ($result['data']['valid'] == '1') ? true : false; - } - /** - * Check to see if it's time to re-check addon validity - * - * @access private - * @return boolean - */ - private function _timeToCheck() { - global $lC_Database; - - $itsTime = false; - - $today = substr(lC_DateTime::getShort(@date("Y-m-d H:m:s")), 3, 2); - - $instID = (defined('INSTALLATION_ID') && INSTALLATION_ID != '') ? INSTALLATION_ID : NULL; - if ($instID == NULL) return true; - - $last_checked = (isset($_SESSION['Loaded_7_Pro']['last_checked']) && $_SESSION['Loaded_7_Pro']['last_checked'] != NULL) ? $_SESSION['Loaded_7_Pro']['last_checked'] : NULL; - - if ($last_checked == NULL || $today != substr(lC_DateTime::getShort($last_checked), 3, 2)) { - - $itsTime = true; - - $Qcheck = $lC_Database->query('select last_modified from :table_configuration where configuration_key = :configuration_key'); - $Qcheck->bindTable(':table_configuration', TABLE_CONFIGURATION); - $Qcheck->bindValue(':configuration_key', 'ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); - $Qcheck->execute(); - - $last_checked = $Qcheck->value('last_modified'); - $_SESSION['Loaded_7_Pro']['last_checked'] = $last_checked; - - $Qcheck->freeResult(); - } - - return $itsTime; - } - /** - * Update the time last checked the install ID - * - * @access private - * @return void - */ - private function _updateLastChecked() { - global $lC_Database; - - $Qcheck = $lC_Database->query('update :table_configuration set last_modified = :last_modified where configuration_key = :configuration_key'); - $Qcheck->bindTable(':table_configuration', TABLE_CONFIGURATION); - $Qcheck->bindValue(':configuration_key', 'ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); - $Qcheck->bindRaw(':last_modified', 'now()'); - $Qcheck->execute(); - } -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml b/catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml deleted file mode 100644 index 832693dfd..000000000 --- a/catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Admin Login as Customer - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml b/catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml deleted file mode 100644 index 73ae92ab2..000000000 --- a/catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - File Upload - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml b/catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml deleted file mode 100644 index f276868ca..000000000 --- a/catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Multiple File Upload - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/images/loaded7_pro.png b/catalog/addons/Loaded_7_Pro/images/loaded7_pro.png deleted file mode 100644 index 5529704c677ed7ee1095f75c7e7b683aa705f6cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3708 zcmaJ^dpy(o{~xkkBT7iDxus!-O&@$2`wy)TdF^Z9zdU$56cpC}tEGhqQ~0RR9Xj5WvDaz-1@ zi{=AzzKhDbEY2XsFmYtqQQa5;cp3>{NTj-wKv*)~on%YG6EFF-kk9}C57^V*k>Q9t zfg(`J>i8XudLY@C!{&(T2m0a(-XsRdmE`V8(FM;}R)ayFL|yP{I8FoSYfSR+G!LSY z?1HT92|?ZjBoVBy2SNv;I09r60}l!$`%vhpKwa=JT@+`&vke7Uty zjHxsd2(GTBM$mx4KnR37OdF0sz*Iq+8Zb?$2IoPj!L(6u1WHo}^v?z6M57ViP_`J; ze`0Y~x?m3m!xsgG1_T7C2WY8NY3@)M5{cZ=(9~4pAk^rWC=7g{8ig+ZTLD9&6KI~k z3{NTrw4;c3rTQ~;!5pXmIRe@DUs($MpEPk21`WjfLSgC}J4gBr#NqybD4F~(n$EB# z{nzjRDNMJ&YUuu?8G&qyaP3#=u}ET1YK8{Fo^m zW`xny#F!W(eseKYfkwi45QOTfRM@D)6(TkzU zANBs>694GM(DaX7D8~$Rr?CI4(7(4h-Lo_Ow{1C#e;c1f;dDEV)7FjF#xVeZzycOy zXdgH*>->Xm*Smjf_`UiWN6iauUK)L>Sf1wwT`Ig?+BFJ1<=UMs&>#0>tt^he?@$QA zY#yj7$7QA=xWw*;E5w!(jm{WpGFahXP1i37q57S3c;xorgX@z&_Z>=<*-K?vQahWxi{vH3KX>FI;vi4 z2R3@$-n@n3Hbw6-uGXLb>=IOTrDE{@Ldu;>``V(LG~=;S$r+?a1z}$ww}j^IzTWw= z^0QuqUUG>k;LTT~6s0!_^e5*8XC|=53D+cY)_|F7D~2;)jh0&X=b%uTF;YC6guhyH zV;1+Y(L>jI`gwH+L>|97)bcj@{@;@-Ru2JQ#5+y*49~jVL-MR9NjN^lh2_4M^}@+s zs|9^8qU3m_Hbe-TyHpD3riU9Dw3_N4xwhW~$dz|YMzZWnvajAsckrf`FZXc8Ok~DS zp|~(6kt?Q$H;+9uk0*OPpO<`eJb<*wiPpLOm56G8tQ{5*rr z@BB8Y7C|umu{bwulGqd_tHb-vmBm9aK&ZUiEpN;lg#< z8*=^Zvy#4)3yf174%kZ1^9qcx(Qr@VU-b`lwDU`!0 zMtj*sVcVf|d~CK{XXG9DOi$f2k|39^r%k!X+MJ=hR7s4S^5HbWQy;h?CEaVSkflnO z0nsyd4(H7hLUT7@_l)MN!lt9dvmi-+{=Rx!$38+FY7nGW05AtT_b^20bHif!>cm@! zCvl-Y&D{B=IX5-zE2FmmrRcE#On4*GK|FHqHe~NsFPG!NgJVO*c+tQ``c&uI@a4!1 z-QBOMzhtZbtC%FQrprD1`>ig9B&4!vil5Iy^54^LU5w2V7vfMRZCG*}# z>p^{4&~5bDnQyq`5o3w8p#7&?MEx&kuFp&_)n}SCtGi$>OsOk8IWJe`-C$9{XVBSj z+X=eQHKmTV{Csb@8hD);g@Z8bGl4o8|U+&R3sAgN`c(S@7*V23u938)FCMyu#r78$(w!(jPS(RT( zP1tR2T2rc>*ZrM+$A2=#wQ*DOyfQ=ilW2 zHprA+qVCablzG6r{4nF&uAmn^BNwH0k3W@PuVsEgIU5#9tHkatieg5JxhZ>}3mtPi z*TL;rM`ESi!iu;I@$|_nsmy|vt+QrUbVRd*lE^Gudsy+)Tofv|+TTc5)n04rS>KOk zK3Nn?;kL`s2ui$WS*^d{Q@PL@C*ZwPIT)1^Su0T?nX+@a@r=yLZiO8B=xIM&ZLrWj z_L#Ud_u*g*qke14!-k(7;tS2E6RbM}z90E=nyF!}a+0EW1YP-b-hd^>3SkFzlRw&s z*1;`9`1ILD2}UXXsk779Bm`QA@SyEi+yQ*XV zc0qC-B>iTfNl@?*YS*pQYCr=v!Wui>#m#j`VN?6IaW3XXLx$Pw4S`^@7z1miyzzzX ziy!h+hsG9)2A{`Ojgk9fr+W{?c~qaiKuRSRA5ts3FQcpElzcwPudiTYcbYYt%goMh ztn85j%hpX|21Dyx2B{rt6V^k!DL2m}~ngM1TBnzVKMkf0JCBgZ5+ z?>TYxTZMCf^TF{mrIIU9YEzp2&%HzQ^AVL5{s5xa9Is&K!r(}a>2O@Z;TZ1pdxRkQ zpYL>;(l4t4Xw8vVo2&AMD;i}Ehvx9tUHsIXx5{R76Qv-R0r?`x8+!^Wf!I>5q03wR z2fjER^2|~sFeMvGpjFp)MbMOQlfIpO=Gs;8q%J)mbM#D=WJi)4W}qVyK{ukcQ*My2 z1moGbt}fil<#)|;#_urEE}u6S$6&?N3MT$2+T@44iK}1F#`0>p*jhk=uw|A)i{a+M zK^0hcef3g*>VuLdgwGFnd@UeI@27cw8vi|=`Z)J6)e1e@$6{hI`mE}tI-q|>X2-hyjD5XseQtMGq z_rUFkCNiKK86mRl?N`@ho?Qf6DLU6r;udV=fZ6*%uUs9GsujS`-BWQupG9?51}XILE=moj!LlK8y&Vtz=UE#=VDcEVBl4W#MC8+YNh z^eb9?<YStWW^1|4}sQRD#0^+3cE!cyXOEi>R>Y>z~Q zf>FAr=~EN2^sLGJ*fDKIZ)tsRpIJkb?Q+Ao1-scq&kEKl&`_5+R^`);@_y4Bx()*P zj_!O#w&hl~_m^k>yp2`yuum|qdLu=bjoT!|EV(qw>3m9Gs;E{6Q)rc6xHw+8)!GeR zBq6jn@*AzZan0gZJHSEY{JaR|V_v~VuB`;`E$=Mzw_nk@ZwOu~Fw4wsuj-ubMszK>VkMb$O+LcJDy5(7^ziVnB#uPO+ReXvkD zesq59Q;~&>zT1Y%jmK@k7@xOgu=P0|!agqTZCV`vXg05nPDx;=f-9|4Xv|EyPU*T5 z4-QZr(f;%7h7wOT3~*QUuF#bnz+Jw(*ol+O;& - - - - addon_system_pro_title - - checkout - - - addon_system_pro_description - - checkout - - - text_admin_session_active - - general - - - \ No newline at end of file From 16912973ba3cf2f50ed80a3976cfdf5be9f8a33d Mon Sep 17 00:00:00 2001 From: datazen Date: Fri, 22 Aug 2014 14:54:39 -0400 Subject: [PATCH 121/168] merge-work --- .../b2b_settings/b2b_settings.php | 43 + .../b2b_settings/classes/b2b_settings.php | 316 +++++ .../applications/b2b_settings/classes/rpc.php | 117 ++ .../b2b_settings/js/b2b_settings.php | 14 + .../b2b_settings/modal/delete.php | 91 ++ .../applications/b2b_settings/modal/edit.php | 110 ++ .../applications/b2b_settings/pages/main.php | 219 ++++ .../categories/classes/categories.php | 191 +++ .../applications/categories/classes/rpc.php | 33 + .../categories/modal/batchAccess.php | 88 ++ .../classes/customer_groups.php | 220 ++++ .../products/classes/products.php | 431 +++++++ .../applications/products/classes/rpc.php | 33 + .../products/modal/batchAccess.php | 88 ++ .../tabs/relationships_access_levels.inc.php | 33 + .../Loaded_7_B2B/admin/classes/access.php | 16 + .../admin/hooks/categories_pages_edit.xml | 21 + .../admin/hooks/categories_pages_main.xml | 13 + .../admin/hooks/categories_pages_new.xml | 17 + .../hooks/customer_groups_classes_rpc.xml | 21 + .../hooks/customer_groups_modal_edit.xml | 17 + .../admin/hooks/orders_classes_orders.xml | 75 ++ .../admin/hooks/orders_pages_edit.xml | 29 + .../admin/hooks/orders_pages_invoice.xml | 79 ++ .../admin/hooks/products_pages_main.xml | 13 + .../hooks/products_pages_tabs_pricing.xml | 21 + .../products_pages_tabs_relationships.xml | 13 + .../admin/hooks/templates_default_header.xml | 13 + .../admin/languages/en_US/b2b_settings.php | 55 + .../en_US/modules/access/b2b_settings.php | 12 + .../admin/modules/access/b2b_settings.php | 23 + catalog/addons/Loaded_7_B2B/classes/order.php | 75 ++ .../addons/Loaded_7_B2B/classes/product.php | 182 +++ catalog/addons/Loaded_7_B2B/controller.php | 156 +++ catalog/addons/Loaded_7_B2B/hooks/account.xml | 13 + .../Loaded_7_B2B/hooks/application_bottom.xml | 13 + .../hooks/includes_classes_order.xml | 13 + .../includes_content_checkout_process.xml | 22 + .../hooks/includes_content_index.xml | 13 + .../hooks/modules_actions_cart_add.xml | 13 + .../hooks/modules_boxes_featured_products.xml | 13 + .../hooks/modules_boxes_specials.xml | 13 + .../hooks/modules_boxes_whats_new.xml | 13 + ...odules_content_also_purchased_products.xml | 13 + .../modules_content_featured_products.xml | 13 + .../hooks/modules_content_new_products.xml | 13 + .../modules_recently_visited_products.xml | 17 + .../hooks/modules_upcoming_products.xml | 13 + .../template_content_account_receipt.xml | 43 + ...plates_content_account_account_history.xml | 60 + ...content_checkout_checkout_confirmation.xml | 32 + ...ates_content_checkout_checkout_success.xml | 44 + .../Loaded_7_B2B/images/loaded7_b2b.png | Bin 0 -> 3220 bytes .../Loaded_7_B2B/javascript/general.js.php | 35 + .../addons/Loaded_7_B2B/languages/en_US.xml | 35 + .../categories/classes/categories.php | 124 ++ .../classes/product_classes.php | 219 ++++ .../product_classes/classes/rpc.php | 78 ++ .../product_classes/js/product_classes.js.php | 39 + .../product_classes/modal/delete.php | 94 ++ .../product_classes/modal/edit.php | 117 ++ .../product_classes/modal/new.php | 115 ++ .../product_classes/pages/main.php | 60 + .../product_classes/product_classes.php | 28 + .../products/classes/products.php | 1094 +++++++++++++++++ .../applications/products/classes/rpc.php | 30 + .../products/modal/addComboOption.php | 603 +++++++++ .../pages/tabs/options_subproducts.inc.php | 347 ++++++ .../products/pages/tabs/pricing_qpb.inc.php | 143 +++ .../admin/hooks/categories_save.xml | 17 + .../admin/hooks/customers_listing.xml | 13 + .../admin/hooks/database_tables.xml | 13 + .../admin/hooks/product_actions_save.xml | 17 + .../admin/hooks/product_classes.xml | 28 + .../admin/hooks/product_edit_data.xml | 17 + .../admin/hooks/product_edit_images.xml | 17 + .../admin/hooks/product_edit_options.xml | 26 + .../admin/hooks/product_edit_pricing.xml | 17 + .../admin/hooks/products_class.xml | 25 + .../Loaded_7_Pro/admin/hooks/store_class.xml | 13 + .../inc/modules_variants_file_upload.inc.php | 59 + ...ules_variants_multiple_file_upload.inc.php | 59 + .../en_US/modules/access/product_classes.php | 12 + .../product_attributes/product_classes.php | 12 + .../admin/languages/en_US/product_classes.php | 38 + .../product_attributes/product_classes.php | 45 + .../content/account/login.inc.php | 67 + catalog/addons/Loaded_7_Pro/controller.php | 288 +++++ .../hooks/content_account_login.xml | 13 + .../hooks/modules_variants_file_upload.xml | 13 + .../modules_variants_multiple_file_upload.xml | 13 + .../Loaded_7_Pro/images/loaded7_pro.png | Bin 0 -> 3708 bytes .../addons/Loaded_7_Pro/languages/en_US.xml | 20 + 93 files changed, 7255 insertions(+) create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/b2b_settings.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/b2b_settings.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/rpc.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/js/b2b_settings.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/delete.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/edit.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/rpc.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/categories/modal/batchAccess.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/products/classes/rpc.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/products/modal/batchAccess.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/products/pages/tabs/relationships_access_levels.inc.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/classes/access.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_edit.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_main.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_new.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_classes_rpc.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_modal_edit.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/orders_classes_orders.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_edit.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_invoice.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_main.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_pricing.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_relationships.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/templates_default_header.xml create mode 100644 catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/languages/en_US/modules/access/b2b_settings.php create mode 100644 catalog/addons/Loaded_7_B2B/admin/modules/access/b2b_settings.php create mode 100644 catalog/addons/Loaded_7_B2B/classes/order.php create mode 100644 catalog/addons/Loaded_7_B2B/classes/product.php create mode 100644 catalog/addons/Loaded_7_B2B/controller.php create mode 100644 catalog/addons/Loaded_7_B2B/hooks/account.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/application_bottom.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/includes_content_index.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_actions_cart_add.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_boxes_featured_products.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_boxes_specials.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_boxes_whats_new.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_content_also_purchased_products.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_content_featured_products.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_content_new_products.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_recently_visited_products.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_upcoming_products.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/template_content_account_receipt.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/templates_content_account_account_history.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_confirmation.xml create mode 100644 catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml create mode 100644 catalog/addons/Loaded_7_B2B/images/loaded7_b2b.png create mode 100644 catalog/addons/Loaded_7_B2B/javascript/general.js.php create mode 100644 catalog/addons/Loaded_7_B2B/languages/en_US.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml create mode 100644 catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_file_upload.inc.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_multiple_file_upload.inc.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php create mode 100644 catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php create mode 100644 catalog/addons/Loaded_7_Pro/content/account/login.inc.php create mode 100644 catalog/addons/Loaded_7_Pro/controller.php create mode 100644 catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml create mode 100644 catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml create mode 100644 catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml create mode 100644 catalog/addons/Loaded_7_Pro/images/loaded7_pro.png create mode 100644 catalog/addons/Loaded_7_Pro/languages/en_US.xml diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/b2b_settings.php new file mode 100644 index 000000000..824f788c9 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/b2b_settings.php @@ -0,0 +1,43 @@ +_page_title = $lC_Language->get('heading_title'); + + $action = (isset($_GET['action']) && $_GET['action'] != NULL) ? $_GET['action'] : NULL; + + switch ($action) { + case 'save' : + $data = array('allow_self_register' => (isset($_POST['allow_self_register']) ? $_POST['allow_self_register'] : null), + 'guest_catalog_access' => (isset($_POST['guest_catalog_access']) ? $_POST['guest_catalog_access'] : null)); + + lC_B2b_settings_Admin::save($data); + + lc_redirect_admin(lc_href_link_admin(FILENAME_DEFAULT, $this->_module)); + break; + } + + $b2bInfo = new lC_ObjectInfo(lC_B2b_settings_Admin::get()); + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/b2b_settings.php new file mode 100644 index 000000000..0049bc866 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/b2b_settings.php @@ -0,0 +1,316 @@ +loadIniFile(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/languages/' . $lC_Language->getCode() . '/b2b_settings.php', null, null, true); + + $Qlevels = $lC_Database->query('select * from :table_customers_access order by id'); + $Qlevels->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); + $Qlevels->execute(); + + $result = array('aaData' => array()); + while ( $Qlevels->next() ) { + + $system = ($Qlevels->valueInt('id') == 1 || $Qlevels->valueInt('id') == 2) ? true : false; + + $id = $Qlevels->valueInt('id'); + $level = $Qlevels->value('level') . ''; + $memberArr = self::getCustomerAccessMembers($Qlevels->valueInt('id')); + $members = $memberArr['members']; + $status = '' . (($Qlevels->valueInt('status') == 1) ? '' : '') . ''; + + $action = ' + + ' . (($media === 'mobile-portrait' || $media === 'mobile-landscape') ? NULL : $lC_Language->get('icon_edit')) . ' + + + + + '; + + $result['aaData'][] = array("$id", "$level", "$members", "$status", "$action"); + $result['entries'][] = $Qlevels->toArray(); + } + + $Qlevels->freeResult(); + + return $result; + } + + public static function getCustomerAccessMembers($id) { + global $lC_Database; + + $groups = array(); + + $Qgroups = $lC_Database->query('select customers_group_id, customers_access_levels from :table_customers_groups_data'); + $Qgroups->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); + $Qgroups->execute(); + + while($Qgroups->next()) { + $levelsArr = explode(';', $Qgroups->value('customers_access_levels')); + if (in_array($id, $levelsArr)) $groups[] = $Qgroups->value('customers_group_id'); + } + + $cnt = 0; + foreach($groups as $key => $cgID) { + $Qcustomers = $lC_Database->query('select count(*) as total from :table_customers where customers_group_id = :customers_group_id'); + $Qcustomers->bindTable(':table_customers', TABLE_CUSTOMERS); + $Qcustomers->bindInt(':customers_group_id', $cgID); + $Qcustomers->execute(); + + $cnt = $cnt + $Qcustomers->valueInt('total'); + + $Qcustomers->freeResult(); + } + + return array('members' => $cnt); + } + /* + * Returns the b2b_settings information + * + * @access public + * @return array + */ + public static function get() { + global $lC_Database, $lC_Language, $lC_Currencies; + + $data = array(); + + $Qcfg = $lC_Database->query('select configuration_value from :table_configuration where configuration_key = :configuration_key'); + $Qcfg->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qcfg->bindValue(':configuration_key', 'B2B_SETTINGS_GUEST_CATALOG_ACCESS'); + $Qcfg->execute(); + + $data['B2B_SETTINGS_GUEST_CATALOG_ACCESS'] = $Qcfg->value('configuration_value'); + + $Qcfg->freeResult(); + + $Qcfg = $lC_Database->query('select configuration_value from :table_configuration where configuration_key = :configuration_key'); + $Qcfg->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qcfg->bindValue(':configuration_key', 'B2B_SETTINGS_ALLOW_SELF_REGISTER'); + $Qcfg->execute(); + + $data['B2B_SETTINGS_ALLOW_SELF_REGISTER'] = $Qcfg->value('configuration_value'); + + $Qcfg->freeResult(); + + + + return $data; + } + /* + * Saves the settings information + * + * @param array $data The settings data to save + * @access public + * @return boolean + */ + public static function save($data) { + global $lC_Database; + + if (!is_array($data)) return false; + + $error = false; + + $lC_Database->startTransaction(); + + foreach ($data as $key => $value) { + + $const = 'B2B_SETTINGS_' . strtoupper($key); + + $Qcfg = $lC_Database->query('select configuration_id from :table_configuration where configuration_key = :configuration_key'); + $Qcfg->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qcfg->bindValue(':configuration_key', $const); + $Qcfg->execute(); + + $newValue = ($value == 'on') ? '1' : (string)$value; + + if ( $Qcfg->numberOfRows() === 1 ) { + $Qsettings = $lC_Database->query('update :table_configuration set configuration_value = :configuration_value, last_modified = now() where configuration_key = :configuration_key'); + } else { + $Qsettings = $lC_Database->query('insert into :table_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, date_added) values (:configuration_title, :configuration_key, :configuration_value, :configuration_description, :configuration_group_id, :date_added)'); + $Qsettings->bindValue(':configuration_title', ucwords(str_replace('_', ' ', $key))); + $Qsettings->bindValue(':configuration_description', ucwords(str_replace('_', ' ', $key))); + $Qsettings->bindInt(':configuration_group_id', 10); + $Qsettings->bindRaw(':date_added', 'now()'); + } + $Qsettings->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qsettings->bindValue(':configuration_value', $newValue); + $Qsettings->bindValue(':configuration_key', $const); + $Qsettings->setLogging($_SESSION['module'], $key); + $Qsettings->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + break; + } + } + + if ( $error === false ) { + $lC_Database->commitTransaction(); + lC_Cache::clear('configuration'); + + return true; + } + + $lC_Database->rollbackTransaction(); + + return false; + } + /* + * Update customer access level status + * + * @param int $id The customer access level id + * @param int $val The customer access level status + * @access public + * @return true or false + */ + public static function updateCustomerAccessLevelStatus($id, $val = 0) { + global $lC_Database; + + $Qupdate = $lC_Database->query('update :table_customers_access set status = :status where id = :id'); + $Qupdate->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); + $Qupdate->bindInt(':status', $val); + $Qupdate->bindInt(':id', $id); + $Qupdate->execute(); + + return true; + } + /* + * Save the customer access level information + * + * @param string $level The customer access level to add + * @access public + * @return boolean + */ + public static function addCustomerAccessLevel($level) { + global $lC_Database, $lC_Language; + + $error = false; + + $Qchk = $lC_Database->query('select id from :table_customers_access where level = :level limit 1'); + $Qchk->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); + $Qchk->bindValue(':level', $level); + $Qchk->execute(); + + $rows = $Qchk->numberOfRows(); + + $Qchk->freeResult(); + + if ($rows == 0) { + + $lC_Database->startTransaction(); + + $Qlevel = $lC_Database->query('insert into :table_customers_access (level, status) values (:level, :status)'); + $Qlevel->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); + $Qlevel->bindValue(':level', $level); + $Qlevel->bindInt(':status', 1); + $Qlevel->setLogging($_SESSION['module'], $level); + $Qlevel->execute(); + + if ( $lC_Database->isError() === false ) { + $lC_Database->commitTransaction(); + return true; + } + + $lC_Database->rollbackTransaction(); + + return false; + } else { + return true; + } + } + /* + * Update the customer access level information + * + * @param integer $id The customer access level id to update + * @param array $data The customer access level data + * @access public + * @return boolean + */ + public static function updateCustomerAccessLevels($id, $data) { + global $lC_Database, $lC_Language; + + $error = false; + + $lC_Database->startTransaction(); + + $Qlevel = $lC_Database->query('update :table_customers_access set level = :level, status = :status where id = :id'); + $Qlevel->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); + $Qlevel->bindValue(':level', $data['level']); + $Qlevel->bindInt(':status', (($data['status'] == 'on') ? 1 : 0)); + $Qlevel->bindInt(':id', $id); + $Qlevel->setLogging($_SESSION['module'], $data['level']); + $Qlevel->execute(); + + if ( $lC_Database->isError() === false ) { + $lC_Database->commitTransaction(); + return true; + } + + $lC_Database->rollbackTransaction(); + + return false; + } + /* + * Delete the customer access level record + * + * @param integer $id The customer access level id to delete + * @access public + * @return boolean + */ + public static function deleteCustomerAccessLevel($id) { + global $lC_Database; + + $Qgroups = $lC_Database->query('delete from :table_customers_access where id = :id'); + $Qgroups->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); + $Qgroups->bindInt(':id', $id); + $Qgroups->setLogging($_SESSION['module'], $id); + $Qgroups->execute(); + + if ( $lC_Database->isError() ) { + return false; + } + + return true; + } + /* + * Get the customer access level data + * + * @param integer $id The customer access level id to retrieve + * @access public + * @return array + */ + public static function getCustomerAccessFormData($id) { + global $lC_Database; + + $Qgroups = $lC_Database->query('select * from :table_customers_access where id = :id limit 1'); + $Qgroups->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); + $Qgroups->bindInt(':id', $id); + $Qgroups->execute(); + + $data = $Qgroups->toArray(); + + $Qgroups->freeResult(); + + return $data; + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/rpc.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/rpc.php new file mode 100644 index 000000000..ecb553f19 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/rpc.php @@ -0,0 +1,117 @@ + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/js/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/js/b2b_settings.php new file mode 100644 index 000000000..9135e7cce --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/js/b2b_settings.php @@ -0,0 +1,14 @@ + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/delete.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/delete.php new file mode 100644 index 000000000..94b8401ee --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/delete.php @@ -0,0 +1,91 @@ + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/edit.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/edit.php new file mode 100644 index 000000000..29447397b --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/edit.php @@ -0,0 +1,110 @@ + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php new file mode 100644 index 000000000..f21e0eb49 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php @@ -0,0 +1,219 @@ + + + +
    + +
    +

    getPageTitle(); ?>

    +
    +
    +
    + +
    + + + +
    +
    + +
    + get('heading_guest_access'); ?> +
    +
    +

    + + + get('B2B_SETTINGS_ALLOW_SELF_REGISTER') == '1') ? 'checked="checked" ' : ''); + echo lc_draw_checkbox_field('allow_self_register',null, null, $checked . 'class="switch medium" data-text-on="' . strtoupper($lC_Language->get('button_yes')) . '" data-text-off="' . strtoupper($lC_Language->get('button_no')) . '"'); ?>get('info_bubble_displays_create_account_form'); ?> +

    + +

    + get('label_guest_catalog_access'); ?> + get('info_bubble_guest_catalog_access')); ?> + +

    + +
    +
    +
    + +
    +
    + get('heading_access_group_levels'); ?> + + + + + + + + + + + + + + + + + + +
    get('table_heading_id'); ?>get('table_heading_group'); ?>get('table_heading_members'); ?>get('table_heading_status'); ?>get('table_heading_action'); ?>
    +

    + + + get('button_create_new'); ?> +

    +
    + +
    +
    +
    + + + +
    +
    + +
    +
    +
    +
    +
    +

    + getModule()] < 3) ? '' : ' onclick="validateForm(\'#b2b_settings\');"'); + $close = lc_href_link_admin(FILENAME_DEFAULT, $lC_Template->getModule()); + button_save_close($save, false, $close); + ?> +

    +
    +
    +
    +
    + + + +
    +
    +loadModal($lC_Template->getModule()); ?> + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php b/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php new file mode 100644 index 000000000..f9f64bd50 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php @@ -0,0 +1,191 @@ +modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php')); +include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/classes/category_tree.php')); + +class lC_Categories_b2b_Admin extends lC_Categories_pro_Admin { + /* + * Save the category record + * + * @param integer $id The category id on update, null on insert + * @param array $data The category information + * @access public + * @return boolean + */ + public static function save($id = null, $data) { + global $lC_Database, $lC_Language, $lC_CategoryTree; + + $category_id = lC_Categories_pro_Admin::save($id, $data); + + $error = false; + + $lC_Database->startTransaction(); + + $levels = ''; + if (is_array($data['access_levels'])) { + foreach ($data['access_levels'] as $key => $val) { + $levels .= $key . ';'; + } + $levels = substr($levels, 0, -1); + } + + $Qcat = $lC_Database->query('update :table_categories set `access_levels` = :access_levels where `categories_id` = :categories_id'); + $Qcat->bindTable(':table_categories', TABLE_CATEGORIES); + $Qcat->bindInt(':categories_id', $category_id); + $Qcat->bindValue(':access_levels', $levels); + $Qcat->setLogging($_SESSION['module'], $category_id); + $Qcat->execute(); + + if ( !$lC_Database->isError()) { + $syncAllProducts = (isset($data['sync_all_products']) && $data['sync_all_products'] == 'on') ? true: false; + $syncAllChildren = (isset($data['sync_all_children']) && $data['sync_all_children'] == 'on') ? true: false; + + if ($syncAllProducts || $syncAllChildren) { + $lC_CategoryTree = new lC_CategoryTree_Admin(); + $catArr = $lC_CategoryTree->getArray($category_id); + + foreach ($catArr as $value) { + $catID = end(explode('_', $value['id'])); + if ($syncAllChildren) self::_updateCategoryAccessLevels($catID, $levels); + if ($syncAllProducts) self::_updateProductAccessLevels($catID, $levels); + } + } + } + + if ( !$lC_Database->isError() ) { + $lC_Database->commitTransaction(); + lC_Cache::clear('categories'); + + return $category_id; // used for the save_close buttons + } + + $lC_Database->rollbackTransaction(); + + return false; + } + /* + * Update the product access levels + * + * @param integer $category_id The parent category id + * @param string $levels The access levels + * @access public + * @return boolean + */ + protected static function _updateProductAccessLevels($category_id, $levels) { + global $lC_Database; + + // get all product_id's assigned to $category_id + $Qp2c = $lC_Database->query('select products_id from :table_products_to_categories where `categories_id` = :categories_id'); + $Qp2c->bindTable(':table_products_to_categories', TABLE_PRODUCTS_TO_CATEGORIES); + $Qp2c->bindInt(':categories_id', $category_id); + $Qp2c->setLogging($_SESSION['module'], $category_id); + $Qp2c->execute(); + + $lC_Database->startTransaction(); + + if ( !$lC_Database->isError()) { + while($Qp2c->next()) { + $Qproducts = $lC_Database->query('update :table_products set `access_levels` = :access_levels where `products_id` = :products_id'); + $Qproducts->bindTable(':table_products', TABLE_PRODUCTS); + $Qproducts->bindInt(':products_id', $Qp2c->valueInt('products_id')); + $Qproducts->bindvalue(':access_levels', $levels); + $Qproducts->setLogging($_SESSION['module'], $category_id); + $Qproducts->execute(); + } + } + + $Qp2c->freeResult(); + + if ( !$lC_Database->isError() ) { + $lC_Database->commitTransaction(); + return true; + } + + $lC_Database->rollbackTransaction(); + + return false; + } + /* + * Update the category access levels + * + * @param integer $category_id The parent category id + * @param string $levels The access levels + * @access public + * @return boolean + */ + protected static function _updateCategoryAccessLevels($category_id, $levels) { + global $lC_Database; + + $lC_Database->startTransaction(); + + $Qcat = $lC_Database->query('update :table_categories set `access_levels` = :access_levels where `categories_id` = :categories_id'); + $Qcat->bindTable(':table_categories', TABLE_CATEGORIES); + $Qcat->bindInt(':categories_id', $category_id); + $Qcat->bindValue(':access_levels', $levels); + $Qcat->setLogging($_SESSION['module'], $category_id); + $Qcat->execute(); + + if ( !$lC_Database->isError() ) { + $lC_Database->commitTransaction(); + return true; + } + + $lC_Database->rollbackTransaction(); + + return false; + } + /* + * Batch update the category access levels + * + * @param integer $category_id The parent category id + * @param string $levels The access levels + * @access public + * @return boolean + */ + public static function batchEditAccess($data) { + global $lC_Database, $lC_CategoryTree; + + $levels = ''; + if (is_array($data['access_levels'])) { + foreach ($data['access_levels'] as $key => $val) { + $levels .= $key . ';'; + } + $levels = substr($levels, 0, -1); + } + + $syncAllProducts = (isset($data['sync_all_products']) && $data['sync_all_products'] == 'on') ? true: false; + $syncAllChildren = (isset($data['sync_all_children']) && $data['sync_all_children'] == 'on') ? true: false; + + foreach ( $data['batch'] as $category_id ) { + + self::_updateCategoryAccessLevels($category_id, $levels); + + if ($syncAllProducts || $syncAllChildren) { + // get the children categories + $lC_CategoryTree = new lC_CategoryTree_Admin(); + $catArr = $lC_CategoryTree->getArray($category_id); + + foreach ($catArr as $value) { + $catID = end(explode('_', $value['id'])); + if ($syncAllChildren) self::_updateCategoryAccessLevels($catID, $levels); + if ($syncAllProducts) self::_updateProductAccessLevels($catID, $levels); + } + } + } + + return true; + } +} \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/rpc.php b/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/rpc.php new file mode 100644 index 000000000..6a42ef319 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/rpc.php @@ -0,0 +1,33 @@ + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/categories/modal/batchAccess.php b/catalog/addons/Loaded_7_B2B/admin/applications/categories/modal/batchAccess.php new file mode 100644 index 000000000..419376b40 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/categories/modal/batchAccess.php @@ -0,0 +1,88 @@ +modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); + +global $lC_Language, $lC_Template; +?> + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php b/catalog/addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php new file mode 100644 index 000000000..9cc03977c --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php @@ -0,0 +1,220 @@ +modCheck(DIR_FS_ADMIN . 'includes/applications/customer_groups/classes/customer_groups.php')); + +class lC_Customer_groups_b2b_Admin extends lC_Customer_groups_Admin { + + /* + * Return the data used on the dialog forms + * + * @param integer $id The customer groups id + * @param boolean $edit True = called from edit dialog else called from delete dialog + * @access public + * @return array + */ + public static function getFormData($id = null, $edit = false) { + global $lC_Database, $lC_Language, $lC_Addons; + + $result = parent::getFormData($id, $edit); + + // get the access levels + $Qlevels = $lC_Database->query('select * from :table_customers_access where status = :status'); + $Qlevels->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); + $Qlevels->bindInt(':status', 1); + $Qlevels->execute(); + + $accessHtml = ''; + $levels = array(); + if (is_array($result['cgData'])) { + $levels = explode(';', $result['cgData']['customers_access_levels']); + } + + while ($Qlevels->next()) { + $checked = ( (in_array($Qlevels->valueInt('id'), $levels)) ? ' checked="checked" ' : '' ); + $accessHtml .= '
    '; + } + + $Qlevels->freeResult(); + + // get the payment/shipping addons for the group + $paymentHtml = ''; + $shippingHtml = ''; + foreach($lC_Addons->getAddons('enabled') as $name => $data) { + if ($data['type'] == 'payment' || $data['type'] == 'paypal') { + $checked = (strstr($result['cgData']['payment_modules'], $name)) ? ' checked="checked" ' : ''; + $paymentHtml .= '
    '; + } else if ($data['type'] == 'shipping') { + $checked = (strstr($result['cgData']['shipping_modules'], $name)) ? ' checked="checked" ' : ''; + $shippingHtml .= '
    '; + } + } + $taxStatus = (isset($result['cgData']['taxable']) && $result['cgData']['taxable'] == 1) ? ' checked="checked" ' : ''; + $hpnChecked = (isset($result['cgData']['hidden_products_notification']) && $result['cgData']['hidden_products_notification'] == 1) ? ' checked="checked" ' : ''; + if ($hpnChecked == '' && !isset($_GET['cgid'])) $hpnChecked = ' checked="checked" '; + + $result['extraFormHtml'] = '
    ' . + ' ' . $lC_Language->get('legend_checkout_options') . '' . + '
    ' . + '
    ' . + '
    ' . $lC_Language->get('heading_payment_methods_available') . lc_show_info_bubble($lC_Language->get('info_bubble_payment_methods_available'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . + '

    ' . $paymentHtml . '

    ' . + '
    ' . + '
    ' . + '
    ' . $lC_Language->get('heading_shipping_methods_available') . lc_show_info_bubble($lC_Language->get('info_bubble_shipping_methods_available'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . + '

    ' . $shippingHtml . '

    ' . + '
    ' . $lC_Language->get('heading_taxable_status') . lc_show_info_bubble($lC_Language->get('info_bubble_taxable_status'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . + '

    ' . + '
    ' . + '
    ' . + '
    ' . + '
    ' . + ' ' . $lC_Language->get('legend_catalog_visibility') . '' . + '
    ' . + '
    ' . + '
    ' . $lC_Language->get('heading_access_group_visibility') . lc_show_info_bubble($lC_Language->get('info_bubble_access_group_visibility'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . + '

    ' . $accessHtml . '

    ' . + '
    ' . + '
    ' . + '
    ' . $lC_Language->get('heading_hidden_product_notification') . lc_show_info_bubble($lC_Language->get('info_bubble_hidden_product_notification'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . + '
    ' . + ' ' . + '
    ' . + '

    ' . $lC_Language->get('text_hidden_product_notification_info') . '

    ' . + '
    ' . + '
    ' . + '
    '; + + return $result; + } + + public static function getCustomerAccessLevelsHtml($section = 'customer_groups') { + global $lC_Database, $lC_Language, $pInfo, $cInfo; + + $lC_Language->loadIniFile('customer_groups.php'); + + $levels = array(); + if (isset($pInfo)) { + $levels = explode(';', $pInfo->get('access_levels')); + } else if (isset($cInfo)) { + $levels = explode(';', $cInfo['access_levels']); + } + + // get the access levels + $Qlevels = $lC_Database->query('select * from :table_customers_access where status = :status'); + $Qlevels->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); + $Qlevels->bindInt(':status', 1); + $Qlevels->execute(); + + $accessHtml = '
    '; + + while ($Qlevels->next()) { + $checked = ( (in_array($Qlevels->valueInt('id'), $levels)) ? ' checked="checked" ' : '' ); + $accessHtml .= '
    '; + } + + $Qlevels->freeResult(); + + if ($section == 'categories') { + $accessHtml .= self::_getSyncHtml(); + } + + return $accessHtml; + } + + protected static function _getSyncHtml() { + global $lC_Language; + + $lC_Language->loadIniFile('categories.php'); + + $html = '' . + '
    ' . + ' ' . + ' ' . lc_show_info_bubble($lC_Language->get('info_bubble_sync_products'), null, 'info-spot on-left grey margin-left margin-right') . + '
    ' . + '
    ' . + ' ' . + ' ' . lc_show_info_bubble($lC_Language->get('info_bubble_sync_children'), null, 'info-spot on-left grey margin-left margin-right') . + '
    '; + + return $html; + } + /* + * Save the customer group information + * + * @param integer $id The customer group id used on update, null on insert + * @param array $data An array containing the customer group information + * @param boolean $default True = set the customer group to be the default + * @access public + * @return boolean + */ + public static function save($id = null, $data, $default = false) { + global $lC_Database, $lC_Language; + + $customers_group_id = parent::save($id, $data, $default); + + $error = false; + + $lC_Database->startTransaction(); + + $Qdel = $lC_Database->query('delete from :table_customers_groups_data where customers_group_id = :customers_group_id'); + $Qdel->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); + $Qdel->bindInt(':customers_group_id', $customers_group_id); + $Qdel->execute(); + + $Qgdata = $lC_Database->query('insert into :table_customers_groups_data (customers_group_id, baseline_discount, customers_access_levels, hidden_products_notification, taxable, payment_modules, shipping_modules) values (:customers_group_id, :baseline_discount, :customers_access_levels, :hidden_products_notification, :taxable, :payment_modules, :shipping_modules)'); + $Qgdata->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); + $Qgdata->bindInt(':customers_group_id', $customers_group_id); + $Qgdata->bindFloat(':baseline_discount', $data['baseline']); + $Qgdata->bindValue(':customers_access_levels', self::_arr2str($data['level'])); + $Qgdata->bindInt(':hidden_products_notification', (($data['hidden_products_notification'] == 'on') ? true : false)); + $Qgdata->bindInt(':taxable', $data['taxable']); + $Qgdata->bindValue(':payment_modules', self::_arr2str($data['payment'])); + $Qgdata->bindValue(':shipping_modules', self::_arr2str($data['shipping'])); + $Qgdata->setLogging($_SESSION['module'], $customers_group_id); + $Qgdata->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + } + + if ( $error === false ) { + $lC_Database->commitTransaction(); + + return $customers_group_id; + } + + $lC_Database->rollbackTransaction(); + + return false; + } + /* + * format the array to semi-colo separated string + * + * @param array $arr The array to format + * @access private + * @return string + */ + private static function _arr2str($arr) { + if (!is_array($arr)) return false; + $str = ''; + foreach ($arr as $key => $val) { + $str .= $key . ';'; + } + $str = substr($str, 0, -1); + + return $str; + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php b/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php new file mode 100644 index 000000000..89d010a8d --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php @@ -0,0 +1,431 @@ +modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/applications/products/classes/products.php')); +include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/applications/products/classes/products.php')); +include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/applications/customer_groups/classes/customer_groups.php')); + +class lC_Products_b2b_Admin extends lC_Products_pro_Admin { + /* + * Save the product + * + * @param integer $id The products id to update, null on insert + * @param array $data The products information + * @access public + * @return boolean + */ + public static function save($id = null, $data) { + global $lC_Database, $lC_Language; + + $products_id = lC_Products_pro_Admin::save($id, $data); + + $error = false; + + $lC_Database->startTransaction(); + + // remove all old pricing records + $Qpricing = $lC_Database->query('delete from :table_products_pricing where products_id = :products_id or parent_id = :products_id'); + $Qpricing->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qpricing->bindInt(':products_id', $products_id); + $Qpricing->bindInt(':products_id', $products_id); + $Qpricing->setLogging($_SESSION['module'], $products_id); + $Qpricing->execute(); + + $qpb_pricing_enabled = (isset($data['qpb_pricing_switch']) && $data['qpb_pricing_switch'] == 1) ? true : false; + $groups_pricing_enabled = (isset($data['groups_pricing_switch']) && $data['groups_pricing_switch'] == 1) ? true : false; + $specials_pricing_enabled = (isset($data['specials_pricing_switch']) && $data['specials_pricing_switch'] == 1) ? true : false; + + if ( $lC_Database->isError() ) { + $error = true; + } else { + // add qty price breaks + if (is_array($data['products_qty_break_point']) && !empty($data['products_qty_break_point'])) { + if ($products_id != null) { + + // add the new records + foreach($data['products_qty_break_point'] as $group => $values) { + if (is_array($data['products_qty_break_point'][$group]) && $data['products_qty_break_point'][$group][1] != null) { + foreach($values as $key => $val) { + + if ($val == -1) continue; + if ($data['products_qty_break_point'][$group][$key] == null) continue; + if ((int)$data['products_qty_break_point'][$group][$key] == 1) continue; // do not save qty 1, base price is same + + $price = (is_array($data['options_pricing']) && !empty($data['options_pricing'])) ? 0.00 : $data['products_qty_break_price'][$group][$key]; // for options support + + $Qpb = $lC_Database->query('insert into :table_products_pricing (products_id, group_id, tax_class_id, qty_break, price_break, date_added) values (:products_id, :group_id, :tax_class_id, :qty_break, :price_break, :date_added)'); + $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qpb->bindInt(':products_id', $products_id ); + $Qpb->bindInt(':group_id', $group); + $Qpb->bindInt(':tax_class_id', $data['tax_class_id'] ); + $Qpb->bindValue(':qty_break', $data['products_qty_break_point'][$group][$key] ); + $Qpb->bindFloat(':price_break', $price ); + $Qpb->bindRaw(':date_added', 'now()'); + $Qpb->setLogging($_SESSION['module'], $products_id); + $Qpb->execute(); + + if ( $lC_Database->isError() ) { +die($lC_Database->getError()); + + $error = true; + break 2; + } + } + } + } + + // add qpb for options + if (is_array($data['options_pricing']) && !empty($data['options_pricing'])) { + + $parent_id = $products_id; + + foreach($data['options_pricing'] as $product_id => $groups) { + foreach($groups as $group_id => $gdata) { + foreach($gdata as $qty_break => $price) { + $Qpb2 = $lC_Database->query('insert into :table_products_pricing (products_id, parent_id, group_id, tax_class_id, qty_break, price_break, date_added) values (:products_id, :parent_id, :group_id, :tax_class_id, :qty_break, :price_break, :date_added)'); + $Qpb2->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qpb2->bindInt(':products_id', $product_id ); + $Qpb2->bindInt(':parent_id', $parent_id ); + $Qpb2->bindInt(':group_id', $group_id); + $Qpb2->bindInt(':tax_class_id', $data['tax_class_id'] ); + $Qpb2->bindValue(':qty_break', $qty_break ); + $Qpb2->bindFloat(':price_break', number_format($price, DECIMAL_PLACES) ); + $Qpb2->bindRaw(':date_added', 'now()'); + $Qpb2->setLogging($_SESSION['module'], $product_id); + $Qpb2->execute(); + + if ( $lC_Database->isError() ) { +die($lC_Database->getError()); + $error = true; + break 3; + } + } + } + } + } + } + } + } + if ($error === false) { + // add group pricing + if (is_array($data['group_pricing']) && !empty($data['group_pricing'])) { + if ($products_id != null) { + // add the new records + foreach($data['group_pricing'] as $group => $values) { + $Qgp = $lC_Database->query('insert into :table_products_pricing (products_id, qty_break, price_break, group_id, tax_class_id, group_status, group_price, date_added) values (:products_id, :qty_break, :price_break, :group_id, :tax_class_id, :group_status, :group_price, :date_added)'); + $Qgp->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qgp->bindInt(':products_id', $products_id ); + $Qgp->bindInt(':qty_break', -1); + $Qgp->bindFloat(':price_break', number_format(0, DECIMAL_PLACES)); + $Qgp->bindInt(':group_id', $group); + $Qgp->bindInt(':tax_class_id', $data['tax_class_id'] ); + $Qgp->bindValue(':group_status', (($values['enable'] == 'on') ? 1 : 0)); + $Qgp->bindValue(':group_price', number_format($values['price'], DECIMAL_PLACES)); + $Qgp->bindRaw(':date_added', 'now()'); + $Qgp->setLogging($_SESSION['module'], $products_id); + $Qgp->execute(); + + if ( $lC_Database->isError() ) { +die($lC_Database->getError()); + + $error = true; + break; + } + } + } + } + } + + if ($error === false) { + // add special pricing + if (is_array($data['products_special_pricing']) && !empty($data['products_special_pricing'])) { + if ($products_id != null) { + + // add the new records + foreach($data['products_special_pricing'] as $group => $values) { + + $start_date = (isset($values['start_date']) && empty($values['start_date']) === false) ? $values['start_date'] : '0000-00-00 00:00:00'; + $expires_date = (isset($values['expires_date']) && empty($values['expires_date']) === false) ? $values['expires_date'] : '0000-00-00 00:00:00'; + + $Qsp = $lC_Database->query('insert into :table_products_pricing (products_id, qty_break, price_break, group_id, tax_class_id, special_status, special_price, special_start, special_end, date_added) values (:products_id, :qty_break, :price_break, :group_id, :tax_class_id, :special_status, :special_price, :special_start, :special_end, :date_added)'); + $Qsp->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qsp->bindInt(':products_id', $products_id ); + $Qsp->bindInt(':qty_break', -1); + $Qsp->bindFloat(':price_break', number_format(0, DECIMAL_PLACES)); + $Qsp->bindInt(':group_id', $group); + $Qsp->bindInt(':tax_class_id', $data['tax_class_id'] ); + $Qsp->bindValue(':special_status', (($values['enable'] == 'on') ? 1 : 0)); + $Qsp->bindValue(':special_price', number_format($values['price'], DECIMAL_PLACES)); + $Qsp->bindRaw(':date_added', 'now()'); + $Qsp->bindRaw(':special_start', "'" . ((strstr($start_date, '/')) ? lC_DateTime::toDateTime($start_date) : $start_date) . "'"); + $Qsp->bindRaw(':special_end', "'" . ((strstr($expires_date, '/')) ? lC_DateTime::toDateTime($expires_date) : $expires_date) . "'"); + $Qsp->setLogging($_SESSION['module'], $products_id); + $Qsp->execute(); + + if ( $lC_Database->isError() ) { +die($lC_Database->getError()); + $error = true; + break; + } + } + } + } + } + + if ($error === false) { + // add options special pricing + if (is_array($data['specials_pricing']) && !empty($data['specials_pricing'])) { + if ($products_id != null) { + // add the new records + foreach($data['specials_pricing'] as $products_id => $val) { + foreach($val as $group_id => $special_price) { + + if ($special_price == null) continue; + + $Qgp = $lC_Database->query('insert into :table_products_pricing (products_id, parent_id, group_id, tax_class_id, special_status, special_price, date_added) values (:products_id, :parent_id, :group_id, :tax_class_id, :special_status, :special_price, :date_added)'); + $Qgp->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qgp->bindInt(':products_id', $products_id ); + $Qgp->bindInt(':parent_id', $parent_id ); + $Qgp->bindInt(':group_id', $group_id); + $Qgp->bindInt(':tax_class_id', $data['tax_class_id'] ); + $Qgp->bindValue(':special_status', 1); + $Qgp->bindValue(':special_price', number_format($special_price, DECIMAL_PLACES)); + $Qgp->bindRaw(':date_added', 'now()'); + $Qgp->setLogging($_SESSION['module'], $products_id); + $Qgp->execute(); + + if ( $lC_Database->isError() ) { + die($lC_Database->getError()); + + $error = true; + break; + } + } + } + } + } + } + + if ( $error === false ) { + $lC_Database->commitTransaction(); + + lC_Cache::clear('categories'); + lC_Cache::clear('category_tree'); + lC_Cache::clear('also_purchased'); + + return $products_id; // Return the products id for use with the save_close buttons + } + + $lC_Database->rollbackTransaction(); + } + /* + * Batch update the category access levels + * + * @param integer $category_id The parent category id + * @param string $levels The access levels + * @access public + * @return boolean + */ + public static function batchEditAccess($data) { + global $lC_Database; + + $levels = ''; + if (is_array($data['access_levels'])) { + foreach ($data['access_levels'] as $key => $val) { + $levels .= $key . ';'; + } + $levels = substr($levels, 0, -1); + } + + $lC_Database->startTransaction(); + + foreach ( $data['batch'] as $products_id ) { + $Qproduct = $lC_Database->query('update :table_products set `access_levels` = :access_levels where `products_id` = :products_id'); + $Qproduct->bindTable(':table_products', TABLE_PRODUCTS); + $Qproduct->bindInt(':products_id', $products_id); + $Qproduct->bindvalue(':access_levels', $levels); + $Qproduct->setLogging($_SESSION['module'], $products_id); + $Qproduct->execute(); + } + + if ( !$lC_Database->isError() ) { + $lC_Database->commitTransaction(); + return true; + } + + $lC_Database->rollbackTransaction(); + + return false; + } + /* + * Return the product simple options accordian price listing content + * + * @access public + * @return array + */ + public static function getGroupPricingContent($base_price) { + global $lC_Language, $lC_Currencies, $lC_Database, $pInfo; + + $products_id = (isset($pInfo)) ? $pInfo->get('products_id') : null; + + $content = ''; + $groups = lC_Customer_groups_Admin::getAll(); + + foreach($groups['entries'] as $key => $value) { + $group_status = 0; + if ($products_id != null) { + $Qpricing = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id and group_id = :group_id and group_status != :group_status order by qty_break asc'); + $Qpricing->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qpricing->bindInt(':products_id', $products_id); + $Qpricing->bindInt(':group_id', $value['customers_group_id']); + $Qpricing->bindInt(':group_status', -1); + $Qpricing->execute(); + + $group_status = $Qpricing->valueInt('group_status'); + $diff = (float)$base_price - $Qpricing->valueDecimal('group_price'); + $discount_text = number_format(round(($diff / $base_price) * 100, DECIMAL_PLACES), DECIMAL_PLACES); + $discounted_price = $Qpricing->valueDecimal('group_price'); + + } else { + $discount = round((float)$base_price * ((float)$value['baseline_discount'] * .01), DECIMAL_PLACES); + $discounted_price = $base_price - $discount; + $discount_text = number_format($value['baseline_discount'], DECIMAL_PLACES); + } + + $checked = ($group_status == 0) ? null : 'checked="checked"'; + + $content .= '
    ' . + ' ' . + ' ' . + '
    ' . + ' ' . $lC_Currencies->getSymbolLeft() . '' . + ' ' . + '
    ' . + ' ' . $lC_Language->get('text_price') . '-' . $discount_text . '%' . + '
    '; + } + + return $content; + } + /* + * Return the product specials price listing content + * + * @access public + * @return array + */ + public static function getSpecialPricingContent() { + global $lC_Language, $lC_Currencies, $lC_Database, $pInfo; + + $products_id = (isset($pInfo)) ? $pInfo->get('products_id') : null; + + $content = ''; + $groups = lC_Customer_groups_Admin::getAll(); + + $has_options = (isset($pInfo) && (lC_Products_pro_Admin::hasComboOptions($products_id) || lC_Products_pro_Admin::hasSubProducts($products_id))) ? true : false; + + foreach($groups['entries'] as $key => $value) { + + $special_status = 0; + $base = (isset($pInfo)) ? (float)$pInfo->get('products_price') : 0.00; + + if ($products_id != null) { + $Qpricing = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id and group_id = :group_id and special_status != :special_status order by group_id asc'); + $Qpricing->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qpricing->bindInt(':products_id', $products_id); + $Qpricing->bindInt(':group_id', $value['customers_group_id']); + $Qpricing->bindInt(':special_status', -1); + $Qpricing->execute(); + + $special_status = ($Qpricing->valueInt('special_status') == 1) ? ' checked' : ''; + $special_price = number_format($Qpricing->valueDecimal('special_price'), DECIMAL_PLACES); + + $start_date_formatted = null; + if ($Qpricing->value('special_start') != null && $Qpricing->value('special_start') != '0000-00-00 00:00:00') { + $start_date_formatted = lC_DateTime::getShort($Qpricing->value('special_start')); + } + $expires_date_formatted = null; + if ($Qpricing->value('special_end') != null && $Qpricing->value('special_end') != '0000-00-00 00:00:00') { + $expires_date_formatted = lC_DateTime::getShort($Qpricing->value('special_end')); + } + + } else { + $special_status = (isset($pInfo) && $pInfo->get('products_special_status') != 0) ? ' checked' : null; + $special_price = (isset($pInfo)) ? number_format($pInfo->get('products_special_price'), DECIMAL_PLACES) : 0.00; + $start_date_formatted = (isset($pInfo) && $pInfo->get('products_special_expires_date') != '0000-00-00 00:00:00') ? lC_DateTime::getShort($pInfo->get('products_special_start_date')) : null; + $expires_date_formatted = (isset($pInfo) && $pInfo->get('products_special_expires_date') != '0000-00-00 00:00:00') ? lC_DateTime::getShort($pInfo->get('products_special_expires_date')) : null; + } + + $discount = (isset($base) && $base > 0.00) ? round( ((($base - $special_price) / $base) * 100), DECIMAL_PLACES) : 0.00; + + $checked = ($special_status == 0) ? null : 'checked="checked"'; + + $content .= '' . + '
    ' . + '
    ' . + ' '; +// if ($has_options === false) { + $content .= '
    ' . + ' ' . $lC_Currencies->getSymbolLeft() . '' . + ' ' . + '
    ' . + ' ' . $lC_Language->get('text_special_price') . '-' . number_format($discount, DECIMAL_PLACES) . '%'; +// } + $content .= '
    ' . + '
    ' . + ' ' . + ' ' . + ' ' . + ' ' . + ' ' . + ' ' . + ' ' . + ' ' . + ' ' . + ' ' . + ' ' . + ' ' . + '
    ' . + '
    '; + } + + return $content; + } + /* + * Determine if product has group pricing + * + * @param integer $id The product id + * @access public + * @return boolean + */ + public static function hasGroupPricing($id) { + global $lC_Database; + + $Qgp = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id and group_status = :group_status limit 1'); + $Qgp->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qgp->bindInt(':products_id', $id); + $Qgp->bindInt(':group_status', 1); + $Qgp->execute(); + + $rows = $Qgp->numberOfRows(); + + $Qgp->freeResult(); + + if ( $rows > 0 ) { + return true; + } + + return false; + } +} \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/rpc.php b/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/rpc.php new file mode 100644 index 000000000..590c3c74f --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/rpc.php @@ -0,0 +1,33 @@ + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/products/modal/batchAccess.php b/catalog/addons/Loaded_7_B2B/admin/applications/products/modal/batchAccess.php new file mode 100644 index 000000000..9a314faf5 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/products/modal/batchAccess.php @@ -0,0 +1,88 @@ +modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); + +global $lC_Language, $lC_Template; +?> + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/products/pages/tabs/relationships_access_levels.inc.php b/catalog/addons/Loaded_7_B2B/admin/applications/products/pages/tabs/relationships_access_levels.inc.php new file mode 100644 index 000000000..37c5e41c2 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/applications/products/pages/tabs/relationships_access_levels.inc.php @@ -0,0 +1,33 @@ +modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); +?> +
    + get('section_access_levels_overrides'); ?> +
    +
    +
    get('subsection_access'); ?>
    +

    +
    +
    +
    + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/classes/access.php b/catalog/addons/Loaded_7_B2B/admin/classes/access.php new file mode 100644 index 000000000..4fd96283a --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/classes/access.php @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_edit.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_edit.xml new file mode 100644 index 000000000..65542aed1 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_edit.xml @@ -0,0 +1,21 @@ + + + Enable B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('text_access_levels_upsell_title'); ?>" upselldesc="get('text_access_levels_upsell_desc'); ?>">]]> + ]]> + + + get('access_levels_registered'); ?>

    get('access_levels_wholesale'); ?>

    get('access_levels_dealer'); ?>

    ]]>     + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); echo '

    ' . lC_Customer_groups_b2b_Admin::getCustomerAccessLevelsHtml('categories') . '

    '; ?>]]>     +     + + ]]> + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php')); echo lC_Categories_pro_Admin::getProductRelatedHtml($_GET['categories']); ?>]]> + +     +     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_main.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_main.xml new file mode 100644 index 000000000..669030f76 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_main.xml @@ -0,0 +1,13 @@ + + + Enable B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('text_with_selected'); ?>]]> + get('text_edit_access'); ?>]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_new.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_new.xml new file mode 100644 index 000000000..c01a3ec52 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_new.xml @@ -0,0 +1,17 @@ + + + Enable B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('text_access_levels_upsell_title'); ?>" upselldesc="get('text_access_levels_upsell_desc'); ?>">]]> + ]]> + + + get('access_levels_registered'); ?>

    get('access_levels_wholesale'); ?>

    get('access_levels_dealer'); ?>

    ]]>     + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); echo '

    ' . lC_Customer_groups_b2b_Admin::getCustomerAccessLevelsHtml() . '

    '; ?>]]>     +     +     +     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_classes_rpc.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_classes_rpc.xml new file mode 100644 index 000000000..ebdf2f65f --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_classes_rpc.xml @@ -0,0 +1,21 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php'));]]> + + + + + + + + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_modal_edit.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_modal_edit.xml new file mode 100644 index 000000000..3a83ba41d --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_modal_edit.xml @@ -0,0 +1,17 @@ + + + Enable B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + ]]> + ]]> + + + + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/orders_classes_orders.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/orders_classes_orders.xml new file mode 100644 index 000000000..e5382f113 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/orders_classes_orders.xml @@ -0,0 +1,75 @@ + + + Admin Orders Mods + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + + + + + + + + + query("SELECT count(o.orders_id) as total + from "); + //Purchase Orders Service Module(PO) START + if (utility::isB2B()) { + $QresultFilterTotal->appendQuery(' :table_purchase_orders_service pos, '); + $QresultFilterTotal->bindTable(':table_purchase_orders_service',DB_TABLE_PREFIX.'purchase_orders_service'); + } + //Purchase Orders Service Module(PO) END + + $QresultFilterTotal->appendQuery(" :table_orders o LEFT JOIN :table_orders_total ot + on (o.orders_id = ot.orders_id and ot.class = 'total') + LEFT JOIN :table_orders_status s + on (s.orders_status_id = o.orders_status and s.language_id = :language_id) " . + $sWhere ." group by o.orders_id "); + /* + ]]> + + + + + + + + + query("SELECT o.orders_id, o.customers_id, o.customers_ip_address, o.customers_name, o.payment_method, o.date_purchased, o.last_modified, o.customers_country_iso3, greatest(date_purchased, coalesce(last_modified, date_purchased)) as date_sort, o.currency, o.currency_value, ot.value as order_total, s.orders_status_name, s.orders_status_type from "); + + //Purchase Orders Service Module(PO) START + if (utility::isB2B()) { + $Qresult->appendQuery(' :table_purchase_orders_service pos, '); + $Qresult->bindTable(':table_purchase_orders_service',DB_TABLE_PREFIX.'purchase_orders_service'); + } + //Purchase Orders Service Module(PO) END + + $Qresult->appendQuery(" :table_orders o + LEFT JOIN :table_orders_total ot + on (o.orders_id = ot.orders_id and ot.class = 'total') + LEFT JOIN :table_orders_status s + on (s.orders_status_id = o.orders_status and s.language_id = :language_id) " . + $sWhere . " group by o.orders_id " . $sOrder . $sLimit); + /* + ]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_edit.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_edit.xml new file mode 100644 index 000000000..d3ae7fd84 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_edit.xml @@ -0,0 +1,29 @@ + + + Admin Orders Mods + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + ]]> + modCheck(DIR_FS_CATALOG . 'addons/Purchase_Orders_Service/classes/order.php')); + $po_number = lC_Order_b2b::retrievePONumber($_GET['orders']); + if($po_number != '') { + ?> +
      get('text_po_number_title'); ?> : 
    + + ]]>     +     +     +     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_invoice.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_invoice.xml new file mode 100644 index 000000000..55c859139 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_invoice.xml @@ -0,0 +1,79 @@ + + + Admin Orders Mods + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + modCheck('../addons/purchase_orders_service/classes/order.php')); + } + ]]> + + + getCustomer('email_address') . '">' . $lC_Order->getCustomer('email_address') . ''; ?> + ]]> + + + +   + + + get('text_po_number_title'); ?> :  + + + + ]]> + + + + + + modCheck(DIR_FS_CATALOG . 'addons/Purchase_Orders_Service/classes/order.php')); + } + ]]> + + + getCustomer('email_address') . '">' . $lC_Order->getCustomer('email_address') . ''; ?> + ]]> + + + +   + + + get('text_po_number_title'); ?> :  + + + + ]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_main.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_main.xml new file mode 100644 index 000000000..1a7dabf9f --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_main.xml @@ -0,0 +1,13 @@ + + + Enable B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('text_with_selected'); ?>]]> + get('text_edit_access'); ?>]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_pricing.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_pricing.xml new file mode 100644 index 000000000..342ae6202 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_pricing.xml @@ -0,0 +1,21 @@ + + + Enable B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_relationships.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_relationships.xml new file mode 100644 index 000000000..b8527156b --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_relationships.xml @@ -0,0 +1,13 @@ + + + Enable B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/templates_default_header.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/templates_default_header.xml new file mode 100644 index 000000000..81af6fda8 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/hooks/templates_default_header.xml @@ -0,0 +1,13 @@ + + + After Logo Image, add Pro Indicator + 1.0.0 + 2.3.2 + loadedcommerce.com + + + ]]> + B2B' : null; ?>]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php new file mode 100644 index 000000000..bf90364a8 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php @@ -0,0 +1,55 @@ +# $Id: b2b_settings.php v1.0 2011-11-04 datazen $ +# +# LoadedCommerce, Innovative eCommerce Solutions +# http://www.loadedcommerce.com +# +# Copyright (c) 2014 LoadedCommerce.com +# +# @author LoadedCommerce Team +# @copyright (c) 2014 LoadedCommerce Team +# @license http://loadedcommerce.com/license.html + +heading_title = B2B Settings + +access_b2b_settings_title = B2B Settings + +heading_customers = Customers +heading_products = Products +heading_guest_access = Guest Access +heading_access_group_levels = Access Group Levels + +table_heading_id = ID +table_heading_group = Access Level +table_heading_members = Members +table_heading_status = Status +table_heading_action = Action + +label_allow_self_registrations = Allow Self Registrations +label_guest_catalog_access = Guest Catalog Access +label_guest = Guest +label_status = Status +label_active = Active +label_registered = Registered +label_new_access_level = New Access Level + +button_create_new = Create New + +modal_heading_delete_customer_access_level = Delete Customer Access Level +modal_heading_edit_customer_access_level = Edit Customer Access Level + +introduction_edit_customer_access_level = Please make the necessary changes for this customer access level. +introduction_delete_customer_access_level = Please verify the removal of this customer access level. +delete_error_customer_access_level_prohibited = Error: The system customer access levels cannot be removed. +delete_error_customer_access_level_in_use = Error: This customer access level is currently assigned to +delete_error_customer_access_level_in_use_end = customers and cannot be removed. + +info_bubble_displays_create_account_form = Displays Create Account Form +info_bubble_guest_catalog_access = Control Guest Access to the Catalog + +text_add_to_cart = Add to Cart +text_members = Members +text_none = None +text_see_pricing = See Pricing +text_view_catalog = View Catalog +text_enable_level = Enable Level +text_disable_level = Disable Level diff --git a/catalog/addons/Loaded_7_B2B/admin/languages/en_US/modules/access/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/languages/en_US/modules/access/b2b_settings.php new file mode 100644 index 000000000..fe908d5af --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/languages/en_US/modules/access/b2b_settings.php @@ -0,0 +1,12 @@ +# $Id: b2b_settings.php v1.0 2013-01-01 datazen $ +# +# LoadedCommerce, Innovative eCommerce Solutions +# http://www.loadedcommerce.com +# +# Copyright (c) 2014 Loaded Commerce, LLC +# +# @author LoadedCommerce Team +# @copyright (c) 2014 LoadedCommerce Team +# @license http://loadedcommerce.com/license.html + +access_b2b_settings_title = B2B Settings \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/modules/access/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/modules/access/b2b_settings.php new file mode 100644 index 000000000..28d15d098 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/admin/modules/access/b2b_settings.php @@ -0,0 +1,23 @@ +_title = $lC_Language->get('access_b2b_settings_title'); + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/classes/order.php b/catalog/addons/Loaded_7_B2B/classes/order.php new file mode 100644 index 000000000..034533322 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/classes/order.php @@ -0,0 +1,75 @@ +modCheck(DIR_FS_CATALOG . 'includes/classes/order.php')); + +class lC_Order_b2b { + /* + * Insert the purchase order number + * + * @access public + * @return array + */ + public static function insertPONumber($id = null, $po_number = null) { + global $lC_Database; + + if ($id == null && $po_number == null) return false; + + $Qponumber = $lC_Database->query('insert into :table_po_number (po_number,orders_id) values (:po_number,:orders_id)'); + $Qponumber->bindTable(':table_po_number', DB_TABLE_PREFIX . "purchase_orders_service"); + $Qponumber->bindValue(':po_number', $po_number); + $Qponumber->bindInt(':orders_id', $id); + $Qponumber->execute(); + + return true; + } + /* + * Get the purchase order number email string + * + * @access public + * @return string + */ + public static function getPONumber($id) { + global $lC_Language; + + $email_order = $lC_Language->get('text_po_number_title') . "\n" . + $lC_Language->get('email_order_separator') . "\n"; + $email_order .= self::retrievePONumber($id) . "\n\n"; + + return $email_order; + } + /* + * Get the purchase order number + * + * @access public + * @return string + */ + public static function retrievePONumber($id = 0) { + global $lC_Database, $lC_Customer, $lC_Language; + + if( $id > 0) { + $Qretorders = $lC_Database->query('select po_number_id, po_number from :table_po_number where orders_id = :orders_id '); + $Qretorders->bindTable(':table_po_number', DB_TABLE_PREFIX . "purchase_orders_service"); + $Qretorders->bindInt(':orders_id', $id); + $Qretorders->execute(); + + $id = $Qretorders->value('po_number'); + + $Qretorders->freeResult(); + + return $id; + } + + return false; + + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/classes/product.php b/catalog/addons/Loaded_7_B2B/classes/product.php new file mode 100644 index 000000000..56a8f6938 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/classes/product.php @@ -0,0 +1,182 @@ +modCheck(DIR_FS_CATALOG . 'includes/classes/product.php')); + +class lC_Product_b2b extends lC_Product { + /* + * Check to see if product has restricted accesa + * + * @access public + * @return array + */ + public static function hasProductAccess($products_id, $customers_group_id) { + global $lC_Database, $lC_Customer; + + $valid = false; + + if ($lC_Customer->isLoggedOn() === false) $customers_group_id = 0; + + if ($customers_group_id > 0) { // not guest + + // get the access levels for the group + $Qcg = $lC_Database->query('select customers_access_levels from :table_customers_groups_data where customers_group_id = :customers_group_id limit 1'); + $Qcg->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); + $Qcg->bindInt(':customers_group_id', $customers_group_id); + $Qcg->execute(); + + $cg_access_levels = explode(';', $Qcg->value('customers_access_levels')); + + $Qcg->freeResult(); + + // get the product access levels + $Qproduct = $lC_Database->query('select access_levels from :table_products where products_id = :products_id limit 1'); + $Qproduct->bindTable(':table_products', TABLE_PRODUCTS); + $Qproduct->bindInt(':products_id', $products_id); + $Qproduct->execute(); + + $product_access_levels = explode(';', $Qproduct->value('access_levels')); + + $Qproduct->freeResult(); + + // check if product has access + $valid = false; + if ($Qproduct->value('access_levels') == '') { // if nothing set, valid = true + $valid = true; + } else { + foreach ($product_access_levels as $id) { + if ($id != '') { + if (in_array($id, $cg_access_levels)) { + $valid = true; + break; + } + } + } + } + } else { + $guestAccess = (defined('B2B_SETTINGS_GUEST_CATALOG_ACCESS') && B2B_SETTINGS_GUEST_CATALOG_ACCESS > 0) ? (int)B2B_SETTINGS_GUEST_CATALOG_ACCESS : 0; + + if ($guestAccess > 0) { + // get the access levels + $Qproduct = $lC_Database->query('select access_levels from :table_products where products_id = :products_id limit 1'); + $Qproduct->bindTable(':table_products', TABLE_PRODUCTS); + $Qproduct->bindInt(':products_id', $products_id); + $Qproduct->execute(); + + $product_access_levels = explode(';', $Qproduct->value('access_levels')); + + $Qproduct->freeResult(); + + if ($Qproduct->value('access_levels') == '') { // if nothing set, valid = true + $valid = true; + } else if (in_array('1', $product_access_levels)) { // has guest access at the category level + $valid = true; + } + + } + } + + return $valid; + } + /* + * Check to see if category has restricted accesa + * + * @access public + * @return array + */ + public static function hasCategoryAccess($categories_id, $customers_group_id) { + global $lC_Database, $lC_Customer; + + $valid = false; + + if ($lC_Customer->isLoggedOn() === false) $customers_group_id = 0; + + if ($customers_group_id > 0) { // not guest + + // get the access levels for the group + $Qcg = $lC_Database->query('select customers_access_levels from :table_customers_groups_data where customers_group_id = :customers_group_id limit 1'); + $Qcg->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); + $Qcg->bindInt(':customers_group_id', $customers_group_id); + $Qcg->execute(); + + $cg_access_levels = explode(';', $Qcg->value('customers_access_levels')); + + $Qcg->freeResult(); + + // get the category access levels + $Qcat = $lC_Database->query('select access_levels from :table_categories where categories_id = :categories_id limit 1'); + $Qcat->bindTable(':table_categories', TABLE_CATEGORIES); + $Qcat->bindInt(':categories_id', $categories_id); + $Qcat->execute(); + + $category_access_levels = explode(';', $Qcat->value('access_levels')); + + $Qcat->freeResult(); + + // check if product has access + if ($Qcat->value('access_levels') == '') { // if nothing set, valid = true + $valid = true; + } else { + foreach ($category_access_levels as $id) { + if ($id != '') { + if (in_array($id, $cg_access_levels)) { + $valid = true; + break; + } + } + } + } + + } else { + $guestAccess = (defined('B2B_SETTINGS_GUEST_CATALOG_ACCESS') && B2B_SETTINGS_GUEST_CATALOG_ACCESS > 0) ? (int)B2B_SETTINGS_GUEST_CATALOG_ACCESS : 0; + + if ($guestAccess > 0) { + // get the category access levels + $Qcat = $lC_Database->query('select access_levels from :table_categories where categories_id = :categories_id limit 1'); + $Qcat->bindTable(':table_categories', TABLE_CATEGORIES); + $Qcat->bindInt(':categories_id', $categories_id); + $Qcat->execute(); + + $category_access_levels = explode(';', $Qcat->value('access_levels')); + + $Qcat->freeResult(); + + if ($Qcat->value('access_levels') == '') { // if nothing set, valid = true + $valid = true; + } else if (in_array('1', $category_access_levels)) { // has guest access at the category level + $valid = true; + } + + } + } + + return $valid; + } + + public static function restrictCategories($customers_group_id, $data) { +echo "
    ";
+print_r($data);
+echo "
    "; +die('55'); + + foreach ($data[0] as $key => $top) { + foreach ($data[$key] as $ckey => $child) { +// if ($child['item_id'] != NULL && self::hasCategoryAccess($child['item_id'], $customers_group_id) === false) unset($data[$key][$ckey]); + } + + if ($top['item_id'] != NULL && self::hasCategoryAccess($top['item_id'], $customers_group_id) === false) unset($data[0][$key]); + } + + return $data; + } + +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/controller.php b/catalog/addons/Loaded_7_B2B/controller.php new file mode 100644 index 000000000..6e1c166f8 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/controller.php @@ -0,0 +1,156 @@ +modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/controller.php')); +if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/product.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/product.php')); +if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); +if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php')); + +class Loaded_7_B2B extends Loaded_7_Pro { + /* + * Class constructor + */ + public function Loaded_7_B2B() { + global $lC_Language, $lC_Database; + /** + * The addon type (category) + * valid types; payment, shipping, themes, checkout, catalog, admin, reports, connectors, other + */ + $this->_type = 'systems'; + /** + * The addon class name + */ + $this->_code = 'Loaded_7_B2B'; + /** + * The addon title used in the addons store listing + */ + $this->_title = $lC_Language->get('addon_system_b2b_title'); + /** + * The addon description used in the addons store listing + */ + $this->_description = $lC_Language->get('addon_system_b2b_description'); + /** + * The developers name + */ + $this->_author = 'Loaded Commerce, LLC'; + /** + * The developers web address + */ + $this->_authorWWW = 'http://www.loadedcommerce.com'; + /** + * The addon version + */ + $this->_version = '1.0.0'; + /** + * The Loaded 7 core compatibility version + */ + $this->_compatibility = '7.002.2.0'; // the addon is compatible with this core version and later + /** + * The base64 encoded addon image used in the addons store listing + */ + $this->_thumbnail = lc_image(DIR_WS_CATALOG . 'addons/' . $this->_code . '/images/loaded7-b2b.png', $this->_title); + /** + * The addon enable/disable switch + */ + $this->_enabled = $this->_checkAndActivate(); + if ($this->_enabled && !defined('ADDONS_SYSTEM_LOADED_7_B2B_STATUS')) $this->install(); + /** + * Automatically install the module + */ + // $this->_auto_install = true; + } + /** + * Checks to see if the addon has been installed + * + * @access public + * @return boolean + */ + public function isInstalled() { + return (bool)defined('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); + } + /** + * Install the addon + * + * @access public + * @return void + */ + public function install() { + global $lC_Database; + + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Enable AddOn', 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS', '1', 'Do you want to enable this addon?', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())"); + + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'B2B_SETTINGS_ALLOW_SELF_REGISTER'"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_ALLOW_SELF_REGISTER', '1', '', '6', '0', '', '', now())"); + + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'B2B_SETTINGS_GUEST_CATALOG_ACCESS'"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_GUEST_CATALOG_ACCESS', '4', '', '6', '0', '', '', now())"); + + // po number addition + $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . DB_TABLE_PREFIX . "Purchase_Orders_Service` (`po_number_id` int(11) NOT NULL AUTO_INCREMENT, `po_number` varchar(255) NOT NULL, `orders_id` int(11) NOT NULL, `po_number_status` int(1) NOT NULL DEFAULT '1', PRIMARY KEY (`po_number_id`)) "); + } + /** + * Return the configuration parameter keys an an array + * + * @access public + * @return array + */ + public function getKeys() { + if (!isset($this->_keys)) { + $this->_keys = array('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); + } + + return $this->_keys; + } + /** + * Check if the config key is already in the database + * + * @access protected + * @return boolean + */ + private function _isConfigInstalled($key) { + global $lC_Database; + + $Qcfg = $lC_Database->query('select configuration_id from :table_configuration where configuration_key = :configuration_key'); + $Qcfg->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qcfg->bindValue(':configuration_key', $key); + $Qcfg->execute(); + + $status = ($Qcfg->numberOfRows() > 0) ? true : false; + + $Qcfg->freeResult(); + + return $status; + } + /** + * Check if the Pro addon is active + * + * @access public + * @return array + */ + protected function _checkAndActivate() { + + $isPro = utility::isPro(); + $isB2B = utility::isB2B(); + + $enabled = false; + if ($isPro) { + $enabled = true; + if ($isB2B) { + } else { + $this->install(); + } + } + + return $enabled; + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/account.xml b/catalog/addons/Loaded_7_B2B/hooks/account.xml new file mode 100644 index 000000000..9eb21f8c8 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/account.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + load('account');]]> + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/application_bottom.xml b/catalog/addons/Loaded_7_B2B/hooks/application_bottom.xml new file mode 100644 index 000000000..d413779e2 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/application_bottom.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + stopServices();]]> + isLoggedOn() === false && $page != 'login') { if (defined('B2B_SETTINGS_ALLOW_SELF_REGISTER') && B2B_SETTINGS_ALLOW_SELF_REGISTER == 1 && $page != 'create') { $lC_NavigationHistory->setSnapshot(); lc_redirect(lc_href_link(FILENAME_ACCOUNT, 'login', 'SSL')); }}} if (file_exists('addons/Loaded_7_B2B/javascript/general.js.php')) { include_once('addons/Loaded_7_B2B/javascript/general.js.php'); }}]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml b/catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml new file mode 100644 index 000000000..fd44d4450 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/order.php')); lC_Order_b2b::insertPONumber($order_id, $_POST['po_number']);}]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml b/catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml new file mode 100644 index 000000000..cfe156afb --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml @@ -0,0 +1,22 @@ + + + After VQMOD-001 + 1.0.0 + 2.3.2 + loadedcommerce.com + + + process(); + ]]> + + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/order.php')); + } + //Purchase Orders Service Module(PO) END + ]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/includes_content_index.xml b/catalog/addons/Loaded_7_B2B/hooks/includes_content_index.xml new file mode 100644 index 000000000..d72bae846 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/includes_content_index.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + _page_contents = 'category_listing.php';]]> + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/product.php')); if (!lC_Product_b2b::hasCategoryAccess($current_category_id, $lC_Customer->getCustomerGroup($id))) { $this->_page_contents = 'category_not_found.php'; }]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_actions_cart_add.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_actions_cart_add.xml new file mode 100644 index 000000000..e813fe089 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_actions_cart_add.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/product.php')); if (!lC_Product_b2b::hasProductAccess($id, $lC_Customer->getCustomerGroup($id))) { $lC_ShoppingCart->reset(); lc_redirect(lc_href_link(FILENAME_INFO, 'permissions')); }]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_featured_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_featured_products.xml new file mode 100644 index 000000000..79295187c --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_featured_products.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + valueInt('products_id'));]]> + valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) $this->_content = ''; return true;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_specials.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_specials.xml new file mode 100644 index 000000000..da9914e2e --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_specials.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + toArray();]]> + valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) $this->_content = ''; return true;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_whats_new.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_whats_new.xml new file mode 100644 index 000000000..7dfe38fa2 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_whats_new.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + valueInt('products_id'));]]> + valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) $this->_content = ''; return true;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_content_also_purchased_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_content_also_purchased_products.xml new file mode 100644 index 000000000..985bc601e --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_content_also_purchased_products.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + _content .= '
    ' . "\n";]]> + getID(), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) continue;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_content_featured_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_content_featured_products.xml new file mode 100644 index 000000000..9b06d371e --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_content_featured_products.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + valueInt('products_id'));]]> + valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) continue;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_content_new_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_content_new_products.xml new file mode 100644 index 000000000..5ce2c9b3d --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_content_new_products.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + valueInt('products_id'));]]> + valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) continue;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_recently_visited_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_recently_visited_products.xml new file mode 100644 index 000000000..f1f289268 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_recently_visited_products.xml @@ -0,0 +1,17 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + getCustomerGroup($lC_Customer->getID()))) continue;]]> + + + + getCustomerGroup($lC_Customer->getID()))) continue;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_upcoming_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_upcoming_products.xml new file mode 100644 index 000000000..c81c8e104 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/modules_upcoming_products.xml @@ -0,0 +1,13 @@ + + + Hook in B2B Features + 1.0.0 + 2.3.2 + loadedcommerce.com + + + valueInt('products_id'));]]> + valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) continue;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/template_content_account_receipt.xml b/catalog/addons/Loaded_7_B2B/hooks/template_content_account_receipt.xml new file mode 100644 index 000000000..e991b65b5 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/template_content_account_receipt.xml @@ -0,0 +1,43 @@ + + + After VQMOD-001 + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + modCheck('addons/purchase_orders_service/classes/order.php')); + } + //Purchase Orders Service Module(PO) End + ]]> + + + + + get('receipt_payment_method_title'); ?> info['payment_method']; ?>
    + ]]>     + +
    get('text_po_number_title'); ?> + +
    + + + ]]>     +     +     +     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/templates_content_account_account_history.xml b/catalog/addons/Loaded_7_B2B/hooks/templates_content_account_account_history.xml new file mode 100644 index 000000000..f804330fa --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/templates_content_account_account_history.xml @@ -0,0 +1,60 @@ + + + After VQMOD-001 + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + ]]> + modCheck('addons/purchase_orders_service/classes/order.php')); + } + //Purchase Orders Service Module(PO) End + ?> + ]]> + + + + + get('text_total'); ?> + ]]> + + get('text_po_number_heading'); ?> + + ]]> + + + + + value('order_total')); ?> + ]]> + + + + valueInt('orders_id')); ?> + + + ]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_confirmation.xml b/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_confirmation.xml new file mode 100644 index 000000000..b5edf0a51 --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_confirmation.xml @@ -0,0 +1,32 @@ + + + After VQMOD-001 + 1.0.0 + 2.3.2 + loadedcommerce.com + + + isLoggedOn() !== false) { + ]]> + +
    +

    get('text_po_numbers_service_heading'); ?>

    +

    get('text_po_numbers_service_instructions'); ?>

    + +
    + +
    +
    +     +     +     +     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml b/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml new file mode 100644 index 000000000..a29401ebb --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml @@ -0,0 +1,44 @@ + + + After VQMOD-001 + 1.0.0 + 2.3.2 + loadedcommerce.com + + + getID()); + ]]> + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/order.php')); + } + //Purchase Orders Service Module(PO) End + ]]> + + + + +

    + ]]>     + +
    +

    get('text_po_number_title'); ?>

    +

    +
    + + ]]>     +     +     +     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/images/loaded7_b2b.png b/catalog/addons/Loaded_7_B2B/images/loaded7_b2b.png new file mode 100644 index 0000000000000000000000000000000000000000..ff32445bac3c8609ae0eb6d58958b1ca8e32e297 GIT binary patch literal 3220 zcmaJ^c|4SB8=fKCG?FFTA!8~_*~V@%24iO|Gb4K$Gh>WpX3UH|%MnLIva}r(iaLdZ z6Ov>tOCqIX%My_#vPFgPjZSsGKfb>A_rCA5{I2V|@B6v0e;&4@y`>;X8Uz3U1g)*i zFr3km^BMBJ~!qR+MVR!}!U_zw%kRaAUcrpn?!V@EcpO6dz0B$G+ z=gM+L+rbI6AT|6hMlC#u&S7)Jkl}PZA%Mh!_>jmHDgwG#+W>`7hzO{Q4q5|EN0Iy} zR*?)6HqstPhzuYY5TQsTh+#OKBM?Ml;UVEcfm9|u90C2R3+K#tx7DGLuMk!M0{Tx< zu4qRHipC&8bkwv|2^ugML|0c0rmdr^3sZq;YQQwrH8`)XDoh)$qYKy6gM53SoM;T9 zFC1fL@hui-g@F38Sai6$dRSPPT9}p^jX_q285kJsYG`VzauBM_2r3I7u1aMd`mSI` zViFh>I*UT1LUtALKC}=P0?NtspAv%TKV+%QZ^y(rF!gXeT^**Tv0Ku2AR7Jup+P}E z&`cJF^l!fZQ<#a1pp(=wBql9{LEtpb_t0)AIvm9y;aM~Wjz$aoeu|EMG!~8NN25bf zSY3#c3x!Igg)x=C;?ZchHI>Q2Qwbz%GX#{Qphlq(;X3B#<}h7-4Va0x84PBwWuRlB zfzsF4(9}ZdqO`S9-??TqLP!va%KFYF{>z2^l)Gz%AUY?q8Hqs&B@rzcv>?dWlHrt} z=Avi*Q@w9o;!ktYv-l}jos*3EZe#ze(ciZ??%AFGuq|it!}ugB$L$P`tyhA3-2eaq zerq!mT==Vb&j6;3<$*c`qPFMV)?LDr^C}H-kAn@&o%9v-fuIhYsndGnMD;TJD9ET; zqPduhef=zV0uUR`#2)1$dw@8?SkdkRhp>50A+)Xg%f!kh0-mDU?MMo9II0#(}lsVhMRFomtE2AsQN z*!Yb$f3oV*{&0X$6-g((#In%bWEH%sJP-UL zXJ0hP)lrsM&G)=77nplD?a0|Eg14vHt2R}YdZ{=FVyWGj+*B@*!KR;QhqXJ`U%`2# z)m{dVs%5Am54ZHs=nl(Khx1A%GS|f8)0~vv67%x9ql?GV0orUksANPIt_?esE`YU7 z-WM3>Er-rf?ILIz3aE;@1aXV8u0fjJ-U2=AyRSvuV8pU->syAtHyXTjoallK`2^gf zL(j!6QoJ)>`*!l%SDK0;Op!vKa^c;nsP|YWGqDV+8SLb%uCNOTQsg`(a$0l_9H2`vbY{tbpZwm+r9Ey?Q zm$@|6uCgVu^(A#)X2aN9wm|4mqQRQGpG~!BNadM7ErESJnsw7k57w|Z-VU`F+GC=- zGo>Hik4DP2S*6w4n7npNrfw(9KT7k`IC98c(sC0byf1Z{kGtFH%W^kh5=oC$zLbL4 zF!mj@->2z2?eN%GcB0fr6ZL!4;XvxvHXttc#YoykiO_1vc00L|0`G-1x)EFQVyNz7 zcV}yy;FHN;h*P5yT?B7jw{nj|tj9pb^53DLr5KUW@drGLQ&wcHSnf}w#zn7D!Ai*% zMY%BGF($H9h&Qh-DmLLX&!F3QmD_!5fu5@;{_v!OytlDenjVm!zqKght0S`+i1ST+ z0ffNFkdd`M?xK=Urg1D4|FrNlEny9`WUj$Z^dNAiSU|ymfryN z-n*BrptWO0Iw>L*3jgg2yd>vbNaTS^9j=y^f`>};{^jzW@NjD>zM(%)OJKISV#?Ng zcyhDoW62eb$736HeYIL2Rr8$bc50^_C~JDUW)k)c6=0vT;4HN^t0NN|3gGuRW~MmymwqqMRC5OISI+C)N_w+= zD%0&6D{iO_Xe|6GMQjy0akTOoiIwIe=DRGKOdfBrNueP9KP2U+<QVZHw?TDj#I9`D_!>tHKw61O}nZ zkqhQ%m_q?IH@FP@ z)Dau99pkrq9V+1H7mv%7@uI2$fg>}wZ1$F$zErX)zGDO}U#DWc+IS30TOVwR%odyy zrm$OMk0jd94xcwEu^ks@>W5ss_oU-+{U_ZPD2?WEy2JlN%L`sV;* zxwQ2ZvT^g(O&KXXrG4yLq`51mRxCv^1|>Y;f_E>t+{mYvie*iQdB3~HdI_MUI;R_j zO11436XPxJh0DY^mAEuJM@rmz*bSb9!qWUk(FJm#+h1zADsXuI`QtSi6u^noqn(@H ze+=~s=(jX15jvVq+nSe^gTQQsla?J`%#9)z^PWa-xNc5xg<*!cGLg4uw4@6pdS*hs zS7mWb@VMo3FFf)bYfguVoh9!#5F8wtYg{+^82P5A!%g*QWBlZU;ON8k4xjR_f0rdUgd%F z0lRnJDJ%#vzEQqMNxCF4%hqX+-MW0-Lc;s|@oyNHny>GrhR9od5}q8BEu2_X&RxG^ zck;5&(O?D7w{e6XeLSx^JGfatGg&)-DE9(&s3fM{^=7+%`|MkLm9Fhu8i8PmB$+b` zb{Y7m`H#kJZx;>HgcSEyAC|7cmVrL7c4}1kJKakwy(!^uesN6rDBbOMH7MSx8ld$d zRk@I;zY=n{j@;AbAtEGsaO-YKla?!Uzl*|On(i5^MxKIVPBFi(W~5-i#JiqmAQbxJ zl(-|k^o&{EMdYS5B{%RwkVf>pNMrbmzdC)d+E>ZNHxwr4G=*gAxjJbR8=OvPxv#qD z+!^p(%1p|`xy3>(9%MJKowQXRw7xttsTvvx4z$;fNQD-X_eHiP7R+82^~h4yb-j6f z)VXvTxcD)_gWIQHUTCl09m8c08*#5C5%K+8hLzfp&_NIp}$l|=9=fmiF&suK;J47^ zbPJf8?GbX+p>q;_#a@d%3-XE1A + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/languages/en_US.xml b/catalog/addons/Loaded_7_B2B/languages/en_US.xml new file mode 100644 index 000000000..0498bebab --- /dev/null +++ b/catalog/addons/Loaded_7_B2B/languages/en_US.xml @@ -0,0 +1,35 @@ + + + + + addon_system_b2b_title + + checkout + + + addon_system_b2b_description + + checkout + + + text_po_numbers_service_heading + + general + + + text_po_number_heading + + general + + + text_po_number_title + + general + + + text_po_numbers_service_instructions + + general + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php b/catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php new file mode 100644 index 000000000..eef60e63a --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php @@ -0,0 +1,124 @@ +modCheck(DIR_FS_ADMIN . 'includes/applications/categories/classes/categories.php')); +include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/classes/category_tree.php')); + +class lC_Categories_pro_Admin extends lC_Categories_Admin { + /* + * Save the category record + * + * @param integer $id The category id on update, null on insert + * @param array $data The category information + * @access public + * @return boolean + */ + public static function save($id = null, $data) { + global $lC_Database, $lC_Language; + + $category_id = parent::save($id, $data); + + return $category_id; + } + /* + * Get related products/categories html + * + * @access public + * @return string + */ + public static function getProductRelatedHtml($cid = '') { + global $lC_Language; + + $lC_Language->loadIniFile('categories.php'); + + $pData = self::_getProductsRelated($cid); + + $html = '' . + '
    ' . + ' ' . $lC_Language->get('field_products_related') . '' . + '
    ' . + '
    ' . + '
    ' . + '
    ' . number_format($pData['products_in_category'], 0) . '
    ' . + '
    ' . $lC_Language->get('field_products_in_category') . '
    ' . + '
    ' . + '
    ' . + '
    ' . number_format($pData['number_of_sub_categories'], 0) . '
    ' . + '
    ' . $lC_Language->get('field_sub_categories') . '
    ' . + '
    ' . + '
    ' . + '
    ' . number_format($pData['products_in_sub_categories'], 0) . '
    ' . + '
    ' . $lC_Language->get('field_products_in_sub_categories') . '
    ' . + '
    ' . + '
    ' . + '
    ' . number_format($pData['total_products'], 0) . '
    ' . + '
    ' . $lC_Language->get('field_total_products') . '
    ' . + '
    ' . + '
    ' . + '
    ' . + '
    '; + + return $html; + } + + protected static function _getProductsRelated($cid) { + global $lC_Database, $lC_CategoryTree; + + $total = 0; + $pData = array(); + if (!is_numeric($cid)) return false; + + // get number of products in this category + $Qp2c = $lC_Database->query('select count(*) as total from :table_products_to_categories where `categories_id` = :categories_id'); + $Qp2c->bindTable(':table_products_to_categories', TABLE_PRODUCTS_TO_CATEGORIES); + $Qp2c->bindInt(':categories_id', $cid); + $Qp2c->execute(); + + $pData['products_in_category'] = $Qp2c->valueInt('total'); + $total = (int)$total + $Qp2c->valueInt('total'); + + // get the number of sub categories under this category + $lC_CategoryTree = new lC_CategoryTree_Admin(); + $catArr = $lC_CategoryTree->getArray($cid); + $pData['number_of_sub_categories'] = count($catArr); + + $pCnt = 0; + foreach ($catArr as $value) { + $catID = end(explode('_', $value['id'])); + $pCnt = (int)$pCnt + self::_numberofProducts($catID); + } + $pData['products_in_sub_categories'] = $pCnt; + $total = (int)$total + $pCnt; + + $pData['total_products'] = $total; + + return $pData; + } + + protected static function _numberofProducts($cid) { + global $lC_Database; + + // get number of products in this category + $Qp2c = $lC_Database->query('select count(*) as total from :table_products_to_categories where `categories_id` = :categories_id'); + $Qp2c->bindTable(':table_products_to_categories', TABLE_PRODUCTS_TO_CATEGORIES); + $Qp2c->bindInt(':categories_id', $cid); + $Qp2c->execute(); + + $total = $Qp2c->valueInt('total'); + + $Qp2c->freeResult(); + + return (int)$total; + } +} \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php new file mode 100644 index 000000000..7e8bf8374 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php @@ -0,0 +1,219 @@ +query('select * from :table_product_classes where language_id = :language_id order by name'); + $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qclasses->bindInt(':language_id', $lC_Language->getID()); + $Qclasses->execute(); + + $result = array('aaData' => array()); + while ( $Qclasses->next() ) { + $name = $Qclasses->value('name'); + if ( $Qclasses->valueInt('id') == DEFAULT_PRODUCT_CLASSES_ID ) { + $name .= '' . $lC_Language->get('default_entry') . ''; + } + + $title = '' . $name . ''; + $comment = '' . $Qclasses->value('comment') . ''; + $usage = ' '; + $action = ' + ' . (($media === 'mobile-portrait' || $media === 'mobile-landscape') ? NULL : $lC_Language->get('icon_edit')) . ' + + '; + + $result['aaData'][] = array("$title", "$comment", "$usage", "$action"); + $result['entries'][] = $Qclasses->toArray(); + } + + $Qclasses->freeResult(); + + return $result; + } + /* + * Return the data used on the dialog forms + * + * @param integer $id The customer groups id + * @param boolean $edit True = called from edit dialog else called from delete dialog + * @access public + * @return array + */ + public static function getFormData($id = null, $edit = false) { + global $lC_Database, $lC_Language; + + $result = array(); + if (isset($id) && $id != null) { + if ($edit === true) { + $Qclasses = $lC_Database->query('select language_id, name, comment from :table_product_classes where id = :id'); + $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qclasses->bindInt(':id', $id); + $Qclasses->execute(); + + $status_name = array(); + $result['editComment'] = ''; + while ( $Qclasses->next() ) { + $status_name[$Qclasses->valueInt('language_id')] = $Qclasses->value('name'); + $result['editComment'] = $Qclasses->value('comment'); + } + $result['editNames'] = ''; + foreach ( $lC_Language->getAll() as $l ) { + $result['editNames'] .= '' . lc_draw_input_field('name[' . $l['id'] . ']', (isset($status_name[$l['id']]) ? $status_name[$l['id']] : null), 'class="input-unstyled"') . '
    '; + } + } else { + $Qclasses = $lC_Database->query('select count(*) as total from :table_products where product_class_id = :product_class_id'); + $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qclasses->bindInt(':product_class_id', $id); + $Qclasses->execute(); + + if ( $Qclasses->valueInt('total') > 0 ) { + $result['totalProducts'] = $Qclasses->valueInt('total'); + $result['rpcStatus'] = -2; + } + } + } else { + $result['names'] = ''; + foreach ( $lC_Language->getAll() as $l ) { + $result['names'] .= '' . lc_draw_input_field('name[' . $l['id'] . ']', null, 'class="input-unstyled"') . '
    '; + } + } + + return $result; + } + /* + * Get the customer group information + * + * @param integer $id The customer group id + * @access public + * @return array + */ + public static function getData($id) { + global $lC_Database, $lC_Language; + + $Qclasses = $lC_Database->query('select* from :table_product_classes where id = :id and language_id = :language_id order by name'); + $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qclasses->bindInt(':id', $id); + $Qclasses->bindInt(':language_id', $lC_Language->getID()); + + $data = $Qclasses->toArray(); + + $Qclasses->freeResult(); + + return $data; + } + /* + * Save the customer group information + * + * @param integer $id The customer group id used on update, null on insert + * @param array $data An array containing the customer group information + * @param boolean $default True = set the customer group to be the default + * @access public + * @return boolean + */ + public static function save($id = null, $data, $default = false) { + global $lC_Database, $lC_Language; + + $error = false; + + $lC_Database->startTransaction(); + + if ( is_numeric($id) ) { + $product_class_id = $id; + } else { + $Qpc = $lC_Database->query('select max(id) as product_class_id from :table_product_classes'); + $Qpc->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qpc->execute(); + + $product_class_id = $Qpc->valueInt('product_class_id') + 1; + } + + foreach ( $lC_Language->getAll() as $l ) { + if ( is_numeric($id) ) { + $Qpc = $lC_Database->query('update :table_product_classes set name = :name, comment = :comment where id = :id and language_id = :language_id'); + } else { + $Qpc = $lC_Database->query('insert into :table_product_classes (name, comment, language_id) values (:name, :comment, :language_id)'); + } + + $Qpc->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qpc->bindInt(':id', $product_class_id); + $Qpc->bindValue(':name', $data['name'][$l['id']]); + $Qpc->bindValue(':comment', $data['comment']); + $Qpc->bindInt(':language_id', $l['id']); + $Qpc->setLogging($_SESSION['module'], $product_class_id); + $Qpc->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + break; + } + } + + if ( $error === false ) { + if ( $default === true ) { + $Qupdate = $lC_Database->query('update :table_configuration set configuration_value = :configuration_value where configuration_key = :configuration_key'); + $Qupdate->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qupdate->bindInt(':configuration_value', $product_class_id); + $Qupdate->bindValue(':configuration_key', 'DEFAULT_PRODUCT_CLASSES_ID'); + $Qupdate->setLogging($_SESSION['module'], $product_class_id); + $Qupdate->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + } + } + } + + if ( $error === false ) { + $lC_Database->commitTransaction(); + + if ( $default === true ) { + lC_Cache::clear('configuration'); + } + + return true; + } + + $lC_Database->rollbackTransaction(); + + return false; + } + /* + * Delete the customer group record + * + * @param integer $id The customer group id to delete + * @access public + * @return boolean + */ + public static function delete($id) { + global $lC_Database; + + $Qclasses = $lC_Database->query('delete from :table_product_classes where id = :id'); + $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qclasses->bindInt(':id', $id); + $Qclasses->setLogging($_SESSION['module'], $id); + $Qclasses->execute(); + + if ( $lC_Database->isError() ) { + return false; + } + + return true; + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php new file mode 100644 index 000000000..c418dc4ef --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php @@ -0,0 +1,78 @@ + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php new file mode 100644 index 000000000..faf5f69e2 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php @@ -0,0 +1,39 @@ + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php new file mode 100644 index 000000000..6895ceaa9 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php @@ -0,0 +1,94 @@ + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php new file mode 100644 index 000000000..33b2e1160 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php @@ -0,0 +1,117 @@ + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php new file mode 100644 index 000000000..c9f8bede6 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php @@ -0,0 +1,115 @@ + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php new file mode 100644 index 000000000..9836d1d27 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php @@ -0,0 +1,60 @@ + + +
    + +
    +

    getPageTitle(); ?>

    +
    + +
    +
    + + + + + + + + + + + + + + + + +
    get('table_heading_name'); ?>get('table_heading_comment'); ?>get('table_heading_usage'); ?>  get('table_heading_action'); ?>
     
    +
    +
    + +
    +
    +loadModal($lC_Template->getModule()); ?> + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php new file mode 100644 index 000000000..fa1be3dfe --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php @@ -0,0 +1,28 @@ +_page_title = $lC_Language->get('heading_title'); + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php new file mode 100644 index 000000000..96842cc45 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php @@ -0,0 +1,1094 @@ +modCheck(DIR_FS_ADMIN . 'includes/applications/products/classes/products.php')); +include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/applications/customer_groups/classes/customer_groups.php')); + +class lC_Products_pro_Admin extends lC_Products_Admin { + /* + * Save the product + * + * @param integer $id The products id to update, null on insert + * @param array $data The products information + * @access public + * @return boolean + */ + public static function save($id = null, $data) { + global $lC_Database, $lC_Language, $lC_Image; + + $error = false; + + $products_id = parent::save($id, $data); + + $group = (defined('DEFAULT_CUSTOMERS_GROUP_ID') && DEFAULT_CUSTOMERS_GROUP_ID != null) ? (int)DEFAULT_CUSTOMERS_GROUP_ID : 1; + + // qty price breaks + if (is_array($data['products_qty_break_point'][$group]) && $data['products_qty_break_point'][$group][1] != null) { + if ($products_id != null) { + + $lC_Database->startTransaction(); + + // remove any old pricing records + $Qpricing = $lC_Database->query('delete from :table_products_pricing where products_id = :products_id'); + $Qpricing->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qpricing->bindInt(':products_id', $products_id); + $Qpricing->setLogging($_SESSION['module'], $products_id); + $Qpricing->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + } else { + // add the new records + + foreach($data['products_qty_break_point'][$group] as $key => $val) { + + if ($data['products_qty_break_point'][$group][$key] == null) continue; + if ($data['products_qty_break_point'][$group][$key] == '1') continue; + + $Qpb = $lC_Database->query('insert into :table_products_pricing (products_id, group_id, tax_class_id, qty_break, price_break, date_added) values (:products_id, :group_id, :tax_class_id, :qty_break, :price_break, :date_added)'); + $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qpb->bindInt(':products_id', $products_id ); + $Qpb->bindInt(':group_id', $group); + $Qpb->bindInt(':tax_class_id', $data['tax_class_id'] ); + $Qpb->bindValue(':qty_break', $data['products_qty_break_point'][$group][$key] ); + $Qpb->bindValue(':price_break', $data['products_qty_break_price'][$group][$key] ); + $Qpb->bindRaw(':date_added', 'now()'); + $Qpb->setLogging($_SESSION['module'], $products_id); + $Qpb->execute(); + } + } + + if ( $error === false ) { + $lC_Database->commitTransaction(); + } + + $lC_Database->rollbackTransaction(); + } + } + + // subproducts + if ( $error === false ) { + if (isset($data['sub_products_name'])) { + + if (is_numeric($id)) { + // first delete the subproducts that have been removed and not in the post data + $Qchk = $lC_Database->query('select products_id from :table_products where parent_id = :parent_id'); + $Qchk->bindTable(':table_products', TABLE_PRODUCTS); + $Qchk->bindInt(':parent_id', $products_id); + $Qchk->execute(); + + while( $Qchk->next() ) { + if (! @in_array($Qchk->valueInt('products_id'), $data['sub_products_id'])) { + self::delete($Qchk->valueInt('products_id')); + } + } + } else { + // delete any possible ghosts for sanity + $Qdel = $lC_Database->query('delete from :table_products where parent_id = :products_id and is_subproduct = :is_subproduct'); + $Qdel->bindTable(':table_products', TABLE_PRODUCTS); + $Qdel->bindInt(':parent_id', $products_id); + $Qdel->bindInt(':is_subproduct', 1); + $Qdel->execute(); + } + + for ($i=0; $i < sizeof($data['sub_products_name']); $i++) { + if ($data['sub_products_name'][$i] == '') continue; + + if (is_numeric($id) && @in_array($data['sub_products_id'][$i], $data['sub_products_id'])) { + // update the subproduct record + $Qsubproduct = $lC_Database->query('update :table_products set products_quantity = :products_quantity, products_cost = :products_cost, products_price = :products_price, products_sku = :products_sku, products_weight = :products_weight, products_weight_class = :products_weight_class, products_status = :products_status, products_tax_class_id = :products_tax_class_id, products_date_added = :products_date_added, is_subproduct = :is_subproduct where parent_id = :parent_id and products_id = :products_id'); + $Qsubproduct->bindInt(':products_id', $data['sub_products_id'][$i]); + } else { + // add new subproduct record + $Qsubproduct = $lC_Database->query('insert into :table_products (parent_id, products_quantity, products_cost, products_price, products_sku, products_weight, products_weight_class, products_status, products_tax_class_id, products_ordered, products_date_added, is_subproduct) values (:parent_id, :products_quantity, :products_cost, :products_price, :products_sku, :products_weight, :products_weight_class, :products_status, :products_tax_class_id, :products_ordered, :products_date_added, :is_subproduct)'); + $Qsubproduct->bindInt(':products_ordered', $data['products_ordered'][$i]); + } + + $Qsubproduct->bindTable(':table_products', TABLE_PRODUCTS); + $Qsubproduct->bindInt(':parent_id', $products_id); + $Qsubproduct->bindInt(':products_quantity', $data['sub_products_qoh'][$i]); + $Qsubproduct->bindFloat(':products_cost', preg_replace('/[^0-9]\./', '', $data['sub_products_cost'][$i])); + $Qsubproduct->bindFloat(':products_price', preg_replace('/[^0-9]\./', '', $data['sub_products_price'][1][$i])); // retail group - other prices go into pricing table + $Qsubproduct->bindValue(':products_sku', $data['sub_products_sku'][$i]); + $Qsubproduct->bindFloat(':products_weight', $data['sub_products_weight'][$i]); + $Qsubproduct->bindInt(':products_weight_class', $data['weight_class']); + $Qsubproduct->bindInt(':products_status', $data['sub_products_status'][$i]); + $Qsubproduct->bindInt(':products_tax_class_id', $data['tax_class_id']); + $Qsubproduct->bindRaw(':products_date_added', 'now()'); + $Qsubproduct->bindInt(':is_subproduct', ($data['sub_products_default'][$i] == '1' || sizeof($data['sub_products_name']) == 2) ? 2 : 1); + $Qsubproduct->setLogging($_SESSION['module'], $products_id); + $Qsubproduct->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + } else { + if ( is_numeric($id) && @in_array($data['sub_products_id'][$i], $data['sub_products_id']) ) { + $sub_products_id = $data['sub_products_id'][$i]; + } else { + $sub_products_id = self::_getLastID(); + } + // subproduct description + foreach ($lC_Language->getAll() as $l) { + if (is_numeric($id) && @in_array($data['sub_products_id'][$i], $data['sub_products_id'])) { + $Qpd = $lC_Database->query('update :table_products_description set products_name = :products_name where products_id = :products_id and language_id = :language_id'); + } else { + $Qpd = $lC_Database->query('insert into :table_products_description (products_id, language_id, products_name) values (:products_id, :language_id, :products_name)'); + } + $Qpd->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION); + $Qpd->bindInt(':products_id', $sub_products_id); + $Qpd->bindInt(':language_id', $l['id']); + $Qpd->bindValue(':products_name', $data['sub_products_name'][$i]); + $Qpd->setLogging($_SESSION['module'], $sub_products_id); + $Qpd->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + break; + } + } + } + + //subproduct images + if ( $error === false ) { + if (empty($_FILES['sub_products_image']['name'][$i]) === false) { + $images = array(); + $file = array('name' => $_FILES['sub_products_image']['name'][$i], + 'type' => $_FILES['sub_products_image']['type'][$i], + 'size' => $_FILES['sub_products_image']['size'][$i], + 'tmp_name' => $_FILES['sub_products_image']['tmp_name'][$i]); + + $products_image = new upload($file); + + $products_image->set_extensions(array('gif', 'jpg', 'jpeg', 'png')); + + if ( $products_image->exists() ) { + $products_image->set_destination(realpath('../images/products/originals')); + + if ( $products_image->parse() && $products_image->save() ) { + $images[] = $products_image->filename; + } + } + + $default_flag = 1; + + foreach ($images as $image) { + $Qimage = $lC_Database->query('insert into :table_products_images (products_id, image, default_flag, sort_order, date_added) values (:products_id, :image, :default_flag, :sort_order, :date_added)'); + $Qimage->bindTable(':table_products_images', TABLE_PRODUCTS_IMAGES); + $Qimage->bindInt(':products_id', $sub_products_id); + $Qimage->bindValue(':image', $image); + $Qimage->bindInt(':default_flag', $default_flag); + $Qimage->bindInt(':sort_order', 0); + $Qimage->bindRaw(':date_added', 'now()'); + $Qimage->setLogging($_SESSION['module'], $products_id); + $Qimage->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + } else { + foreach ($lC_Image->getGroups() as $group) { + if ($group['id'] != '1') { + $lC_Image->resize($image, $group['id']); + } + } + } + $default_flag = 0; + } + } + } + } + } + } + + // combo variants + if ( $error === false ) { + $variants_array = array(); + $default_variant_combo = null; + + if ( isset($data['variants']) && !empty($data['variants']) ) { + foreach ( $data['variants'] as $key => $combo ) { + if (isset($data['variants'][$key]['product_id']) && $data['variants'][$key]['product_id'] != 0) { + $Qsubproduct = $lC_Database->query('update :table_products set products_quantity = :products_quantity, products_cost = :products_cost, products_price = :products_price, products_msrp = :products_msrp, products_model = :products_model, products_sku = :products_sku, products_weight = :products_weight, products_weight_class = :products_weight_class, products_status = :products_status, products_tax_class_id = :products_tax_class_id where products_id = :products_id'); + $Qsubproduct->bindInt(':products_id', $data['variants'][$key]['product_id']); + } else { + $Qsubproduct = $lC_Database->query('insert into :table_products (parent_id, products_quantity, products_cost, products_price, products_msrp, products_model, products_sku, products_weight, products_weight_class, products_status, products_tax_class_id, products_date_added) values (:parent_id, :products_quantity, :products_cost, :products_price, :products_msrp, :products_model, :products_sku, :products_weight, :products_weight_class, :products_status, :products_tax_class_id, :products_date_added)'); + $Qsubproduct->bindInt(':parent_id', $products_id); + $Qsubproduct->bindRaw(':products_date_added', 'now()'); + } + + $price = 0.00; + if (is_array($data['variants'][$key]['price'])) $price = $data['variants'][$key]['price'][0]; + + $Qsubproduct->bindTable(':table_products', TABLE_PRODUCTS); + $Qsubproduct->bindInt(':products_quantity', $data['variants'][$key]['qoh']); + $Qsubproduct->bindFloat(':products_cost', $data['variants'][$key]['cost']); + $Qsubproduct->bindFloat(':products_price', $price); + $Qsubproduct->bindFloat(':products_msrp', $data['variants'][$key]['msrp']); + $Qsubproduct->bindValue(':products_model', $data['variants'][$key]['model']); + $Qsubproduct->bindValue(':products_sku', $data['variants'][$key]['sku']); + $Qsubproduct->bindFloat(':products_weight', $data['variants'][$key]['weight']); + $Qsubproduct->bindInt(':products_weight_class', $data['weight_class']); + $Qsubproduct->bindInt(':products_status', $data['variants'][$key]['status']); + $Qsubproduct->bindInt(':products_tax_class_id', $data['tax_class_id']); + $Qsubproduct->setLogging($_SESSION['module'], $products_id); + $Qsubproduct->execute(); + + if ( isset($data['variants'][$key]['product_id']) && $data['variants'][$key]['product_id'] != '0') { + $subproduct_id = $data['variants'][$key]['product_id']; + } else { + $Qnext = $lC_Database->query('select max(products_id) as maxID from :table_products'); + $Qnext->bindTable(':table_products', TABLE_PRODUCTS); + $Qnext->execute(); + $subproduct_id = $Qnext->valueInt('maxID'); + $Qnext->freeResult(); + } + + if ( $data['variants'][$key]['default_combo'] == 1) { + $default_variant_combo = $subproduct_id; + } + + foreach ( $data['variants'][$key]['values'] as $values_id => $values_text ) { + + $variants_array[$subproduct_id][] = $values_id; + + $check_combos_array[] = $values_id; + + $Qcheck = $lC_Database->query('select products_id from :table_products_variants where products_id = :products_id and products_variants_values_id = :products_variants_values_id'); + $Qcheck->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qcheck->bindInt(':products_id', $subproduct_id); + $Qcheck->bindInt(':products_variants_values_id', $values_id); + $Qcheck->execute(); + + if ( $Qcheck->numberOfRows() < 1 ) { + + $Qvcombo = $lC_Database->query('insert into :table_products_variants (products_id, products_variants_values_id) values (:products_id, :products_variants_values_id)'); + $Qvcombo->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qvcombo->bindInt(':products_id', $subproduct_id); + $Qvcombo->bindInt(':products_variants_values_id', $values_id); + $Qvcombo->setLogging($_SESSION['module'], $products_id); + $Qvcombo->execute(); + + if ( $lC_Database->isError() ) { + $error = true; + break 2; + } + } + } + + } + } + + if ( $error === false ) { + if ( empty($variants_array) ) { + $Qcheck = $lC_Database->query('select pv.* from :table_products p, :table_products_variants pv where p.parent_id = :parent_id and p.products_id = pv.products_id'); + $Qcheck->bindTable(':table_products', TABLE_PRODUCTS); + $Qcheck->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qcheck->bindInt(':parent_id', $products_id); + $Qcheck->execute(); + + while ( $Qcheck->next() ) { + $Qdel = $lC_Database->query('delete from :table_products_variants where products_id = :products_id'); + $Qdel->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); + $Qdel->execute(); + + $Qdel = $lC_Database->query('delete from :table_products where products_id = :products_id'); + $Qdel->bindTable(':table_products', TABLE_PRODUCTS); + $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); + $Qdel->execute(); + + } + } else { + $Qcheck = $lC_Database->query('select pv.* from :table_products p, :table_products_variants pv where p.parent_id = :parent_id and p.products_id = pv.products_id and pv.products_id not in (":products_id")'); + $Qcheck->bindTable(':table_products', TABLE_PRODUCTS); + $Qcheck->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qcheck->bindInt(':parent_id', $products_id); + $Qcheck->bindRaw(':products_id', implode('", "', array_keys($variants_array))); + $Qcheck->execute(); + + while ( $Qcheck->next() ) { + $Qdel = $lC_Database->query('delete from :table_products_variants where products_id = :products_id and products_variants_values_id = :products_variants_values_id'); + $Qdel->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); + $Qdel->bindInt(':products_variants_values_id', $Qcheck->valueInt('products_variants_values_id')); + $Qdel->execute(); + + $Qdel = $lC_Database->query('delete from :table_products where products_id = :products_id'); + $Qdel->bindTable(':table_products', TABLE_PRODUCTS); + $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); + $Qdel->execute(); + + } + + foreach ( $variants_array as $key => $values ) { + $Qdel = $lC_Database->query('delete from :table_products_variants where products_id = :products_id and products_variants_values_id not in (":products_variants_values_id")'); + $Qdel->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qdel->bindInt(':products_id', $key); + $Qdel->bindRaw(':products_variants_values_id', implode('", "', $values)); + $Qdel->execute(); + } + } + } + + $Qupdate = $lC_Database->query('update :table_products set has_children = :has_children where products_id = :products_id'); + $Qupdate->bindTable(':table_products', TABLE_PRODUCTS); + $Qupdate->bindInt(':has_children', (empty($variants_array)) ? 0 : 1); + $Qupdate->bindInt(':products_id', $products_id); + $Qupdate->execute(); + + } + + if ( $error === false ) { + $Qupdate = $lC_Database->query('update :table_products_variants set default_combo = :default_combo where products_id in (":products_id")'); + $Qupdate->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qupdate->bindInt(':default_combo', 0); + $Qupdate->bindRaw(':products_id', implode('", "', array_keys($variants_array))); + $Qupdate->execute(); + + if ( is_numeric($default_variant_combo) ) { + $Qupdate = $lC_Database->query('update :table_products_variants set default_combo = :default_combo where products_id = :products_id'); + $Qupdate->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); + $Qupdate->bindInt(':default_combo', 1); + $Qupdate->bindInt(':products_id', $default_variant_combo); + $Qupdate->execute(); + } + } + + // customer access levels (B2B) + if ( $error === false ) { + $levels = ''; + if (is_array($data['access_levels'])) { + foreach($data['access_levels'] as $key => $val) { + $levels .= $key . ';'; + } + $levels = substr($levels, 0, -1); + } + + $Qupdate = $lC_Database->query('update :table_products set access_levels = :access_levels where products_id = :products_id'); + $Qupdate->bindTable(':table_products', TABLE_PRODUCTS); + $Qupdate->bindValue(':access_levels', $levels); + $Qupdate->bindInt(':products_id', $products_id); + $Qupdate->execute(); + } + + return $products_id; // Return the products id for use with the save_close buttons + + } + /* + * Return the product simple options accordian price listing content + * + * @access public + * @return array + */ + public static function getOptionsPricingContent() { + global $lC_Language, $pInfo; + + $content = ''; + $groups = lC_Customer_groups_Admin::getAll(); + foreach($groups['entries'] as $key => $value) { + $content .= '
    ' . $value['customers_group_name'] . '
    ' . + '
    ' . + '
    '; + + if (isset($pInfo) && is_array($pInfo->get('simple_options'))) { + $content .= '
    ' . + '
    ' . $lC_Language->get('text_simple_options') . '
    ' . + ' ' . + ' ' . lC_Products_Admin::getSimpleOptionsPricingTbody($pInfo->get('simple_options'), $value['customers_group_id']) . '' . + '
    ' . + '
    '; + + } + + if (isset($pInfo) && $pInfo->get('has_subproducts') == '1') { + $content .= '
    ' . + '
    ' . $lC_Language->get('text_sub_products') . '
    ' . + ' ' . + ' ' . lC_Products_pro_Admin::getSubProductsPricingTbody($pInfo, $value['customers_group_id']) . '' . + '
    ' . + '
    '; + + } + + if (isset($pInfo) && $pInfo->get('has_children') == '1') { + $content .= '
    ' . + '
    ' . $lC_Language->get('text_combo_options') . '
    ' . + ' ' . + ' ' . lC_Products_pro_Admin::getComboOptionsPricingTbody($pInfo, $value['customers_group_id']) . '' . + '
    ' . + '
    '; + } + + if ( (!isset($pInfo)) || (isset($pInfo) && $pInfo->get('has_subproducts') != '1' && $pInfo->get('has_children') != '1' && !is_array($pInfo->get('simple_options'))) ) { + $content .= '
    ' . $lC_Language->get('text_no_options_defined') . '
    '; + } + + $content .= '
    ' . + '
    '; + } + + return $content; + } + + /* + * Returns the icons used in the product listing + * + * @param integer $id The products id + * @access public + * @return string + */ + public static function getlistingIcons($products_id) { + global $lC_Language; + + $icons = parent::getlistingIcons($products_id); + + if (self::hasSubProducts($products_id)) { + $icons .= ''; + } + if (self::hasComboOptions($products_id)) { + $icons .= ''; + } + + return $icons; + } + /* + * Returns the price info used in the product listing + * + * @param integer $data The product data array + * @access public + * @return string + */ + public function getProductsListingPrice($data) { + global $lC_Database, $lC_Language, $lC_Currencies; + + if (self::hasSubProducts($data['products_id']) === false && self::hasComboOptions($data['products_id']) === false) { + $price = parent::getProductsListingPrice($data); + } else { + $mm = self::getMinMaxPrice($data['products_id']); + $price = ($mm['min'] == $mm['max']) ? $lC_Currencies->format($mm['min']) : '(' . $lC_Currencies->format($mm['min']) . ' - ' . $lC_Currencies->format($mm['max']) . ')'; + } + + return $price; + } + /* + * Returns the min/max price used in the product listing + * + * @param integer $id The product id + * @access public + * @return string + */ + public static function getMinMaxPrice($id) { + global $lC_Database; + + $Qproducts = $lC_Database->query('select MAX(products_price) as max, MIN(products_price) as min from :table_products where parent_id = :parent_id'); + $Qproducts->bindTable(':table_products', TABLE_PRODUCTS); + $Qproducts->bindInt(':parent_id', $id); + $Qproducts->execute(); + + $result = $Qproducts->toArray(); + + $Qproducts->freeResult(); + + return $result; + } + /* + * Returns the price info used in the product listing + * + * @param integer $data The product data array + * @access public + * @return string + */ + public function getProductsListingQty($data) { + global $lC_Database; + + if (self::hasSubProducts($data['products_id']) === false && self::hasComboOptions($data['products_id']) === false) { + $result = $data['products_quantity']; + } else { + $Qproducts = $lC_Database->query('select SUM(products_quantity) as total from :table_products where parent_id = :parent_id'); + $Qproducts->bindTable(':table_products', TABLE_PRODUCTS); + $Qproducts->bindInt(':parent_id', $data['products_id']); + $Qproducts->execute(); + + $result = '(' . $Qproducts->valueInt('total') . ')'; + + $Qproducts->freeResult(); + } + + return $result; + } + /* + * Determine if product has qty price breaks + * + * @param integer $id The product id + * @access public + * @return boolean + */ + public static function hasQPBPricing($id) { + global $lC_Database; + + $Qpb = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id and qty_break != :qty_break limit 1'); + $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qpb->bindInt(':products_id', $id); + $Qpb->bindInt(':qty_break', -1); + $Qpb->execute(); + + $rows = $Qpb->numberOfRows(); + + $Qpb->freeResult(); + + if ( $rows > 0 ) { + return true; + } + + return false; + } + /* + * Retrieve qty price breaks + * + * @param integer $id The product id + * @param integer $group The customer group id + * @access public + * @return array + */ + public static function getQPBPricing($id, $group = null) { + global $lC_Database; + + if ($group == null) $group = (defined('DEFAULT_CUSTOMERS_GROUP_ID') && DEFAULT_CUSTOMERS_GROUP_ID != null) ? (int)DEFAULT_CUSTOMERS_GROUP_ID : 1; + + $Qpb = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id and group_id = :group_id and qty_break != :qty_break order by qty_break asc'); + $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qpb->bindInt(':products_id', $id); + $Qpb->bindInt(':group_id', $group); + $Qpb->bindInt(':qty_break', -1); + $Qpb->execute(); + + $data = array(); + while($Qpb->next()) { + $data[] = $Qpb->toArray(); + } + + $Qpb->freeResult(); + + return $data; + } + /* + * Return the qty price breaks listing content + * + * @access public + * @return array + */ + public static function getQPBPricingContent() { + global $lC_Language, $lC_Currencies, $pInfo; + + $content = ''; + $groups = lC_Customer_groups_Admin::getAll(); + foreach($groups['entries'] as $key => $value) { + $cnt = 0; + $show_line = false; + if (utility::isB2B()) { + if (count($groups['entries'] > 1) && $cnt != count($groups['entries']) ) $show_line = true; + } else { + if ($value['customers_group_id'] != DEFAULT_CUSTOMERS_GROUP_ID) continue; // locked to default for Pro + } + + $base = (isset($pInfo)) ? (float)$pInfo->get('products_price') : 0.00; + $special = (isset($pInfo)) ? (float)$pInfo->get('products_special_price') : 0.00; + + $has_options = (isset($pInfo) && (self::hasComboOptions($pInfo->get('products_id')) || self::hasSubProducts($pInfo->get('products_id')))) ? true : false; + + $content .= '' . + + '
    ' . + '
    ' . + '
    ' . + ' #' . + ' ' . + '
    ' . + ' Qty'; + if ($has_options === false) { + $content .= '
    ' . + ' ' . $lC_Currencies->getSymbolLeft() . '' . + ' ' . + '
    ' . + ' Price'; + } + $content .= '
    '; + + if ( isset($pInfo) && self::hasQPBPricing($pInfo->get('products_id')) ) { + + $qpbData = self::getQPBPricing($pInfo->get('products_id'), $value['customers_group_id']); + + foreach ($qpbData as $key => $val) { + $content .= self::_getNewQPBPricingRow($val['group_id'], $cnt+1, $val); + $cnt++; + } + // add a new row + $content .= self::_getNewQPBPricingRow($value['customers_group_id'], $cnt+1); + } else { // no qpb recorded, setup new + $content .= self::_getNewQPBPricingRow($value['customers_group_id'], 1); + } + + $content .= '
    '; + + if ($show_line) $content .= '
    '; + + $cnt++; + } + + return $content; + } + /* + * Generate qty price break row + * + * @param integer $group The customer group id + * @param integer $cnt The product id + * @param array $data The product data + * @access private + * @return string + */ + private static function _getNewQPBPricingRow($group, $cnt, $data = array()) { + global $lC_Currencies, $pInfo; + + $has_options = (isset($pInfo) && (self::hasComboOptions($pInfo->get('products_id')) || self::hasSubProducts($pInfo->get('products_id')))) ? true : false; + + $content = '
    ' . + '
    ' . + ' #' . + ' ' . + '
    ' . + ' Qty'; + if ($has_options === false) { + $content .= '
    ' . + ' ' . $lC_Currencies->getSymbolLeft() . '' . + ' ' . + '
    ' . + ' Price'; + } + $content .= ' ' . + '
    '; + + return $content; + } + /* + * Determine if the product has combo options + * + * @param integer $id The product id + * @access public + * @return boolean + */ + public static function hasComboOptions($id) { + global $lC_Database; + + $Qchk = $lC_Database->query('select has_children from :table_products where parent_id = :parent_id and products_id = :products_id limit 1'); + $Qchk->bindTable(':table_products', TABLE_PRODUCTS); + $Qchk->bindInt(':parent_id', 0); + $Qchk->bindInt(':products_id', $id); + $Qchk->execute(); + + return ( $Qchk->valueInt('has_children') === 1 ); + } + /* + * Return the combo options listing content + * + * @param array $options The multi sku options array + * @access public + * @return array + */ + public static function getComboOptionsContent($options = array()) { + $content = ''; + + $content .= self::_getComboOptionsTbody($options); + + return $content; + } + /* + * Return the combo options pricing content + * + * @param array $data The product data object + * @access public + * @return string + */ + public static function getComboOptionsPricingTbody($pInfo, $customers_group_id) { + global $lC_Currencies; + + if ($customers_group_id == '') return false; + + $products_id = (isset($pInfo)) ? $pInfo->get('products_id') : null; + + $hasQPBPricing = self::hasQPBPricing($products_id); + + if (utility::isB2B()) { + $ok = true; + $input_class = null; + $readonly = null; + } else if (utility::isPro()) { + $ok = true; + $input_class = (($customers_group_id == DEFAULT_CUSTOMERS_GROUP_ID) ? null : ' disabled'); + $readonly = (($customers_group_id == '1' && $ok) ? '' : ' READONLY'); + } + + $tbody = ''; + $cnt = 0; + $bpArr = array(); + if (isset($pInfo) && $pInfo->get('has_children') == '1') { + + foreach ($pInfo->get('variants') as $product_id => $val) { + $title = ''; + if (is_array($val['values'])) { + foreach ($val['values'] as $group_id => $value_id) { + foreach ($value_id as $value) { + $title .= $value['value_title'] . ', '; + } + } + } + if (strstr($title, ',')) $title = substr($title, 0, -2); + + if ((isset($title) && $title != NULL)) { + if (isset($pInfo) && $hasQPBPricing && $cnt == 0) { + $qpbData = self::getQPBPricing($pInfo->get('products_id'), $customers_group_id); + $tbody .= '' . + '  ' . + ' Qty 1'; + foreach ($qpbData as $qkey => $qval) { + $bpArr[] = $qval['qty_break']; + $tbody .= ' Qty ' . $qval['qty_break'] . ''; + } + + // added for options w/special price + if (utility::isB2B()) { + $tbody .= ' Special Price'; + } + + $tbody .= ''; + } + + if (utility::isB2B()) { + $default_value = number_format($val['data']['price'], DECIMAL_PLACES); + } else if (utility::isPro()) { + $default_value = (($customers_group_id == DEFAULT_CUSTOMERS_GROUP_ID) ? number_format($val['data']['price'], DECIMAL_PLACES) : number_format(0, DECIMAL_PLACES)); + } + + $tbody .= '' . + ' ' . $title . ''; + + $tbody .= self::_getNewQPBPricingCol($product_id, $customers_group_id, $bpArr); + + // added for options w/special price + if (utility::isB2B()) { + $tbody .= self::_getNewSpecialPricingCol($product_id, $customers_group_id); + } + + $tbody .= ''; + + $cnt++; + } + } + } + + return $tbody; + } + /* + * Generate special price column + * + * @param integer $group The customer group id + * @param integer $cnt The product id + * @param array $data The product data + * @access private + * @return string + */ + private static function _getNewSpecialPricingCol($product_id, $group_id) { + global $lC_Currencies; + + $content .= ' ' . + '
    ' . + ' ' . $lC_Currencies->getSymbolLeft() . '' . + ' ' . + '
    ' . + ' '; + + return $content; + } + /* + * Generate qty price break column + * + * @param integer $group The customer group id + * @param integer $cnt The product id + * @param array $data The product data + * @access private + * @return string + */ + private static function _getNewQPBPricingCol($product_id, $group_id, $bpArr) { + global $lC_Currencies, $lC_Database, $pInfo; + + $content = ''; + if (is_array($bpArr)) { + + $content .= ' ' . + '
    ' . + ' ' . $lC_Currencies->getSymbolLeft() . '' . + ' ' . + '
    ' . + ' '; + + $cnt = 0; + reset($bpArr); + foreach($bpArr as $qty_break) { + + $Qpb = $lC_Database->query('select price_break from :table_products_pricing where products_id = :products_id and group_id = :group_id and qty_break = :qty_break limit 1'); + $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qpb->bindInt(':products_id', $product_id); + $Qpb->bindInt(':group_id', $group_id); + $Qpb->bindInt(':qty_break', $qty_break); + $Qpb->execute(); + + if ($Qpb->numberOfRows() > 0) { + $default_value = number_format($Qpb->valueDecimal('price_break'), DECIMAL_PLACES); + } else { + $default_value = number_format(0, DECIMAL_PLACES); + } + + $Qpb-> freeResult(); + + $content .= ' ' . + '
    ' . + ' ' . $lC_Currencies->getSymbolLeft() . '' . + ' ' . + '
    ' . + ' '; + $cnt++; + } + } + + return $content; + } + /* + * Return the product simple options tbody content + * + * @param array $options The product simple options array + * @access public + * @return string + */ + private static function _getComboOptionsTbody($options) { + global $lC_Currencies, $lC_Language; + + $tbody = ''; + $sort = 10; + $cnt = 0; + if (isset($options) && !empty($options)) { + foreach ($options as $product_id => $mso) { + $combo = ''; + $default = ''; + $module = ''; + $comboInput = ''; + if (is_array($mso['values'])) { + foreach ($mso['values'] as $group_id => $value_id) { + foreach ($value_id as $key => $data) { + $combo .= $data['value_title'] . ', '; + $module = $data['module']; + $default = $data['default']; + $default_visual = $data['default_visual']; + $comboInput .= ''; + $comboInput .= ''; + } + } + if (strstr($combo, ',')) $combo = substr($combo, 0, -2); + + $statusIcon = (isset($mso['data']['status']) && $mso['data']['status'] == '1') ? '' : ''; + $defaultIcon = (isset($default) && $default == '1') ? '' : ''; + + $tbody .= '' . $comboInput . + ' ' . + ' ' . $combo . '' . + ' ' . $defaultIcon . '' . + ' +
    + + ' . lC_Weight::getCode(SHIPPING_WEIGHT_UNIT) . ' +
    + ' . + ' ' . + ' ' . + ' +
    + ' . $lC_Currencies->getSymbolLeft() . ' + +
    + ' . + ' ' . + ' ' . + ' ' . + ' ' . + ' ' . $statusIcon . '' . + ' + + + ' . + ''; + } + $sort = ($sort + 10); + $cnt++; + } + } + + return $tbody; + } + /* + * Determine if the product has subproducts + * + * @param integer $id The product id + * @access public + * @return boolean + */ + public static function hasSubProducts($id) { + global $lC_Database; + + $Qchk = $lC_Database->query('select products_id from :table_products where parent_id = :parent_id and is_subproduct > :is_subproduct limit 1'); + $Qchk->bindTable(':table_products', TABLE_PRODUCTS); + $Qchk->bindInt(':parent_id', $id); + $Qchk->bindInt(':is_subproduct', 0); + $Qchk->execute(); + + if ( $Qchk->numberOfRows() === 1 ) { + return true; + } + + return false; + } + /* + * Return the sub products pricing content + * + * @param array $data The product data object + * @access public + * @return string + */ + public static function getSubProductsPricingTbody($pInfo, $customers_group_id) { + global $lC_Currencies; + + if ($customers_group_id == '') return false; + + $products_id = (isset($pInfo)) ? $pInfo->get('products_id') : null; + + $hasQPBPricing = self::hasQPBPricing($products_id); + + if (utility::isB2B()) { + $ok = true; + $input_class = null; + $readonly = null; + } else if (utility::isPro()) { + $ok = true; + $input_class = (($customers_group_id == DEFAULT_CUSTOMERS_GROUP_ID) ? null : ' disabled'); + $readonly = (($customers_group_id == '1' && $ok) ? '' : ' READONLY'); + } + + $tbody = ''; + $cnt = 0; + $bpArr = array(); + + if (isset($pInfo) && $pInfo->get('has_subproducts') == '1') { + foreach ($pInfo->get('subproducts') as $key => $sub) { + if ((isset($sub['products_name']) && $sub['products_name'] != NULL)) { + + if (isset($pInfo) && $hasQPBPricing && $cnt == 0) { + $qpbData = self::getQPBPricing($pInfo->get('products_id'), $customers_group_id); + $tbody .= '' . + '  ' . + ' Qty 1'; + foreach ($qpbData as $qkey => $qval) { + $bpArr[] = $qval['qty_break']; + $tbody .= ' Qty ' . $qval['qty_break'] . ''; + } + + // added for options w/special price + if (utility::isB2B()) { + $tbody .= ' Special Price'; + } + + $tbody .= ''; + } + + $default_value = (isset($sub['products_price']) ? number_format($sub['products_price'], DECIMAL_PLACES) : number_format(0, DECIMAL_PLACES)); + + $tbody .= '' . + ' ' . $sub['products_name'] . ''; + + $tbody .= self::_getNewQPBPricingCol($sub['products_id'], $customers_group_id, $bpArr); + + // added for options w/special price + if (utility::isB2B()) { + $tbody .= self::_getNewSpecialPricingCol($sub['products_id'], $customers_group_id); + } + + $tbody .= ''; + + $cnt++; + } + } + } + + return $tbody; + } + /* + * Get the QPB options product price + * + * @param integer $id The product id + * @access public + * @return boolean + */ + private static function _getQPBOptionPrice($products_id, $group_id, $qty_break) { + global $lC_Database; + + $Qproducts = $lC_Database->query('select price_break from :table_products_pricing where products_id = :products_id and group_id = :group_id and qty_break = :qty_break limit 1'); + $Qproducts->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qproducts->bindInt(':products_id', $products_id); + $Qproducts->bindInt(':group_id', $group_id); + $Qproducts->bindInt(':qty_break', $qty_break); + $Qproducts->execute(); + + $result = 0; + if ($Qproducts->numberOfRows() > 0) { + $result = $Qproducts->valueDecimal('price_break'); + } + + $Qproducts->freeResult(); + + return number_format($result, DECIMAL_PLACES); + } + + /* + * Get the special options product price + * + * @param integer $products_id The product id + * @param integer $group_id The customer group id + * @access public + * @return boolean + */ + private static function _getSpecialOptionPrice($products_id, $group_id) { + global $lC_Database; + + $Qproducts = $lC_Database->query('select special_price from :table_products_pricing where products_id = :products_id and group_id = :group_id and special_status = :special_status limit 1'); + $Qproducts->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); + $Qproducts->bindInt(':products_id', $products_id); + $Qproducts->bindInt(':group_id', $group_id); + $Qproducts->bindInt(':special_status', 1); + $Qproducts->execute(); + + $result = 0; + if ($Qproducts->numberOfRows() > 0) { + $result = $Qproducts->valueDecimal('special_price'); + } + + $Qproducts->freeResult(); + + return number_format($result, DECIMAL_PLACES); + } +} \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php new file mode 100644 index 000000000..4c2e2fc1b --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php @@ -0,0 +1,30 @@ + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php new file mode 100644 index 000000000..8ede8347c --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php @@ -0,0 +1,603 @@ + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php new file mode 100644 index 000000000..eb9762b92 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php @@ -0,0 +1,347 @@ + +
    + + +
    + +
    + get('button_setup'); ?> + + + + + + + + + + + + + + + + get('variants')) : null); ?> +
     get('table_heading_option_set_name'); ?> get('table_heading_weight'); ?>get('table_heading_sku'); ?>get('table_heading_qoh'); ?>get('table_heading_price'); ?>get('table_heading_img'); ?>get('table_heading_status'); ?>get('table_heading_action'); ?>
    +
    + +
    + + + + + + + + + + + + + + +
    get('table_heading_name'); ?>get('table_heading_status'); ?>get('table_heading_weight'); ?>get('table_heading_sku'); ?>get('table_heading_qoh'); ?>get('table_heading_base_price'); ?>get('table_heading_img'); ?>get('table_heading_action'); ?>
    +
    + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php new file mode 100644 index 000000000..af9a472c2 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php @@ -0,0 +1,143 @@ + +
    + + get('info_bubble_pricing_qty_price_breaks'), null, 'info-spot on-left grey margin-left'); ?> + +
    +     +
    + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml new file mode 100644 index 000000000..105dfd5e7 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml @@ -0,0 +1,17 @@ + + + Categories Save + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php'));]]> + + + + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml new file mode 100644 index 000000000..496b547ae --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml @@ -0,0 +1,13 @@ + + + Modify Customers Listing Page + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('icon_login_as_customer') . ' (PRO)">]]> + value('customers_email_address')) . '" class="button icon-monitor with-tooltip' . ((int)($_SESSION['admin']['access'][$_module] < 4) ? ' disabled' : NULL) . '" title="' . $lC_Language->get('icon_login_as_customer') . '">]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml new file mode 100644 index 000000000..41ee6411f --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml @@ -0,0 +1,13 @@ + + + Add Pro DB Tables + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml new file mode 100644 index 000000000..dd08bab59 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml @@ -0,0 +1,17 @@ + + + extend products save() + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/products/classes/products.php')); if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php'));]]> + + + _module]) && is_numeric($_GET[$this->_module]) ? $_GET[$this->_module] : null), $data);]]> + _module]) && is_numeric($_GET[$this->_module]) ? $_GET[$this->_module] : null), $data); } else { $id = (int)lC_Products_pro_Admin::save((isset($_GET[$this->_module]) && is_numeric($_GET[$this->_module]) ? $_GET[$this->_module] : null), $data); }]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml new file mode 100644 index 000000000..38c0134f4 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml @@ -0,0 +1,28 @@ + + + After Image Groups, add Product Classes + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + loadIniFile(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php', null, null, true);]]> + $lC_Template->setSubOf('product_settings'); + + + + '?image_groups'),]]> + 'classes.png', + 'title' => $lC_Language->get('access_product_classes_title'), + 'identifier' => '?product_classes'), ]]> + + + + + 0) { $ok = TRUE;]]> + 0) { $ok = TRUE;]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml new file mode 100644 index 000000000..4ea50ef92 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml @@ -0,0 +1,17 @@ + + + Enable Multi SKU Inv Control + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('text_multi_sku'); ?>" upselldesc="get('text_multi_sku_desc'); ?>" for="ic_radio_2" class="upsellinfo disabled oicb button red-activegetInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> + getInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> + + + get('text_multi_sku') . '' . lc_go_pro() . ''; ?>]]> + get('text_multi_sku'); ?>]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml new file mode 100644 index 000000000..f98547c16 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml @@ -0,0 +1,17 @@ + + + Enable Pro on Images Tab + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('text_additional_images'); ?>]]> + get('text_additional_images'); ?>]]> + + + ]]> +
    get('subsection_original_images'); ?>
    get('subsection_images'); ?>
    ]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml new file mode 100644 index 000000000..22a99b369 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml @@ -0,0 +1,26 @@ + + + Enable Pro on Options Tab + 1.0.0 + 2.3.2 + loadedcommerce.com + + + get('text_multi_sku'); ?>" upselldesc="get('text_multi_sku_desc'); ?>" for="ioc_radio_2" class="upsellinfo disabled oicb button red-activegetInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> + getInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> + + + get('text_multi_sku') . '' . lc_go_pro() . ''; ?>]]> + get('text_multi_sku'); ?>]]> + + + ]]> + ]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml new file mode 100644 index 000000000..4e12adc5d --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml @@ -0,0 +1,17 @@ + + + QPB Pricing + 1.0.0 + 2.3.2 + loadedcommerce.com + + + ]]> + ]]> + + + ]]> + ]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml new file mode 100644 index 000000000..920126449 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml @@ -0,0 +1,25 @@ + + + Products Class + 1.0.0 + 2.3.2 + loadedcommerce.com + + + valueInt('products_id'));]]> + valueInt('products_id'));]]> + + + toArray());]]> + toArray());]]> + + + toArray());]]> + toArray());]]> + + + + modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/products/classes/products.php')); if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php'));]]> + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml new file mode 100644 index 000000000..83959d3d1 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml @@ -0,0 +1,13 @@ + + + Hide Pro Template Pack + 1.0.0 + 2.3.2 + loadedcommerce.com + + + $type ) {]]> + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_file_upload.inc.php b/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_file_upload.inc.php new file mode 100644 index 000000000..9187ab10e --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_file_upload.inc.php @@ -0,0 +1,59 @@ + $val) { + if (isset($val['group_title']) && empty($val['group_title']) === false) { + $group_title = $val['group_title']; + break; + } + } + + $string = '
    ' . + ' ' . + ' ' . + ' ' . + ' ' . + ' ' . + '
    '; + + reset($data); + $cnt = 0; + foreach($data as $key => $val) { + $price_ind = ((float)$val['price_modifier'] < 0.00) ? '-' : '+'; + $price_formatted = ((float)$val['price_modifier'] != 0.00) ? $price_ind . $lC_Currencies->format(number_format($val['price_modifier'], DECIMAL_PLACES), $lC_Currencies->getCode()) : null; + $options[$val['value_id']] = $val['price_modifier']; + $group_id = $val['group_id']; + $group_title = $val['group_title']; + + $string .= '
    ' . + ' ' . + '
    '; + $cnt++; + } + + $string .= '
    ' . + '
    '; + + } else { + + $string = '
    '; + $cnt = 0; + foreach ( $data['data'] as $field ) { + $string .= '
    ' . + ' ' . + ' ' . + ' ' . + ' ' . + '
    '; + $cnt++; + } + $string .= '
    '; + } +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_multiple_file_upload.inc.php b/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_multiple_file_upload.inc.php new file mode 100644 index 000000000..3b8400312 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_multiple_file_upload.inc.php @@ -0,0 +1,59 @@ + $val) { + if (isset($val['group_title']) && empty($val['group_title']) === false) { + $group_title = $val['group_title']; + break; + } + } + + $string = '
    ' . + ' ' . + ' ' . + ' ' . + ' ' . + ' ' . + '
    '; + + reset($data); + $cnt = 0; + foreach($data as $key => $val) { + $price_ind = ((float)$val['price_modifier'] < 0.00) ? '-' : '+'; + $price_formatted = ((float)$val['price_modifier'] != 0.00) ? $price_ind . $lC_Currencies->format(number_format($val['price_modifier'], DECIMAL_PLACES), $lC_Currencies->getCode()) : null; + $options[$val['value_id']] = $val['price_modifier']; + $group_id = $val['group_id']; + $group_title = $val['group_title']; + + $string .= '
    ' . + ' ' . + '
    '; + $cnt++; + } + + $string .= '
    ' . + '
    '; + + } else { + + $string = '
    '; + $cnt = 0; + foreach ( $data['data'] as $field ) { + $string .= '
    ' . + ' ' . + ' ' . + ' ' . + ' ' . + '
    '; + $cnt++; + } + $string .= '
    '; + } +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php new file mode 100644 index 000000000..7dc443b88 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php @@ -0,0 +1,12 @@ +# $Id: product_classes.php v1.0 2013-01-01 datazen $ +# +# LoadedCommerce, Innovative eCommerce Solutions +# http://www.loadedcommerce.com +# +# Copyright (c) 2013 Loaded Commerce, LLC +# +# @author LoadedCommerce Team +# @copyright (c) 2013 LoadedCommerce Team +# @license http://loadedcommerce.com/license.html + +access_product_classes_title = Product Classes \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php new file mode 100644 index 000000000..c0acd0786 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php @@ -0,0 +1,12 @@ +# $Id: product_classes.php v1.0 2013-01-01 datazen $ +# +# LoadedCommerce, Innovative eCommerce Solutions +# http://www.loadedcommerce.com +# +# Copyright (c) 2013 Loaded Commerce, LLC +# +# @author LoadedCommerce Team +# @copyright (c) 2013 LoadedCommerce Team +# @license http://loadedcommerce.com/license.html + +product_attributes_product_classes_title = Product Classes \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php new file mode 100644 index 000000000..c15fcc747 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php @@ -0,0 +1,38 @@ +# $Id: product_classes.php v1.0 2011-11-04 datazen $ +# +# LoadedCommerce, Innovative eCommerce Solutions +# http://www.loadedcommerce.com +# +# Copyright (c) 2011 LoadedCommerce.com +# +# @author LoadedCommerce Team +# @copyright (c) 2011 LoadedCommerce Team +# @license http://loadedcommerce.com/license.html + +heading_title = Product Classes + +access_product_classes_title = Product Classes + +table_heading_name = Name +table_heading_comment = Comment +table_heading_usage = Usage +table_heading_action = Action + +modal_heading_new_class = New Product Class +modal_heading_edit_class = Edit Product Class +modal_heading_delete_class = Delete Product Class + +field_name = Name: +field_comment = Comment: +field_status = Status: +field_set_as_default = Set as Default? + +button_new_class = New Class + +introduction_new_class = Please fill in the following information for the new class. +introduction_edit_class = Please make the necessary changes for this class. +introduction_delete_class = Please verify the removal of this classe. + +delete_error_class_prohibited = Error: The default class cannot be removed. +delete_error_class_in_use_1 = Error: This class is currently assigned to +delete_error_class_in_use_2 = product(s) and cannot be removed. \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php new file mode 100644 index 000000000..16087e42f --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php @@ -0,0 +1,45 @@ +_section = 'dataManagementSettings'; + } + + public function setFunction($value) { + global $lC_Database, $lC_Language; + + $string = ''; + + if (defined('ADDONS_SYSTEM_LOADED_7_PRO_STATUS') && ADDONS_SYSTEM_LOADED_7_PRO_STATUS == '1') { + $Qclass = $lC_Database->query('select id, name from :table_product_classes where language_id = :language_id order by name'); + $Qclass->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); + $Qclass->bindInt(':language_id', $lC_Language->getID()); + $Qclass->execute(); + + $classes = array(); + while ( $Qclass->next() ) { + $classes[] = array('id' => $Qclass->valueInt('id'), + 'text' => $Qclass->value('name')); + } + + if ( !empty($classes) ) { + $string = lc_draw_pull_down_menu('attributes[' . self::getID() . ']', $classes, $value, 'class="select full-width"'); + } + } + + return $string; + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/content/account/login.inc.php b/catalog/addons/Loaded_7_Pro/content/account/login.inc.php new file mode 100644 index 000000000..053cfed2d --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/content/account/login.inc.php @@ -0,0 +1,67 @@ +query('select user_password from :table_administrators'); + $Qadmin->bindTable(':table_administrators', TABLE_ADMINISTRATORS); + $Qadmin->execute(); + + $validated = false; + while ( $Qadmin->next()) { + if ( _validateAdminPassword($password, $Qadmin->value('user_password')) ) { + $validated = true; + break; + } + } + + return $validated; +} + +// check for admin session +if (isset($_SESSION['admin_login'])) unset($_SESSION['admin_login']); +if (validateAdminPassword($_POST['password'])) { + $_SESSION['admin_login'] = true; + } + } +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/controller.php b/catalog/addons/Loaded_7_Pro/controller.php new file mode 100644 index 000000000..069c3eb5c --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/controller.php @@ -0,0 +1,288 @@ +modCheck(DIR_FS_CATALOG . 'includes/classes/transport.php')); +if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php')); +if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php')); + +class Loaded_7_Pro extends lC_Addon { // your addon must extend lC_Addon + /* + * Class constructor + */ + public function Loaded_7_Pro() { + global $lC_Language, $lC_Database; + /** + * The addon type (category) + * valid types; payment, shipping, themes, checkout, catalog, admin, reports, connectors, other + */ + $this->_type = 'systems'; + /** + * The addon class name + */ + $this->_code = 'Loaded_7_Pro'; + /** + * The addon title used in the addons store listing + */ + $this->_title = $lC_Language->get('addon_system_pro_title'); + /** + * The addon description used in the addons store listing + */ + $this->_description = $lC_Language->get('addon_system_pro_description'); + /** + * The developers name + */ + $this->_author = 'Loaded Commerce, LLC'; + /** + * The developers web address + */ + $this->_authorWWW = 'http://www.loadedcommerce.com'; + /** + * The addon version + */ + $this->_version = '1.2.0'; + /** + * The Loaded 7 core compatibility version + */ + $this->_compatibility = '7.002.0.0'; // the addon is compatible with this core version and later + /** + * The base64 encoded addon image used in the addons store listing + */ + $this->_thumbnail = lc_image(DIR_WS_CATALOG . 'addons/' . $this->_code . '/images/loaded7_pro.png', $this->_title); + /** + * The addon enable/disable switch + */ + if (defined('INSTALLATION_ID') && INSTALLATION_ID != '') { + // if ($this->_timeToCheck() === true) { + // $this->_enabled = $this->_validateSerial(INSTALLATION_ID); + // if ($this->_enabled) $this->_updateLastChecked(); + // } else { + $this->_enabled = (defined('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS') && @constant('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS') == '1') ? true : false; + // } + // if (!$this->_enabled) { + // $lC_Database->simpleQuery("update " . TABLE_CONFIGURATION . " set configuration_value = '0' where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); + // } else { + // $lC_Database->simpleQuery("update " . TABLE_CONFIGURATION . " set configuration_value = '1' where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); + // } + } else { + $this->_enabled = false; + } + /** + * Automatically install the module + */ + $this->_auto_install = true; + } + /** + * Checks to see if the addon has been installed + * + * @access public + * @return boolean + */ + public function isInstalled() { + return (bool)defined('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); + } + /** + * Install the addon + * + * @access public + * @return void + */ + public function install() { + global $lC_Database; + + if (isset($_SESSION['remove_loaded_7_pro']) && $_SESSION['remove_loaded_7_pro'] == true) { + unset($_SESSION['remove_loaded_7_pro']); + $this->_clearCache(); + } else if (!$this->_checkStatus()) { + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Enable AddOn', 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS', '1', 'Do you want to enable this addon?', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())"); + $lC_Database->simpleQuery("delete from " . TABLE_TEMPLATES_BOXES . " where modules_group like '%Loaded_7_Pro%'"); + $lC_Database->simpleQuery("insert into " . TABLE_TEMPLATES_BOXES . " (title, code, author_name, author_www, modules_group) values ('Loaded 7 Pro', '" . $this->_type . "', '" . $this->_author . "','" . $this->_authorWWW . "', 'systems|Loaded_7_Pro')"); + // product classes + if (!defined('DEFAULT_PRODUCT_CLASSES_ID')) { + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'DEFAULT_PRODUCT_CLASSES_ID'"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'DEFAULT_PRODUCT_CLASSES_ID', '1', '', '6', '0', '', '', now())"); + $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . DB_TABLE_PREFIX . "product_classes` (id int(11) NOT NULL AUTO_INCREMENT,`name` varchar(128) NOT NULL DEFAULT '', `comment` varchar(255) DEFAULT NULL, `status` tinyint(1) NOT NULL DEFAULT '0', language_id int(11) NOT NULL DEFAULT '1', PRIMARY KEY (id)) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci AUTO_INCREMENT=2;"); + $lC_Database->simpleQuery("delete from `" . DB_TABLE_PREFIX . "product_classes` where id = '1'"); + $lC_Database->simpleQuery("insert into `" . DB_TABLE_PREFIX . "product_classes` (id, name, comment, status, language_id) VALUES ('1', 'Common', 'Common Class', 1, 1);"); + $lC_Database->simpleQuery("delete from " . TABLE_TEMPLATES_BOXES . " where code = 'product_classes'"); + $lC_Database->simpleQuery("insert into " . TABLE_TEMPLATES_BOXES . " (title, code, author_name, author_www, modules_group) VALUES ('Product Classes', 'product_classes', 'Loaded Commerce, LLC', 'http://www.loadedcommerce.com', 'product_attributes')"); + $lC_Database->simpleQuery("alter table " . TABLE_PRODUCTS . " ADD `is_subproduct` TINYINT( 1 ) NOT NULL DEFAULT '0'"); + } + // skip shipping + if (!defined('SKIP_CHECKOUT_SHIPPING_PAGE')) { + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'SKIP_CHECKOUT_SHIPPING_PAGE'"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Skip Shipping Page', 'SKIP_CHECKOUT_SHIPPING_PAGE', '-1', 'Bypass the checkout shipping page? No shipping will be charged.', 19, 0, NULL, now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); + } + // qty breaks config + if (!defined('PRODUCT_PRICING_QPB_FORMAT')) { + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'PRODUCT_PRICING_QPB_FORMAT'"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Price Break Format', 'PRODUCT_PRICING_QPB_FORMAT', 'Range', 'The price break format shown on the product listing pages.', 8, 11, NULL, now(), NULL, 'lc_cfg_set_boolean_value(array(''None'', ''Range'', ''Starts At'', ''Low As''))')"); + } + + $this->_clearCache(); + } + } + /** + * Return the configuration parameter keys an an array + * + * @access public + * @return array + */ + public function getKeys() { + global $lC_Database; + + if (!isset($this->_keys)) { + $this->_keys = array('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); + } + + return $this->_keys; + } + /** + * Remove the addon + * + * @access public + * @return void + */ + public function remove() { + global $lC_Database, $lC_Language; + + if ($this->hasKeys()) { + $Qdel = $lC_Database->query('delete from :table_configuration where configuration_key in (":configuration_key")'); + $Qdel->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qdel->bindRaw(':configuration_key', implode('", "', $this->getKeys())); + $Qdel->execute(); + } + + if (file_exists(DIR_FS_CATALOG . 'addons/' . $this->_code . '/languages/' . $lC_Language->getCode() . '.xml')) { + foreach ($lC_Language->extractAddonDefinitions(DIR_FS_CATALOG . 'addons/' . $this->_code . '/languages/' . $lC_Language->getCode() . '.xml') as $def) { + $Qdel = $lC_Database->query('delete from :table_languages_definitions where definition_key = :definition_key and content_group = :content_group'); + $Qdel->bindTable(':table_languages_definitions', TABLE_LANGUAGES_DEFINITIONS); + $Qdel->bindValue(':definition_key', $def['key']); + $Qdel->bindValue(':content_group', $def['group']); + $Qdel->execute(); + } + } + // product classes + $lC_Database->simpleQuery("DROP TABLE IF EXISTS `" . DB_TABLE_PREFIX . "product_classes`"); + $lC_Database->simpleQuery("alter table " . TABLE_PRODUCTS . " DROP COLUMN `is_subproduct`"); + $lC_Database->simpleQuery("delete from " . TABLE_TEMPLATES_BOXES . " where modules_group like '%Loaded_7_Pro%'"); + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'DEFAULT_PRODUCT_CLASSES_ID'"); + $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'SKIP_CHECKOUT_SHIPPING_PAGE'"); + + $_SESSION['remove_loaded_7_pro'] = true; + + $this->_clearCache(); + } + /** + * Clear the cache + * + * @access public + * @return void + */ + private function _clearCache() { + lC_Cache::clear('configuration'); + lC_Cache::clear('languages'); + lC_Cache::clear('addons'); + lC_Cache::clear('vqmoda'); + } + /** + * Check the addon install status + * + * @access public + * @return void + */ + private function _checkStatus() { + $addons = ''; + if (file_exists('../includes/work/cache/addons.cache')) { + $addons = @file_get_contents('../includes/work/cache/addons.cache'); + } + + return (strstr($addons, 'Loaded_7_Pro/controller.php') != '') ? true : false; + } + /** + * Validate the serial is valid and active + * + * @access private + * @return boolean + */ + private function _validateSerial($serial) { + $result = array(); + $validateArr = array('serial' => $serial, + 'storeName' => STORE_NAME, + 'storeEmail' => STORE_OWNER_EMAIL_ADDRESS, + 'storeWWW' => HTTP_SERVER . DIR_WS_HTTP_CATALOG); + + $checksum = hash('sha256', json_encode($validateArr)); + $validateArr['checksum'] = $checksum; + + $resultXML = transport::getResponse(array('url' => 'https://api.loadedcommerce.com/1_0/check/serial/?product=pro', 'method' => 'post', 'parameters' => $validateArr)); + $result = utility::xml2arr($resultXML); + + if ($result['data']['error'] == '1') return false; + + return ($result['data']['valid'] == '1') ? true : false; + } + /** + * Check to see if it's time to re-check addon validity + * + * @access private + * @return boolean + */ + private function _timeToCheck() { + global $lC_Database; + + $itsTime = false; + + $today = substr(lC_DateTime::getShort(@date("Y-m-d H:m:s")), 3, 2); + + $instID = (defined('INSTALLATION_ID') && INSTALLATION_ID != '') ? INSTALLATION_ID : NULL; + if ($instID == NULL) return true; + + $last_checked = (isset($_SESSION['Loaded_7_Pro']['last_checked']) && $_SESSION['Loaded_7_Pro']['last_checked'] != NULL) ? $_SESSION['Loaded_7_Pro']['last_checked'] : NULL; + + if ($last_checked == NULL || $today != substr(lC_DateTime::getShort($last_checked), 3, 2)) { + + $itsTime = true; + + $Qcheck = $lC_Database->query('select last_modified from :table_configuration where configuration_key = :configuration_key'); + $Qcheck->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qcheck->bindValue(':configuration_key', 'ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); + $Qcheck->execute(); + + $last_checked = $Qcheck->value('last_modified'); + $_SESSION['Loaded_7_Pro']['last_checked'] = $last_checked; + + $Qcheck->freeResult(); + } + + return $itsTime; + } + /** + * Update the time last checked the install ID + * + * @access private + * @return void + */ + private function _updateLastChecked() { + global $lC_Database; + + $Qcheck = $lC_Database->query('update :table_configuration set last_modified = :last_modified where configuration_key = :configuration_key'); + $Qcheck->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qcheck->bindValue(':configuration_key', 'ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); + $Qcheck->bindRaw(':last_modified', 'now()'); + $Qcheck->execute(); + } +} +?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml b/catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml new file mode 100644 index 000000000..832693dfd --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml @@ -0,0 +1,13 @@ + + + Admin Login as Customer + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml b/catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml new file mode 100644 index 000000000..73ae92ab2 --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml @@ -0,0 +1,13 @@ + + + File Upload + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml b/catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml new file mode 100644 index 000000000..f276868ca --- /dev/null +++ b/catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml @@ -0,0 +1,13 @@ + + + Multiple File Upload + 1.0.0 + 2.3.2 + loadedcommerce.com + + + + + + + \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/images/loaded7_pro.png b/catalog/addons/Loaded_7_Pro/images/loaded7_pro.png new file mode 100644 index 0000000000000000000000000000000000000000..5529704c677ed7ee1095f75c7e7b683aa705f6cf GIT binary patch literal 3708 zcmaJ^dpy(o{~xkkBT7iDxus!-O&@$2`wy)TdF^Z9zdU$56cpC}tEGhqQ~0RR9Xj5WvDaz-1@ zi{=AzzKhDbEY2XsFmYtqQQa5;cp3>{NTj-wKv*)~on%YG6EFF-kk9}C57^V*k>Q9t zfg(`J>i8XudLY@C!{&(T2m0a(-XsRdmE`V8(FM;}R)ayFL|yP{I8FoSYfSR+G!LSY z?1HT92|?ZjBoVBy2SNv;I09r60}l!$`%vhpKwa=JT@+`&vke7Uty zjHxsd2(GTBM$mx4KnR37OdF0sz*Iq+8Zb?$2IoPj!L(6u1WHo}^v?z6M57ViP_`J; ze`0Y~x?m3m!xsgG1_T7C2WY8NY3@)M5{cZ=(9~4pAk^rWC=7g{8ig+ZTLD9&6KI~k z3{NTrw4;c3rTQ~;!5pXmIRe@DUs($MpEPk21`WjfLSgC}J4gBr#NqybD4F~(n$EB# z{nzjRDNMJ&YUuu?8G&qyaP3#=u}ET1YK8{Fo^m zW`xny#F!W(eseKYfkwi45QOTfRM@D)6(TkzU zANBs>694GM(DaX7D8~$Rr?CI4(7(4h-Lo_Ow{1C#e;c1f;dDEV)7FjF#xVeZzycOy zXdgH*>->Xm*Smjf_`UiWN6iauUK)L>Sf1wwT`Ig?+BFJ1<=UMs&>#0>tt^he?@$QA zY#yj7$7QA=xWw*;E5w!(jm{WpGFahXP1i37q57S3c;xorgX@z&_Z>=<*-K?vQahWxi{vH3KX>FI;vi4 z2R3@$-n@n3Hbw6-uGXLb>=IOTrDE{@Ldu;>``V(LG~=;S$r+?a1z}$ww}j^IzTWw= z^0QuqUUG>k;LTT~6s0!_^e5*8XC|=53D+cY)_|F7D~2;)jh0&X=b%uTF;YC6guhyH zV;1+Y(L>jI`gwH+L>|97)bcj@{@;@-Ru2JQ#5+y*49~jVL-MR9NjN^lh2_4M^}@+s zs|9^8qU3m_Hbe-TyHpD3riU9Dw3_N4xwhW~$dz|YMzZWnvajAsckrf`FZXc8Ok~DS zp|~(6kt?Q$H;+9uk0*OPpO<`eJb<*wiPpLOm56G8tQ{5*rr z@BB8Y7C|umu{bwulGqd_tHb-vmBm9aK&ZUiEpN;lg#< z8*=^Zvy#4)3yf174%kZ1^9qcx(Qr@VU-b`lwDU`!0 zMtj*sVcVf|d~CK{XXG9DOi$f2k|39^r%k!X+MJ=hR7s4S^5HbWQy;h?CEaVSkflnO z0nsyd4(H7hLUT7@_l)MN!lt9dvmi-+{=Rx!$38+FY7nGW05AtT_b^20bHif!>cm@! zCvl-Y&D{B=IX5-zE2FmmrRcE#On4*GK|FHqHe~NsFPG!NgJVO*c+tQ``c&uI@a4!1 z-QBOMzhtZbtC%FQrprD1`>ig9B&4!vil5Iy^54^LU5w2V7vfMRZCG*}# z>p^{4&~5bDnQyq`5o3w8p#7&?MEx&kuFp&_)n}SCtGi$>OsOk8IWJe`-C$9{XVBSj z+X=eQHKmTV{Csb@8hD);g@Z8bGl4o8|U+&R3sAgN`c(S@7*V23u938)FCMyu#r78$(w!(jPS(RT( zP1tR2T2rc>*ZrM+$A2=#wQ*DOyfQ=ilW2 zHprA+qVCablzG6r{4nF&uAmn^BNwH0k3W@PuVsEgIU5#9tHkatieg5JxhZ>}3mtPi z*TL;rM`ESi!iu;I@$|_nsmy|vt+QrUbVRd*lE^Gudsy+)Tofv|+TTc5)n04rS>KOk zK3Nn?;kL`s2ui$WS*^d{Q@PL@C*ZwPIT)1^Su0T?nX+@a@r=yLZiO8B=xIM&ZLrWj z_L#Ud_u*g*qke14!-k(7;tS2E6RbM}z90E=nyF!}a+0EW1YP-b-hd^>3SkFzlRw&s z*1;`9`1ILD2}UXXsk779Bm`QA@SyEi+yQ*XV zc0qC-B>iTfNl@?*YS*pQYCr=v!Wui>#m#j`VN?6IaW3XXLx$Pw4S`^@7z1miyzzzX ziy!h+hsG9)2A{`Ojgk9fr+W{?c~qaiKuRSRA5ts3FQcpElzcwPudiTYcbYYt%goMh ztn85j%hpX|21Dyx2B{rt6V^k!DL2m}~ngM1TBnzVKMkf0JCBgZ5+ z?>TYxTZMCf^TF{mrIIU9YEzp2&%HzQ^AVL5{s5xa9Is&K!r(}a>2O@Z;TZ1pdxRkQ zpYL>;(l4t4Xw8vVo2&AMD;i}Ehvx9tUHsIXx5{R76Qv-R0r?`x8+!^Wf!I>5q03wR z2fjER^2|~sFeMvGpjFp)MbMOQlfIpO=Gs;8q%J)mbM#D=WJi)4W}qVyK{ukcQ*My2 z1moGbt}fil<#)|;#_urEE}u6S$6&?N3MT$2+T@44iK}1F#`0>p*jhk=uw|A)i{a+M zK^0hcef3g*>VuLdgwGFnd@UeI@27cw8vi|=`Z)J6)e1e@$6{hI`mE}tI-q|>X2-hyjD5XseQtMGq z_rUFkCNiKK86mRl?N`@ho?Qf6DLU6r;udV=fZ6*%uUs9GsujS`-BWQupG9?51}XILE=moj!LlK8y&Vtz=UE#=VDcEVBl4W#MC8+YNh z^eb9?<YStWW^1|4}sQRD#0^+3cE!cyXOEi>R>Y>z~Q zf>FAr=~EN2^sLGJ*fDKIZ)tsRpIJkb?Q+Ao1-scq&kEKl&`_5+R^`);@_y4Bx()*P zj_!O#w&hl~_m^k>yp2`yuum|qdLu=bjoT!|EV(qw>3m9Gs;E{6Q)rc6xHw+8)!GeR zBq6jn@*AzZan0gZJHSEY{JaR|V_v~VuB`;`E$=Mzw_nk@ZwOu~Fw4wsuj-ubMszK>VkMb$O+LcJDy5(7^ziVnB#uPO+ReXvkD zesq59Q;~&>zT1Y%jmK@k7@xOgu=P0|!agqTZCV`vXg05nPDx;=f-9|4Xv|EyPU*T5 z4-QZr(f;%7h7wOT3~*QUuF#bnz+Jw(*ol+O;& + + + + addon_system_pro_title + + checkout + + + addon_system_pro_description + + checkout + + + text_admin_session_active + + general + + + \ No newline at end of file From cf60db4d947629da9d5dcc9bcd3b0c9ac39cf009 Mon Sep 17 00:00:00 2001 From: datazen Date: Fri, 22 Aug 2014 15:07:13 -0400 Subject: [PATCH 122/168] repaired specials hide --- .../includes/applications/products/js/products.js.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/catalog/admin/includes/applications/products/js/products.js.php b/catalog/admin/includes/applications/products/js/products.js.php index 1815eddad..f70b11385 100644 --- a/catalog/admin/includes/applications/products/js/products.js.php +++ b/catalog/admin/includes/applications/products/js/products.js.php @@ -600,16 +600,17 @@ function _updatePricingDivChevrons() { function togglePricingSection(e, section) { var divIsOpen = $('#' + section).is(":visible"); var switchIsEnabled = $(e).parent('.switch').hasClass('checked'); - + var hasOptions = ''; + if (divIsOpen) { $('#' + section).slideUp('300'); if (section == 'qty_breaks_pricing_container') $('.qpb-opt').hide(); // hide qpb options - if (section == 'qty_breaks_pricing_container') $('.special-price-div').show(); // show normal special price div + if (hasOptions == 1) if (section == 'qty_breaks_pricing_container') $('.special-price-div').show(); // show normal special price div if (section == 'specials_pricing_container') $('.special-options').hide(); // hide qpb options } else { $('#' + section).slideDown('300'); if (section == 'qty_breaks_pricing_container') $('.qpb-opt').show(); // show qpb options - if (section == 'qty_breaks_pricing_container') { $('.special-price-div').hide(); } // hide normal special price div + if (hasOptions == 1) if (section == 'qty_breaks_pricing_container') { $('.special-price-div').hide(); } // hide normal special price div if (section == 'specials_pricing_container') $('.special-options').show(); // hide special options dic } From eff26442e7d3091718f73a5e627bd308a05f2714 Mon Sep 17 00:00:00 2001 From: datazen Date: Fri, 22 Aug 2014 15:52:56 -0400 Subject: [PATCH 123/168] added msrp switches --- .../b2b_settings/b2b_settings.php | 4 ++- .../b2b_settings/classes/b2b_settings.php | 16 ++++++++++++ .../applications/b2b_settings/pages/main.php | 26 ++++++++++++++++--- .../admin/languages/en_US/b2b_settings.php | 4 +++ catalog/includes/classes/product.php | 16 +++++++++++- 5 files changed, 60 insertions(+), 6 deletions(-) diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/b2b_settings.php index 824f788c9..a0ff0d601 100644 --- a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/b2b_settings.php +++ b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/b2b_settings.php @@ -29,7 +29,9 @@ function __construct() { switch ($action) { case 'save' : $data = array('allow_self_register' => (isset($_POST['allow_self_register']) ? $_POST['allow_self_register'] : null), - 'guest_catalog_access' => (isset($_POST['guest_catalog_access']) ? $_POST['guest_catalog_access'] : null)); + 'guest_catalog_access' => (isset($_POST['guest_catalog_access']) ? $_POST['guest_catalog_access'] : null), + 'show_guest_only_msrp' => (isset($_POST['show_guest_only_msrp']) ? $_POST['show_guest_only_msrp'] : null), + 'show_retail_only_msrp' => (isset($_POST['show_retail_only_msrp']) ? $_POST['show_retail_only_msrp'] : null)); lC_B2b_settings_Admin::save($data); diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/b2b_settings.php index 0049bc866..d82cebd8d 100644 --- a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/b2b_settings.php +++ b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/b2b_settings.php @@ -111,7 +111,23 @@ public static function get() { $Qcfg->freeResult(); + $Qcfg = $lC_Database->query('select configuration_value from :table_configuration where configuration_key = :configuration_key'); + $Qcfg->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qcfg->bindValue(':configuration_key', 'B2B_SETTINGS_SHOW_GUEST_ONLY_MSRP'); + $Qcfg->execute(); + + $data['B2B_SETTINGS_SHOW_GUEST_ONLY_MSRP'] = $Qcfg->value('configuration_value'); + + $Qcfg->freeResult(); + + $Qcfg = $lC_Database->query('select configuration_value from :table_configuration where configuration_key = :configuration_key'); + $Qcfg->bindTable(':table_configuration', TABLE_CONFIGURATION); + $Qcfg->bindValue(':configuration_key', 'B2B_SETTINGS_SHOW_RETAIL_ONLY_MSRP'); + $Qcfg->execute(); + + $data['B2B_SETTINGS_SHOW_RETAIL_ONLY_MSRP'] = $Qcfg->value('configuration_value'); + $Qcfg->freeResult(); return $data; } diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php index f21e0eb49..905989bb1 100644 --- a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php +++ b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php @@ -41,7 +41,7 @@
    @@ -102,9 +102,27 @@
    - +
    +
    + get('heading_msrp_pricing'); ?> +
    +
    +

    + + get('B2B_SETTINGS_SHOW_GUEST_ONLY_MSRP') == '1') ? 'checked="checked" ' : ''); + echo lc_draw_checkbox_field('show_guest_only_msrp',null, null, $checked . 'class="switch medium" data-text-on="' . strtoupper($lC_Language->get('button_yes')) . '" data-text-off="' . strtoupper($lC_Language->get('button_no')) . '"'); ?>get('info_hides_purchase_prices'); ?> +

    +

    + + get('B2B_SETTINGS_SHOW_RETAIL_ONLY_MSRP') == '1') ? 'checked="checked" ' : ''); + echo lc_draw_checkbox_field('show_retail_only_msrp',null, null, $checked . 'class="switch medium" data-text-on="' . strtoupper($lC_Language->get('button_yes')) . '" data-text-off="' . strtoupper($lC_Language->get('button_no')) . '"'); ?>get('info_hides_purchase_prices'); ?> +

    +
    +
    +
    +
    diff --git a/catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php index bf90364a8..4f18e445a 100644 --- a/catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php +++ b/catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php @@ -17,6 +17,7 @@ heading_products = Products heading_guest_access = Guest Access heading_access_group_levels = Access Group Levels +heading_msrp_pricing = MSRP Pricing table_heading_id = ID table_heading_group = Access Level @@ -31,6 +32,8 @@ label_active = Active label_registered = Registered label_new_access_level = New Access Level +label_show_guest_only_msrp = Show Guest Only MSRP +label_show_retail_only_msrp = Show Retail Only MSRP button_create_new = Create New @@ -45,6 +48,7 @@ info_bubble_displays_create_account_form = Displays Create Account Form info_bubble_guest_catalog_access = Control Guest Access to the Catalog +info_hides_purchase_prices = Hides Purchase Prices text_add_to_cart = Add to Cart text_members = Members diff --git a/catalog/includes/classes/product.php b/catalog/includes/classes/product.php index 12edf9713..c43ad8e12 100644 --- a/catalog/includes/classes/product.php +++ b/catalog/includes/classes/product.php @@ -15,7 +15,7 @@ public function __construct($id) { if ( !empty($id) ) { if ( is_numeric($id) ) { - $Qproduct = $lC_Database->query('select products_id as id, parent_id, products_quantity as quantity, products_price as price, products_model as model, products_tax_class_id as tax_class_id, products_weight as weight, products_weight_class as weight_class_id, products_date_added as date_added, manufacturers_id, has_children, is_subproduct, access_levels from :table_products where products_id = :products_id and products_status = :products_status'); + $Qproduct = $lC_Database->query('select products_id as id, parent_id, products_quantity as quantity, products_price as price, products_msrp as msrp, products_model as model, products_tax_class_id as tax_class_id, products_weight as weight, products_weight_class as weight_class_id, products_date_added as date_added, manufacturers_id, has_children, is_subproduct, access_levels from :table_products where products_id = :products_id and products_status = :products_status'); $Qproduct->bindTable(':table_products', TABLE_PRODUCTS); $Qproduct->bindInt(':products_id', $id); $Qproduct->bindInt(':products_status', 1); @@ -272,6 +272,10 @@ public function hasModel() { public function getModel() { return $this->_data['model']; } + + public function getMSRP() { + return $this->_data['msrp']; + } public function hasKeyword() { return (isset($this->_data['keyword']) && !empty($this->_data['keyword'])); @@ -391,6 +395,16 @@ public function getPriceInfo($product_id, $customers_group_id = 1, $data) { $price = $price + $modTotal; + // overrides + if (utility::isB2B) { + if (defined('B2B_SETTINGS_SHOW_GUEST_ONLY_MSRP') && B2B_SETTINGS_SHOW_GUEST_ONLY_MSRP == '1' && $lC_Customer->isLoggedOn() === false) { + $price = $this->getMSRP(); + } + if (defined('B2B_SETTINGS_SHOW_RETAIL_ONLY_MSRP') && B2B_SETTINGS_SHOW_RETAIL_ONLY_MSRP == '1' && $lC_Customer->isLoggedOn() === true && $lC_Customer->getCustomerGroup() == DEFAULT_CUSTOMERS_GROUP_ID) { + $price = $this->getMSRP(); + } + } + $tax = 0; $taxRate = 0; $priceWithTax = $price; From 8cf3116f53e728bd69d2e44c291042f364c9adf4 Mon Sep 17 00:00:00 2001 From: datazen Date: Fri, 22 Aug 2014 18:11:27 -0400 Subject: [PATCH 124/168] merge work --- catalog/includes/classes/product.php | 15 +++++++++------ catalog/includes/modules/product_listing.php | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/catalog/includes/classes/product.php b/catalog/includes/classes/product.php index c43ad8e12..2cda9f529 100644 --- a/catalog/includes/classes/product.php +++ b/catalog/includes/classes/product.php @@ -307,7 +307,7 @@ public function getPriceInfo($product_id, $customers_group_id = 1, $data) { // initial price = base price $base_price = $this->getBasePrice(); - $price = (float)$base_price; + $price = (float)$base_price; // options modifiers if (is_array($data['simple_options']) && count($data['simple_options']) > 0) { @@ -334,7 +334,7 @@ public function getPriceInfo($product_id, $customers_group_id = 1, $data) { $special_price = $lC_Specials->getPrice($product_id); $price = ((float)$special_price < (float)$price) ? (float)$special_price : (float)$price; } - + // if has qty price breaks, adjust base price to break price $qpbText = ''; if ($this->hasQtyPriceBreaks($product_id, $customers_group_id)) { @@ -396,14 +396,14 @@ public function getPriceInfo($product_id, $customers_group_id = 1, $data) { $price = $price + $modTotal; // overrides - if (utility::isB2B) { + if (utility::isB2B() && $_GET['action'] != 'cart_add') { if (defined('B2B_SETTINGS_SHOW_GUEST_ONLY_MSRP') && B2B_SETTINGS_SHOW_GUEST_ONLY_MSRP == '1' && $lC_Customer->isLoggedOn() === false) { $price = $this->getMSRP(); } if (defined('B2B_SETTINGS_SHOW_RETAIL_ONLY_MSRP') && B2B_SETTINGS_SHOW_RETAIL_ONLY_MSRP == '1' && $lC_Customer->isLoggedOn() === true && $lC_Customer->getCustomerGroup() == DEFAULT_CUSTOMERS_GROUP_ID) { $price = $this->getMSRP(); } - } + } $tax = 0; $taxRate = 0; @@ -481,11 +481,14 @@ public function getBasePrice() { */ public function hasQtyPriceBreaks($products_id, $customers_group_id = 1) { global $lC_Database; - - $Qpb = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id and group_id = :group_id limit 1'); + + $Qpb = $lC_Database->query('select pp.* from :table_products p left join :table_products_pricing pp on (p.products_id = pp.products_id) where p.qpb_pricing_enable = :qpb_pricing_enable and pp.products_id = :products_id and pp.group_id = :group_id and pp.qty_break != :qty_break limit 1'); + $Qpb->bindTable(':table_products', TABLE_PRODUCTS); $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); $Qpb->bindInt(':products_id', $products_id); $Qpb->bindInt(':group_id', $customers_group_id); + $Qpb->bindInt(':qpb_pricing_enable', 1); + $Qpb->bindInt(':qty_break', -1); $Qpb->execute(); $hasQPB = false; diff --git a/catalog/includes/modules/product_listing.php b/catalog/includes/modules/product_listing.php index 2c2624efa..306bf0983 100644 --- a/catalog/includes/modules/product_listing.php +++ b/catalog/includes/modules/product_listing.php @@ -7,7 +7,7 @@ @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt @version $Id: product_listing.php v1.0 2013-08-08 datazen $ */ -// create column list +// create column list $define_list = array('PRODUCT_LIST_MODEL' => PRODUCT_LIST_MODEL, 'PRODUCT_LIST_NAME' => PRODUCT_LIST_NAME, 'PRODUCT_LIST_MANUFACTURER' => PRODUCT_LIST_MANUFACTURER, From 33e70f6612b90472b853e079a4186c503545b47a Mon Sep 17 00:00:00 2001 From: datazen Date: Fri, 22 Aug 2014 18:23:04 -0400 Subject: [PATCH 125/168] merge work --- catalog/admin/includes/applications/products/js/products.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/admin/includes/applications/products/js/products.js.php b/catalog/admin/includes/applications/products/js/products.js.php index f70b11385..e440f6ef4 100644 --- a/catalog/admin/includes/applications/products/js/products.js.php +++ b/catalog/admin/includes/applications/products/js/products.js.php @@ -600,7 +600,7 @@ function _updatePricingDivChevrons() { function togglePricingSection(e, section) { var divIsOpen = $('#' + section).is(":visible"); var switchIsEnabled = $(e).parent('.switch').hasClass('checked'); - var hasOptions = ''; + var hasOptions = 'get('products_id')) || lC_Products_pro_Admin::hasSubProducts($pInfo->get('products_id')))) ? 1 : 0); ?>'; if (divIsOpen) { $('#' + section).slideUp('300'); From f117e05246f9bc9d52e1f4b3359734710f80d731 Mon Sep 17 00:00:00 2001 From: datazen Date: Sun, 24 Aug 2014 14:05:43 -0400 Subject: [PATCH 126/168] B3293 repaired sub products display prices with tax --- .../products/classes/products.php | 30 +++++++++++++++++-- .../pages/tabs/options_subproducts.inc.php | 4 +-- catalog/includes/classes/product.php | 17 +++++++++-- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php b/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php index 89d010a8d..3242bc153 100644 --- a/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php +++ b/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php @@ -110,14 +110,18 @@ public static function save($id = null, $data) { die($lC_Database->getError()); $error = true; break 3; - } + } + + // if qty_break = 1, also update products_price + if ($qty_break == 1 && $price > 0.00) self::_updateProductPrice($product_id, number_format($price, DECIMAL_PLACES)); + } } } } } } - } + } if ($error === false) { // add group pricing if (is_array($data['group_pricing']) && !empty($data['group_pricing'])) { @@ -427,5 +431,27 @@ public static function hasGroupPricing($id) { } return false; + } + /* + * Determine if product has group pricing + * + * @param integer $id The product id + * @access public + * @return boolean + */ + private static function _updateProductPrice($products_id, $products_price) { + global $lC_Database; + + $Qupdate = $lC_Database->query('update :table_products set products_price = :products_price where products_id = :products_id'); + $Qupdate->bindTable(':table_products', TABLE_PRODUCTS); + $Qupdate->bindInt(':products_id', $products_id); + $Qupdate->bindFloat(':products_price', $products_price); + $Qupdate->execute(); + + if ( $lC_Database->isError() ) { + return false; + } + + return true; } } \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php index eb9762b92..8776f5e85 100644 --- a/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php +++ b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php @@ -158,7 +158,7 @@ function getSubProductsRows() { ' '+ ' '+ ' '+ - '
    getSymbolLeft(); ?>
    '+ + '
    getSymbolLeft(); ?>
    '+ ' '+ ' '+ ' '+ @@ -169,7 +169,7 @@ function getSubProductsRows() { ' '+ ''; }); - $('#subProductsTable> tbody').append(output); + $('#subProductsTable > tbody').append(output); } function addSubProductsRow(include_price_row, e, key) { diff --git a/catalog/includes/classes/product.php b/catalog/includes/classes/product.php index 2cda9f529..2d6bef964 100644 --- a/catalog/includes/classes/product.php +++ b/catalog/includes/classes/product.php @@ -971,8 +971,8 @@ public function getSubProducts($id) { * @return array */ public function parseSubProducts($data) { - global $lC_Image, $lC_Currencies, $lC_Language; - + global $lC_Image, $lC_Currencies, $lC_Language, $lC_Tax, $lC_ShoppingCart; + $output = ''; foreach ($data as $key => $value) { @@ -983,6 +983,17 @@ public function parseSubProducts($data) { $img = (isset($value['image']) && empty($value['image']) === false) ? $lC_Image->getAddress($value['image'], 'small') : 'images/pixel_trans.gif'; $height = (isset($value['image']) && empty($value['image']) === false) ? $lC_Image->getHeight('small') : 1; $hcss = (isset($value['image']) && empty($value['image']) === false) ? null : ' style="height:1px;" '; + $price = $value['products_price']; + + if (DISPLAY_PRICE_WITH_TAX == 1) { + $taxClassID = ($lC_ShoppingCart->getShippingMethod('tax_class_id') != NULL) ? $lC_ShoppingCart->getShippingMethod('tax_class_id') : $this->_data['tax_class_id']; + $countryID = ($lC_ShoppingCart->getShippingAddress('country_id') != NULL) ? $lC_ShoppingCart->getShippingAddress('country_id') : STORE_COUNTRY; + $zoneID = ($lC_ShoppingCart->getShippingAddress('zone_id') != NULL) ? $lC_ShoppingCart->getShippingAddress('zone_id') : STORE_ZONE; + $taxRate = $lC_Tax->getTaxRate($taxClassID, $countryID, $zoneID); + $tax = $lC_Tax->calculate($value['products_price'], $taxRate); + $price = lc_round($value['products_price'] + $tax, DECIMAL_PLACES); + } + $output .= '
    ' . '
    ' . ' ' . @@ -992,7 +1003,7 @@ public function parseSubProducts($data) { ((isset($extra) && $extra != null) ? '' . $extra . '' : null) . '
    ' . '
    ' . - ' ' . $lC_Currencies->format($value['products_price']) . '' . + ' ' . $lC_Currencies->format($price) . '' . ' ' . '
    ' . '     ' . From bac3337dd37c210726513bb88e50b2c35818d39f Mon Sep 17 00:00:00 2001 From: datazen Date: Sun, 24 Aug 2014 14:13:05 -0400 Subject: [PATCH 127/168] merge-work --- .../b2b_settings/b2b_settings.php | 45 - .../b2b_settings/classes/b2b_settings.php | 332 ----- .../applications/b2b_settings/classes/rpc.php | 117 -- .../b2b_settings/js/b2b_settings.php | 14 - .../b2b_settings/modal/delete.php | 91 -- .../applications/b2b_settings/modal/edit.php | 110 -- .../applications/b2b_settings/pages/main.php | 237 ---- .../categories/classes/categories.php | 191 --- .../applications/categories/classes/rpc.php | 33 - .../categories/modal/batchAccess.php | 88 -- .../classes/customer_groups.php | 220 ---- .../products/classes/products.php | 457 ------- .../applications/products/classes/rpc.php | 33 - .../products/modal/batchAccess.php | 88 -- .../tabs/relationships_access_levels.inc.php | 33 - .../Loaded_7_B2B/admin/classes/access.php | 16 - .../admin/hooks/categories_pages_edit.xml | 21 - .../admin/hooks/categories_pages_main.xml | 13 - .../admin/hooks/categories_pages_new.xml | 17 - .../hooks/customer_groups_classes_rpc.xml | 21 - .../hooks/customer_groups_modal_edit.xml | 17 - .../admin/hooks/orders_classes_orders.xml | 75 -- .../admin/hooks/orders_pages_edit.xml | 29 - .../admin/hooks/orders_pages_invoice.xml | 79 -- .../admin/hooks/products_pages_main.xml | 13 - .../hooks/products_pages_tabs_pricing.xml | 21 - .../products_pages_tabs_relationships.xml | 13 - .../admin/hooks/templates_default_header.xml | 13 - .../admin/languages/en_US/b2b_settings.php | 59 - .../en_US/modules/access/b2b_settings.php | 12 - .../admin/modules/access/b2b_settings.php | 23 - catalog/addons/Loaded_7_B2B/classes/order.php | 75 -- .../addons/Loaded_7_B2B/classes/product.php | 182 --- catalog/addons/Loaded_7_B2B/controller.php | 156 --- catalog/addons/Loaded_7_B2B/hooks/account.xml | 13 - .../Loaded_7_B2B/hooks/application_bottom.xml | 13 - .../hooks/includes_classes_order.xml | 13 - .../includes_content_checkout_process.xml | 22 - .../hooks/includes_content_index.xml | 13 - .../hooks/modules_actions_cart_add.xml | 13 - .../hooks/modules_boxes_featured_products.xml | 13 - .../hooks/modules_boxes_specials.xml | 13 - .../hooks/modules_boxes_whats_new.xml | 13 - ...odules_content_also_purchased_products.xml | 13 - .../modules_content_featured_products.xml | 13 - .../hooks/modules_content_new_products.xml | 13 - .../modules_recently_visited_products.xml | 17 - .../hooks/modules_upcoming_products.xml | 13 - .../template_content_account_receipt.xml | 43 - ...plates_content_account_account_history.xml | 60 - ...content_checkout_checkout_confirmation.xml | 32 - ...ates_content_checkout_checkout_success.xml | 44 - .../Loaded_7_B2B/images/loaded7_b2b.png | Bin 3220 -> 0 bytes .../Loaded_7_B2B/javascript/general.js.php | 35 - .../addons/Loaded_7_B2B/languages/en_US.xml | 35 - .../categories/classes/categories.php | 124 -- .../classes/product_classes.php | 219 ---- .../product_classes/classes/rpc.php | 78 -- .../product_classes/js/product_classes.js.php | 39 - .../product_classes/modal/delete.php | 94 -- .../product_classes/modal/edit.php | 117 -- .../product_classes/modal/new.php | 115 -- .../product_classes/pages/main.php | 60 - .../product_classes/product_classes.php | 28 - .../products/classes/products.php | 1094 ----------------- .../applications/products/classes/rpc.php | 30 - .../products/modal/addComboOption.php | 603 --------- .../pages/tabs/options_subproducts.inc.php | 347 ------ .../products/pages/tabs/pricing_qpb.inc.php | 143 --- .../admin/hooks/categories_save.xml | 17 - .../admin/hooks/customers_listing.xml | 13 - .../admin/hooks/database_tables.xml | 13 - .../admin/hooks/product_actions_save.xml | 17 - .../admin/hooks/product_classes.xml | 28 - .../admin/hooks/product_edit_data.xml | 17 - .../admin/hooks/product_edit_images.xml | 17 - .../admin/hooks/product_edit_options.xml | 26 - .../admin/hooks/product_edit_pricing.xml | 17 - .../admin/hooks/products_class.xml | 25 - .../Loaded_7_Pro/admin/hooks/store_class.xml | 13 - .../inc/modules_variants_file_upload.inc.php | 59 - ...ules_variants_multiple_file_upload.inc.php | 59 - .../en_US/modules/access/product_classes.php | 12 - .../product_attributes/product_classes.php | 12 - .../admin/languages/en_US/product_classes.php | 38 - .../product_attributes/product_classes.php | 45 - .../content/account/login.inc.php | 67 - catalog/addons/Loaded_7_Pro/controller.php | 288 ----- .../hooks/content_account_login.xml | 13 - .../hooks/modules_variants_file_upload.xml | 13 - .../modules_variants_multiple_file_upload.xml | 13 - .../Loaded_7_Pro/images/loaded7_pro.png | Bin 3708 -> 0 bytes .../addons/Loaded_7_Pro/languages/en_US.xml | 20 - 93 files changed, 7321 deletions(-) delete mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/b2b_settings.php delete mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/b2b_settings.php delete mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/rpc.php delete mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/js/b2b_settings.php delete mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/delete.php delete mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/edit.php delete mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php delete mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php delete mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/rpc.php delete mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/categories/modal/batchAccess.php delete mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php delete mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php delete mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/products/classes/rpc.php delete mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/products/modal/batchAccess.php delete mode 100644 catalog/addons/Loaded_7_B2B/admin/applications/products/pages/tabs/relationships_access_levels.inc.php delete mode 100644 catalog/addons/Loaded_7_B2B/admin/classes/access.php delete mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_edit.xml delete mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_main.xml delete mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_new.xml delete mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_classes_rpc.xml delete mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_modal_edit.xml delete mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/orders_classes_orders.xml delete mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_edit.xml delete mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_invoice.xml delete mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_main.xml delete mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_pricing.xml delete mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_relationships.xml delete mode 100644 catalog/addons/Loaded_7_B2B/admin/hooks/templates_default_header.xml delete mode 100644 catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php delete mode 100644 catalog/addons/Loaded_7_B2B/admin/languages/en_US/modules/access/b2b_settings.php delete mode 100644 catalog/addons/Loaded_7_B2B/admin/modules/access/b2b_settings.php delete mode 100644 catalog/addons/Loaded_7_B2B/classes/order.php delete mode 100644 catalog/addons/Loaded_7_B2B/classes/product.php delete mode 100644 catalog/addons/Loaded_7_B2B/controller.php delete mode 100644 catalog/addons/Loaded_7_B2B/hooks/account.xml delete mode 100644 catalog/addons/Loaded_7_B2B/hooks/application_bottom.xml delete mode 100644 catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml delete mode 100644 catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml delete mode 100644 catalog/addons/Loaded_7_B2B/hooks/includes_content_index.xml delete mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_actions_cart_add.xml delete mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_boxes_featured_products.xml delete mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_boxes_specials.xml delete mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_boxes_whats_new.xml delete mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_content_also_purchased_products.xml delete mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_content_featured_products.xml delete mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_content_new_products.xml delete mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_recently_visited_products.xml delete mode 100644 catalog/addons/Loaded_7_B2B/hooks/modules_upcoming_products.xml delete mode 100644 catalog/addons/Loaded_7_B2B/hooks/template_content_account_receipt.xml delete mode 100644 catalog/addons/Loaded_7_B2B/hooks/templates_content_account_account_history.xml delete mode 100644 catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_confirmation.xml delete mode 100644 catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml delete mode 100644 catalog/addons/Loaded_7_B2B/images/loaded7_b2b.png delete mode 100644 catalog/addons/Loaded_7_B2B/javascript/general.js.php delete mode 100644 catalog/addons/Loaded_7_B2B/languages/en_US.xml delete mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml delete mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml delete mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml delete mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml delete mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml delete mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml delete mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml delete mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml delete mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml delete mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml delete mode 100644 catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml delete mode 100644 catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_file_upload.inc.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_multiple_file_upload.inc.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php delete mode 100644 catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php delete mode 100644 catalog/addons/Loaded_7_Pro/content/account/login.inc.php delete mode 100644 catalog/addons/Loaded_7_Pro/controller.php delete mode 100644 catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml delete mode 100644 catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml delete mode 100644 catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml delete mode 100644 catalog/addons/Loaded_7_Pro/images/loaded7_pro.png delete mode 100644 catalog/addons/Loaded_7_Pro/languages/en_US.xml diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/b2b_settings.php deleted file mode 100644 index a0ff0d601..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/b2b_settings.php +++ /dev/null @@ -1,45 +0,0 @@ -_page_title = $lC_Language->get('heading_title'); - - $action = (isset($_GET['action']) && $_GET['action'] != NULL) ? $_GET['action'] : NULL; - - switch ($action) { - case 'save' : - $data = array('allow_self_register' => (isset($_POST['allow_self_register']) ? $_POST['allow_self_register'] : null), - 'guest_catalog_access' => (isset($_POST['guest_catalog_access']) ? $_POST['guest_catalog_access'] : null), - 'show_guest_only_msrp' => (isset($_POST['show_guest_only_msrp']) ? $_POST['show_guest_only_msrp'] : null), - 'show_retail_only_msrp' => (isset($_POST['show_retail_only_msrp']) ? $_POST['show_retail_only_msrp'] : null)); - - lC_B2b_settings_Admin::save($data); - - lc_redirect_admin(lc_href_link_admin(FILENAME_DEFAULT, $this->_module)); - break; - } - - $b2bInfo = new lC_ObjectInfo(lC_B2b_settings_Admin::get()); - } -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/b2b_settings.php deleted file mode 100644 index d82cebd8d..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/b2b_settings.php +++ /dev/null @@ -1,332 +0,0 @@ -loadIniFile(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/languages/' . $lC_Language->getCode() . '/b2b_settings.php', null, null, true); - - $Qlevels = $lC_Database->query('select * from :table_customers_access order by id'); - $Qlevels->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); - $Qlevels->execute(); - - $result = array('aaData' => array()); - while ( $Qlevels->next() ) { - - $system = ($Qlevels->valueInt('id') == 1 || $Qlevels->valueInt('id') == 2) ? true : false; - - $id = $Qlevels->valueInt('id'); - $level = $Qlevels->value('level') . ''; - $memberArr = self::getCustomerAccessMembers($Qlevels->valueInt('id')); - $members = $memberArr['members']; - $status = '' . (($Qlevels->valueInt('status') == 1) ? '' : '') . ''; - - $action = ' - - ' . (($media === 'mobile-portrait' || $media === 'mobile-landscape') ? NULL : $lC_Language->get('icon_edit')) . ' - - - - - '; - - $result['aaData'][] = array("$id", "$level", "$members", "$status", "$action"); - $result['entries'][] = $Qlevels->toArray(); - } - - $Qlevels->freeResult(); - - return $result; - } - - public static function getCustomerAccessMembers($id) { - global $lC_Database; - - $groups = array(); - - $Qgroups = $lC_Database->query('select customers_group_id, customers_access_levels from :table_customers_groups_data'); - $Qgroups->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); - $Qgroups->execute(); - - while($Qgroups->next()) { - $levelsArr = explode(';', $Qgroups->value('customers_access_levels')); - if (in_array($id, $levelsArr)) $groups[] = $Qgroups->value('customers_group_id'); - } - - $cnt = 0; - foreach($groups as $key => $cgID) { - $Qcustomers = $lC_Database->query('select count(*) as total from :table_customers where customers_group_id = :customers_group_id'); - $Qcustomers->bindTable(':table_customers', TABLE_CUSTOMERS); - $Qcustomers->bindInt(':customers_group_id', $cgID); - $Qcustomers->execute(); - - $cnt = $cnt + $Qcustomers->valueInt('total'); - - $Qcustomers->freeResult(); - } - - return array('members' => $cnt); - } - /* - * Returns the b2b_settings information - * - * @access public - * @return array - */ - public static function get() { - global $lC_Database, $lC_Language, $lC_Currencies; - - $data = array(); - - $Qcfg = $lC_Database->query('select configuration_value from :table_configuration where configuration_key = :configuration_key'); - $Qcfg->bindTable(':table_configuration', TABLE_CONFIGURATION); - $Qcfg->bindValue(':configuration_key', 'B2B_SETTINGS_GUEST_CATALOG_ACCESS'); - $Qcfg->execute(); - - $data['B2B_SETTINGS_GUEST_CATALOG_ACCESS'] = $Qcfg->value('configuration_value'); - - $Qcfg->freeResult(); - - $Qcfg = $lC_Database->query('select configuration_value from :table_configuration where configuration_key = :configuration_key'); - $Qcfg->bindTable(':table_configuration', TABLE_CONFIGURATION); - $Qcfg->bindValue(':configuration_key', 'B2B_SETTINGS_ALLOW_SELF_REGISTER'); - $Qcfg->execute(); - - $data['B2B_SETTINGS_ALLOW_SELF_REGISTER'] = $Qcfg->value('configuration_value'); - - $Qcfg->freeResult(); - - $Qcfg = $lC_Database->query('select configuration_value from :table_configuration where configuration_key = :configuration_key'); - $Qcfg->bindTable(':table_configuration', TABLE_CONFIGURATION); - $Qcfg->bindValue(':configuration_key', 'B2B_SETTINGS_SHOW_GUEST_ONLY_MSRP'); - $Qcfg->execute(); - - $data['B2B_SETTINGS_SHOW_GUEST_ONLY_MSRP'] = $Qcfg->value('configuration_value'); - - $Qcfg->freeResult(); - - $Qcfg = $lC_Database->query('select configuration_value from :table_configuration where configuration_key = :configuration_key'); - $Qcfg->bindTable(':table_configuration', TABLE_CONFIGURATION); - $Qcfg->bindValue(':configuration_key', 'B2B_SETTINGS_SHOW_RETAIL_ONLY_MSRP'); - $Qcfg->execute(); - - $data['B2B_SETTINGS_SHOW_RETAIL_ONLY_MSRP'] = $Qcfg->value('configuration_value'); - - $Qcfg->freeResult(); - - return $data; - } - /* - * Saves the settings information - * - * @param array $data The settings data to save - * @access public - * @return boolean - */ - public static function save($data) { - global $lC_Database; - - if (!is_array($data)) return false; - - $error = false; - - $lC_Database->startTransaction(); - - foreach ($data as $key => $value) { - - $const = 'B2B_SETTINGS_' . strtoupper($key); - - $Qcfg = $lC_Database->query('select configuration_id from :table_configuration where configuration_key = :configuration_key'); - $Qcfg->bindTable(':table_configuration', TABLE_CONFIGURATION); - $Qcfg->bindValue(':configuration_key', $const); - $Qcfg->execute(); - - $newValue = ($value == 'on') ? '1' : (string)$value; - - if ( $Qcfg->numberOfRows() === 1 ) { - $Qsettings = $lC_Database->query('update :table_configuration set configuration_value = :configuration_value, last_modified = now() where configuration_key = :configuration_key'); - } else { - $Qsettings = $lC_Database->query('insert into :table_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, date_added) values (:configuration_title, :configuration_key, :configuration_value, :configuration_description, :configuration_group_id, :date_added)'); - $Qsettings->bindValue(':configuration_title', ucwords(str_replace('_', ' ', $key))); - $Qsettings->bindValue(':configuration_description', ucwords(str_replace('_', ' ', $key))); - $Qsettings->bindInt(':configuration_group_id', 10); - $Qsettings->bindRaw(':date_added', 'now()'); - } - $Qsettings->bindTable(':table_configuration', TABLE_CONFIGURATION); - $Qsettings->bindValue(':configuration_value', $newValue); - $Qsettings->bindValue(':configuration_key', $const); - $Qsettings->setLogging($_SESSION['module'], $key); - $Qsettings->execute(); - - if ( $lC_Database->isError() ) { - $error = true; - break; - } - } - - if ( $error === false ) { - $lC_Database->commitTransaction(); - lC_Cache::clear('configuration'); - - return true; - } - - $lC_Database->rollbackTransaction(); - - return false; - } - /* - * Update customer access level status - * - * @param int $id The customer access level id - * @param int $val The customer access level status - * @access public - * @return true or false - */ - public static function updateCustomerAccessLevelStatus($id, $val = 0) { - global $lC_Database; - - $Qupdate = $lC_Database->query('update :table_customers_access set status = :status where id = :id'); - $Qupdate->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); - $Qupdate->bindInt(':status', $val); - $Qupdate->bindInt(':id', $id); - $Qupdate->execute(); - - return true; - } - /* - * Save the customer access level information - * - * @param string $level The customer access level to add - * @access public - * @return boolean - */ - public static function addCustomerAccessLevel($level) { - global $lC_Database, $lC_Language; - - $error = false; - - $Qchk = $lC_Database->query('select id from :table_customers_access where level = :level limit 1'); - $Qchk->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); - $Qchk->bindValue(':level', $level); - $Qchk->execute(); - - $rows = $Qchk->numberOfRows(); - - $Qchk->freeResult(); - - if ($rows == 0) { - - $lC_Database->startTransaction(); - - $Qlevel = $lC_Database->query('insert into :table_customers_access (level, status) values (:level, :status)'); - $Qlevel->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); - $Qlevel->bindValue(':level', $level); - $Qlevel->bindInt(':status', 1); - $Qlevel->setLogging($_SESSION['module'], $level); - $Qlevel->execute(); - - if ( $lC_Database->isError() === false ) { - $lC_Database->commitTransaction(); - return true; - } - - $lC_Database->rollbackTransaction(); - - return false; - } else { - return true; - } - } - /* - * Update the customer access level information - * - * @param integer $id The customer access level id to update - * @param array $data The customer access level data - * @access public - * @return boolean - */ - public static function updateCustomerAccessLevels($id, $data) { - global $lC_Database, $lC_Language; - - $error = false; - - $lC_Database->startTransaction(); - - $Qlevel = $lC_Database->query('update :table_customers_access set level = :level, status = :status where id = :id'); - $Qlevel->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); - $Qlevel->bindValue(':level', $data['level']); - $Qlevel->bindInt(':status', (($data['status'] == 'on') ? 1 : 0)); - $Qlevel->bindInt(':id', $id); - $Qlevel->setLogging($_SESSION['module'], $data['level']); - $Qlevel->execute(); - - if ( $lC_Database->isError() === false ) { - $lC_Database->commitTransaction(); - return true; - } - - $lC_Database->rollbackTransaction(); - - return false; - } - /* - * Delete the customer access level record - * - * @param integer $id The customer access level id to delete - * @access public - * @return boolean - */ - public static function deleteCustomerAccessLevel($id) { - global $lC_Database; - - $Qgroups = $lC_Database->query('delete from :table_customers_access where id = :id'); - $Qgroups->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); - $Qgroups->bindInt(':id', $id); - $Qgroups->setLogging($_SESSION['module'], $id); - $Qgroups->execute(); - - if ( $lC_Database->isError() ) { - return false; - } - - return true; - } - /* - * Get the customer access level data - * - * @param integer $id The customer access level id to retrieve - * @access public - * @return array - */ - public static function getCustomerAccessFormData($id) { - global $lC_Database; - - $Qgroups = $lC_Database->query('select * from :table_customers_access where id = :id limit 1'); - $Qgroups->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); - $Qgroups->bindInt(':id', $id); - $Qgroups->execute(); - - $data = $Qgroups->toArray(); - - $Qgroups->freeResult(); - - return $data; - } -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/rpc.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/rpc.php deleted file mode 100644 index ecb553f19..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/classes/rpc.php +++ /dev/null @@ -1,117 +0,0 @@ - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/js/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/js/b2b_settings.php deleted file mode 100644 index 9135e7cce..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/js/b2b_settings.php +++ /dev/null @@ -1,14 +0,0 @@ - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/delete.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/delete.php deleted file mode 100644 index 94b8401ee..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/delete.php +++ /dev/null @@ -1,91 +0,0 @@ - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/edit.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/edit.php deleted file mode 100644 index 29447397b..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/modal/edit.php +++ /dev/null @@ -1,110 +0,0 @@ - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php b/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php deleted file mode 100644 index 905989bb1..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/b2b_settings/pages/main.php +++ /dev/null @@ -1,237 +0,0 @@ - - - -
    - -
    -

    getPageTitle(); ?>

    -
    -
    -
    - -
    - - - -
    -
    - -
    - get('heading_guest_access'); ?> -
    -
    -

    - - - get('B2B_SETTINGS_ALLOW_SELF_REGISTER') == '1') ? 'checked="checked" ' : ''); - echo lc_draw_checkbox_field('allow_self_register',null, null, $checked . 'class="switch medium" data-text-on="' . strtoupper($lC_Language->get('button_yes')) . '" data-text-off="' . strtoupper($lC_Language->get('button_no')) . '"'); ?>get('info_bubble_displays_create_account_form'); ?> -

    - -

    - get('label_guest_catalog_access'); ?> - get('info_bubble_guest_catalog_access')); ?> - -

    - -
    -
    -
    - -
    -
    - get('heading_access_group_levels'); ?> - - - - - - - - - - - - - - - - - - -
    get('table_heading_id'); ?>get('table_heading_group'); ?>get('table_heading_members'); ?>get('table_heading_status'); ?>get('table_heading_action'); ?>
    -

    - - - get('button_create_new'); ?> -

    -
    - -
    -
    -
    - -
    -
    - get('heading_msrp_pricing'); ?> -
    -
    -

    - - get('B2B_SETTINGS_SHOW_GUEST_ONLY_MSRP') == '1') ? 'checked="checked" ' : ''); - echo lc_draw_checkbox_field('show_guest_only_msrp',null, null, $checked . 'class="switch medium" data-text-on="' . strtoupper($lC_Language->get('button_yes')) . '" data-text-off="' . strtoupper($lC_Language->get('button_no')) . '"'); ?>get('info_hides_purchase_prices'); ?> -

    -

    - - get('B2B_SETTINGS_SHOW_RETAIL_ONLY_MSRP') == '1') ? 'checked="checked" ' : ''); - echo lc_draw_checkbox_field('show_retail_only_msrp',null, null, $checked . 'class="switch medium" data-text-on="' . strtoupper($lC_Language->get('button_yes')) . '" data-text-off="' . strtoupper($lC_Language->get('button_no')) . '"'); ?>get('info_hides_purchase_prices'); ?> -

    -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    -
    -

    - getModule()] < 3) ? '' : ' onclick="validateForm(\'#b2b_settings\');"'); - $close = lc_href_link_admin(FILENAME_DEFAULT, $lC_Template->getModule()); - button_save_close($save, false, $close); - ?> -

    -
    -
    -
    -
    - - - -
    -
    -loadModal($lC_Template->getModule()); ?> - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php b/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php deleted file mode 100644 index f9f64bd50..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php +++ /dev/null @@ -1,191 +0,0 @@ -modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php')); -include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/classes/category_tree.php')); - -class lC_Categories_b2b_Admin extends lC_Categories_pro_Admin { - /* - * Save the category record - * - * @param integer $id The category id on update, null on insert - * @param array $data The category information - * @access public - * @return boolean - */ - public static function save($id = null, $data) { - global $lC_Database, $lC_Language, $lC_CategoryTree; - - $category_id = lC_Categories_pro_Admin::save($id, $data); - - $error = false; - - $lC_Database->startTransaction(); - - $levels = ''; - if (is_array($data['access_levels'])) { - foreach ($data['access_levels'] as $key => $val) { - $levels .= $key . ';'; - } - $levels = substr($levels, 0, -1); - } - - $Qcat = $lC_Database->query('update :table_categories set `access_levels` = :access_levels where `categories_id` = :categories_id'); - $Qcat->bindTable(':table_categories', TABLE_CATEGORIES); - $Qcat->bindInt(':categories_id', $category_id); - $Qcat->bindValue(':access_levels', $levels); - $Qcat->setLogging($_SESSION['module'], $category_id); - $Qcat->execute(); - - if ( !$lC_Database->isError()) { - $syncAllProducts = (isset($data['sync_all_products']) && $data['sync_all_products'] == 'on') ? true: false; - $syncAllChildren = (isset($data['sync_all_children']) && $data['sync_all_children'] == 'on') ? true: false; - - if ($syncAllProducts || $syncAllChildren) { - $lC_CategoryTree = new lC_CategoryTree_Admin(); - $catArr = $lC_CategoryTree->getArray($category_id); - - foreach ($catArr as $value) { - $catID = end(explode('_', $value['id'])); - if ($syncAllChildren) self::_updateCategoryAccessLevels($catID, $levels); - if ($syncAllProducts) self::_updateProductAccessLevels($catID, $levels); - } - } - } - - if ( !$lC_Database->isError() ) { - $lC_Database->commitTransaction(); - lC_Cache::clear('categories'); - - return $category_id; // used for the save_close buttons - } - - $lC_Database->rollbackTransaction(); - - return false; - } - /* - * Update the product access levels - * - * @param integer $category_id The parent category id - * @param string $levels The access levels - * @access public - * @return boolean - */ - protected static function _updateProductAccessLevels($category_id, $levels) { - global $lC_Database; - - // get all product_id's assigned to $category_id - $Qp2c = $lC_Database->query('select products_id from :table_products_to_categories where `categories_id` = :categories_id'); - $Qp2c->bindTable(':table_products_to_categories', TABLE_PRODUCTS_TO_CATEGORIES); - $Qp2c->bindInt(':categories_id', $category_id); - $Qp2c->setLogging($_SESSION['module'], $category_id); - $Qp2c->execute(); - - $lC_Database->startTransaction(); - - if ( !$lC_Database->isError()) { - while($Qp2c->next()) { - $Qproducts = $lC_Database->query('update :table_products set `access_levels` = :access_levels where `products_id` = :products_id'); - $Qproducts->bindTable(':table_products', TABLE_PRODUCTS); - $Qproducts->bindInt(':products_id', $Qp2c->valueInt('products_id')); - $Qproducts->bindvalue(':access_levels', $levels); - $Qproducts->setLogging($_SESSION['module'], $category_id); - $Qproducts->execute(); - } - } - - $Qp2c->freeResult(); - - if ( !$lC_Database->isError() ) { - $lC_Database->commitTransaction(); - return true; - } - - $lC_Database->rollbackTransaction(); - - return false; - } - /* - * Update the category access levels - * - * @param integer $category_id The parent category id - * @param string $levels The access levels - * @access public - * @return boolean - */ - protected static function _updateCategoryAccessLevels($category_id, $levels) { - global $lC_Database; - - $lC_Database->startTransaction(); - - $Qcat = $lC_Database->query('update :table_categories set `access_levels` = :access_levels where `categories_id` = :categories_id'); - $Qcat->bindTable(':table_categories', TABLE_CATEGORIES); - $Qcat->bindInt(':categories_id', $category_id); - $Qcat->bindValue(':access_levels', $levels); - $Qcat->setLogging($_SESSION['module'], $category_id); - $Qcat->execute(); - - if ( !$lC_Database->isError() ) { - $lC_Database->commitTransaction(); - return true; - } - - $lC_Database->rollbackTransaction(); - - return false; - } - /* - * Batch update the category access levels - * - * @param integer $category_id The parent category id - * @param string $levels The access levels - * @access public - * @return boolean - */ - public static function batchEditAccess($data) { - global $lC_Database, $lC_CategoryTree; - - $levels = ''; - if (is_array($data['access_levels'])) { - foreach ($data['access_levels'] as $key => $val) { - $levels .= $key . ';'; - } - $levels = substr($levels, 0, -1); - } - - $syncAllProducts = (isset($data['sync_all_products']) && $data['sync_all_products'] == 'on') ? true: false; - $syncAllChildren = (isset($data['sync_all_children']) && $data['sync_all_children'] == 'on') ? true: false; - - foreach ( $data['batch'] as $category_id ) { - - self::_updateCategoryAccessLevels($category_id, $levels); - - if ($syncAllProducts || $syncAllChildren) { - // get the children categories - $lC_CategoryTree = new lC_CategoryTree_Admin(); - $catArr = $lC_CategoryTree->getArray($category_id); - - foreach ($catArr as $value) { - $catID = end(explode('_', $value['id'])); - if ($syncAllChildren) self::_updateCategoryAccessLevels($catID, $levels); - if ($syncAllProducts) self::_updateProductAccessLevels($catID, $levels); - } - } - } - - return true; - } -} \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/rpc.php b/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/rpc.php deleted file mode 100644 index 6a42ef319..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/categories/classes/rpc.php +++ /dev/null @@ -1,33 +0,0 @@ - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/categories/modal/batchAccess.php b/catalog/addons/Loaded_7_B2B/admin/applications/categories/modal/batchAccess.php deleted file mode 100644 index 419376b40..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/categories/modal/batchAccess.php +++ /dev/null @@ -1,88 +0,0 @@ -modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); - -global $lC_Language, $lC_Template; -?> - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php b/catalog/addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php deleted file mode 100644 index 9cc03977c..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php +++ /dev/null @@ -1,220 +0,0 @@ -modCheck(DIR_FS_ADMIN . 'includes/applications/customer_groups/classes/customer_groups.php')); - -class lC_Customer_groups_b2b_Admin extends lC_Customer_groups_Admin { - - /* - * Return the data used on the dialog forms - * - * @param integer $id The customer groups id - * @param boolean $edit True = called from edit dialog else called from delete dialog - * @access public - * @return array - */ - public static function getFormData($id = null, $edit = false) { - global $lC_Database, $lC_Language, $lC_Addons; - - $result = parent::getFormData($id, $edit); - - // get the access levels - $Qlevels = $lC_Database->query('select * from :table_customers_access where status = :status'); - $Qlevels->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); - $Qlevels->bindInt(':status', 1); - $Qlevels->execute(); - - $accessHtml = ''; - $levels = array(); - if (is_array($result['cgData'])) { - $levels = explode(';', $result['cgData']['customers_access_levels']); - } - - while ($Qlevels->next()) { - $checked = ( (in_array($Qlevels->valueInt('id'), $levels)) ? ' checked="checked" ' : '' ); - $accessHtml .= '
    '; - } - - $Qlevels->freeResult(); - - // get the payment/shipping addons for the group - $paymentHtml = ''; - $shippingHtml = ''; - foreach($lC_Addons->getAddons('enabled') as $name => $data) { - if ($data['type'] == 'payment' || $data['type'] == 'paypal') { - $checked = (strstr($result['cgData']['payment_modules'], $name)) ? ' checked="checked" ' : ''; - $paymentHtml .= '
    '; - } else if ($data['type'] == 'shipping') { - $checked = (strstr($result['cgData']['shipping_modules'], $name)) ? ' checked="checked" ' : ''; - $shippingHtml .= '
    '; - } - } - $taxStatus = (isset($result['cgData']['taxable']) && $result['cgData']['taxable'] == 1) ? ' checked="checked" ' : ''; - $hpnChecked = (isset($result['cgData']['hidden_products_notification']) && $result['cgData']['hidden_products_notification'] == 1) ? ' checked="checked" ' : ''; - if ($hpnChecked == '' && !isset($_GET['cgid'])) $hpnChecked = ' checked="checked" '; - - $result['extraFormHtml'] = '
    ' . - ' ' . $lC_Language->get('legend_checkout_options') . '' . - '
    ' . - '
    ' . - '
    ' . $lC_Language->get('heading_payment_methods_available') . lc_show_info_bubble($lC_Language->get('info_bubble_payment_methods_available'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . - '

    ' . $paymentHtml . '

    ' . - '
    ' . - '
    ' . - '
    ' . $lC_Language->get('heading_shipping_methods_available') . lc_show_info_bubble($lC_Language->get('info_bubble_shipping_methods_available'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . - '

    ' . $shippingHtml . '

    ' . - '
    ' . $lC_Language->get('heading_taxable_status') . lc_show_info_bubble($lC_Language->get('info_bubble_taxable_status'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . - '

    ' . - '
    ' . - '
    ' . - '
    ' . - '
    ' . - ' ' . $lC_Language->get('legend_catalog_visibility') . '' . - '
    ' . - '
    ' . - '
    ' . $lC_Language->get('heading_access_group_visibility') . lc_show_info_bubble($lC_Language->get('info_bubble_access_group_visibility'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . - '

    ' . $accessHtml . '

    ' . - '
    ' . - '
    ' . - '
    ' . $lC_Language->get('heading_hidden_product_notification') . lc_show_info_bubble($lC_Language->get('info_bubble_hidden_product_notification'), 'margin-left:6px; margin-top:0px', 'on-left grey') . '
    ' . - '
    ' . - ' ' . - '
    ' . - '

    ' . $lC_Language->get('text_hidden_product_notification_info') . '

    ' . - '
    ' . - '
    ' . - '
    '; - - return $result; - } - - public static function getCustomerAccessLevelsHtml($section = 'customer_groups') { - global $lC_Database, $lC_Language, $pInfo, $cInfo; - - $lC_Language->loadIniFile('customer_groups.php'); - - $levels = array(); - if (isset($pInfo)) { - $levels = explode(';', $pInfo->get('access_levels')); - } else if (isset($cInfo)) { - $levels = explode(';', $cInfo['access_levels']); - } - - // get the access levels - $Qlevels = $lC_Database->query('select * from :table_customers_access where status = :status'); - $Qlevels->bindTable(':table_customers_access', TABLE_CUSTOMERS_ACCESS); - $Qlevels->bindInt(':status', 1); - $Qlevels->execute(); - - $accessHtml = '
    '; - - while ($Qlevels->next()) { - $checked = ( (in_array($Qlevels->valueInt('id'), $levels)) ? ' checked="checked" ' : '' ); - $accessHtml .= '
    '; - } - - $Qlevels->freeResult(); - - if ($section == 'categories') { - $accessHtml .= self::_getSyncHtml(); - } - - return $accessHtml; - } - - protected static function _getSyncHtml() { - global $lC_Language; - - $lC_Language->loadIniFile('categories.php'); - - $html = '' . - '
    ' . - ' ' . - ' ' . lc_show_info_bubble($lC_Language->get('info_bubble_sync_products'), null, 'info-spot on-left grey margin-left margin-right') . - '
    ' . - '
    ' . - ' ' . - ' ' . lc_show_info_bubble($lC_Language->get('info_bubble_sync_children'), null, 'info-spot on-left grey margin-left margin-right') . - '
    '; - - return $html; - } - /* - * Save the customer group information - * - * @param integer $id The customer group id used on update, null on insert - * @param array $data An array containing the customer group information - * @param boolean $default True = set the customer group to be the default - * @access public - * @return boolean - */ - public static function save($id = null, $data, $default = false) { - global $lC_Database, $lC_Language; - - $customers_group_id = parent::save($id, $data, $default); - - $error = false; - - $lC_Database->startTransaction(); - - $Qdel = $lC_Database->query('delete from :table_customers_groups_data where customers_group_id = :customers_group_id'); - $Qdel->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); - $Qdel->bindInt(':customers_group_id', $customers_group_id); - $Qdel->execute(); - - $Qgdata = $lC_Database->query('insert into :table_customers_groups_data (customers_group_id, baseline_discount, customers_access_levels, hidden_products_notification, taxable, payment_modules, shipping_modules) values (:customers_group_id, :baseline_discount, :customers_access_levels, :hidden_products_notification, :taxable, :payment_modules, :shipping_modules)'); - $Qgdata->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); - $Qgdata->bindInt(':customers_group_id', $customers_group_id); - $Qgdata->bindFloat(':baseline_discount', $data['baseline']); - $Qgdata->bindValue(':customers_access_levels', self::_arr2str($data['level'])); - $Qgdata->bindInt(':hidden_products_notification', (($data['hidden_products_notification'] == 'on') ? true : false)); - $Qgdata->bindInt(':taxable', $data['taxable']); - $Qgdata->bindValue(':payment_modules', self::_arr2str($data['payment'])); - $Qgdata->bindValue(':shipping_modules', self::_arr2str($data['shipping'])); - $Qgdata->setLogging($_SESSION['module'], $customers_group_id); - $Qgdata->execute(); - - if ( $lC_Database->isError() ) { - $error = true; - } - - if ( $error === false ) { - $lC_Database->commitTransaction(); - - return $customers_group_id; - } - - $lC_Database->rollbackTransaction(); - - return false; - } - /* - * format the array to semi-colo separated string - * - * @param array $arr The array to format - * @access private - * @return string - */ - private static function _arr2str($arr) { - if (!is_array($arr)) return false; - $str = ''; - foreach ($arr as $key => $val) { - $str .= $key . ';'; - } - $str = substr($str, 0, -1); - - return $str; - } -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php b/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php deleted file mode 100644 index 3242bc153..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/products.php +++ /dev/null @@ -1,457 +0,0 @@ -modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/applications/products/classes/products.php')); -include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/applications/products/classes/products.php')); -include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/applications/customer_groups/classes/customer_groups.php')); - -class lC_Products_b2b_Admin extends lC_Products_pro_Admin { - /* - * Save the product - * - * @param integer $id The products id to update, null on insert - * @param array $data The products information - * @access public - * @return boolean - */ - public static function save($id = null, $data) { - global $lC_Database, $lC_Language; - - $products_id = lC_Products_pro_Admin::save($id, $data); - - $error = false; - - $lC_Database->startTransaction(); - - // remove all old pricing records - $Qpricing = $lC_Database->query('delete from :table_products_pricing where products_id = :products_id or parent_id = :products_id'); - $Qpricing->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpricing->bindInt(':products_id', $products_id); - $Qpricing->bindInt(':products_id', $products_id); - $Qpricing->setLogging($_SESSION['module'], $products_id); - $Qpricing->execute(); - - $qpb_pricing_enabled = (isset($data['qpb_pricing_switch']) && $data['qpb_pricing_switch'] == 1) ? true : false; - $groups_pricing_enabled = (isset($data['groups_pricing_switch']) && $data['groups_pricing_switch'] == 1) ? true : false; - $specials_pricing_enabled = (isset($data['specials_pricing_switch']) && $data['specials_pricing_switch'] == 1) ? true : false; - - if ( $lC_Database->isError() ) { - $error = true; - } else { - // add qty price breaks - if (is_array($data['products_qty_break_point']) && !empty($data['products_qty_break_point'])) { - if ($products_id != null) { - - // add the new records - foreach($data['products_qty_break_point'] as $group => $values) { - if (is_array($data['products_qty_break_point'][$group]) && $data['products_qty_break_point'][$group][1] != null) { - foreach($values as $key => $val) { - - if ($val == -1) continue; - if ($data['products_qty_break_point'][$group][$key] == null) continue; - if ((int)$data['products_qty_break_point'][$group][$key] == 1) continue; // do not save qty 1, base price is same - - $price = (is_array($data['options_pricing']) && !empty($data['options_pricing'])) ? 0.00 : $data['products_qty_break_price'][$group][$key]; // for options support - - $Qpb = $lC_Database->query('insert into :table_products_pricing (products_id, group_id, tax_class_id, qty_break, price_break, date_added) values (:products_id, :group_id, :tax_class_id, :qty_break, :price_break, :date_added)'); - $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpb->bindInt(':products_id', $products_id ); - $Qpb->bindInt(':group_id', $group); - $Qpb->bindInt(':tax_class_id', $data['tax_class_id'] ); - $Qpb->bindValue(':qty_break', $data['products_qty_break_point'][$group][$key] ); - $Qpb->bindFloat(':price_break', $price ); - $Qpb->bindRaw(':date_added', 'now()'); - $Qpb->setLogging($_SESSION['module'], $products_id); - $Qpb->execute(); - - if ( $lC_Database->isError() ) { -die($lC_Database->getError()); - - $error = true; - break 2; - } - } - } - } - - // add qpb for options - if (is_array($data['options_pricing']) && !empty($data['options_pricing'])) { - - $parent_id = $products_id; - - foreach($data['options_pricing'] as $product_id => $groups) { - foreach($groups as $group_id => $gdata) { - foreach($gdata as $qty_break => $price) { - $Qpb2 = $lC_Database->query('insert into :table_products_pricing (products_id, parent_id, group_id, tax_class_id, qty_break, price_break, date_added) values (:products_id, :parent_id, :group_id, :tax_class_id, :qty_break, :price_break, :date_added)'); - $Qpb2->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpb2->bindInt(':products_id', $product_id ); - $Qpb2->bindInt(':parent_id', $parent_id ); - $Qpb2->bindInt(':group_id', $group_id); - $Qpb2->bindInt(':tax_class_id', $data['tax_class_id'] ); - $Qpb2->bindValue(':qty_break', $qty_break ); - $Qpb2->bindFloat(':price_break', number_format($price, DECIMAL_PLACES) ); - $Qpb2->bindRaw(':date_added', 'now()'); - $Qpb2->setLogging($_SESSION['module'], $product_id); - $Qpb2->execute(); - - if ( $lC_Database->isError() ) { -die($lC_Database->getError()); - $error = true; - break 3; - } - - // if qty_break = 1, also update products_price - if ($qty_break == 1 && $price > 0.00) self::_updateProductPrice($product_id, number_format($price, DECIMAL_PLACES)); - - } - } - } - } - } - } - } - if ($error === false) { - // add group pricing - if (is_array($data['group_pricing']) && !empty($data['group_pricing'])) { - if ($products_id != null) { - // add the new records - foreach($data['group_pricing'] as $group => $values) { - $Qgp = $lC_Database->query('insert into :table_products_pricing (products_id, qty_break, price_break, group_id, tax_class_id, group_status, group_price, date_added) values (:products_id, :qty_break, :price_break, :group_id, :tax_class_id, :group_status, :group_price, :date_added)'); - $Qgp->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qgp->bindInt(':products_id', $products_id ); - $Qgp->bindInt(':qty_break', -1); - $Qgp->bindFloat(':price_break', number_format(0, DECIMAL_PLACES)); - $Qgp->bindInt(':group_id', $group); - $Qgp->bindInt(':tax_class_id', $data['tax_class_id'] ); - $Qgp->bindValue(':group_status', (($values['enable'] == 'on') ? 1 : 0)); - $Qgp->bindValue(':group_price', number_format($values['price'], DECIMAL_PLACES)); - $Qgp->bindRaw(':date_added', 'now()'); - $Qgp->setLogging($_SESSION['module'], $products_id); - $Qgp->execute(); - - if ( $lC_Database->isError() ) { -die($lC_Database->getError()); - - $error = true; - break; - } - } - } - } - } - - if ($error === false) { - // add special pricing - if (is_array($data['products_special_pricing']) && !empty($data['products_special_pricing'])) { - if ($products_id != null) { - - // add the new records - foreach($data['products_special_pricing'] as $group => $values) { - - $start_date = (isset($values['start_date']) && empty($values['start_date']) === false) ? $values['start_date'] : '0000-00-00 00:00:00'; - $expires_date = (isset($values['expires_date']) && empty($values['expires_date']) === false) ? $values['expires_date'] : '0000-00-00 00:00:00'; - - $Qsp = $lC_Database->query('insert into :table_products_pricing (products_id, qty_break, price_break, group_id, tax_class_id, special_status, special_price, special_start, special_end, date_added) values (:products_id, :qty_break, :price_break, :group_id, :tax_class_id, :special_status, :special_price, :special_start, :special_end, :date_added)'); - $Qsp->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qsp->bindInt(':products_id', $products_id ); - $Qsp->bindInt(':qty_break', -1); - $Qsp->bindFloat(':price_break', number_format(0, DECIMAL_PLACES)); - $Qsp->bindInt(':group_id', $group); - $Qsp->bindInt(':tax_class_id', $data['tax_class_id'] ); - $Qsp->bindValue(':special_status', (($values['enable'] == 'on') ? 1 : 0)); - $Qsp->bindValue(':special_price', number_format($values['price'], DECIMAL_PLACES)); - $Qsp->bindRaw(':date_added', 'now()'); - $Qsp->bindRaw(':special_start', "'" . ((strstr($start_date, '/')) ? lC_DateTime::toDateTime($start_date) : $start_date) . "'"); - $Qsp->bindRaw(':special_end', "'" . ((strstr($expires_date, '/')) ? lC_DateTime::toDateTime($expires_date) : $expires_date) . "'"); - $Qsp->setLogging($_SESSION['module'], $products_id); - $Qsp->execute(); - - if ( $lC_Database->isError() ) { -die($lC_Database->getError()); - $error = true; - break; - } - } - } - } - } - - if ($error === false) { - // add options special pricing - if (is_array($data['specials_pricing']) && !empty($data['specials_pricing'])) { - if ($products_id != null) { - // add the new records - foreach($data['specials_pricing'] as $products_id => $val) { - foreach($val as $group_id => $special_price) { - - if ($special_price == null) continue; - - $Qgp = $lC_Database->query('insert into :table_products_pricing (products_id, parent_id, group_id, tax_class_id, special_status, special_price, date_added) values (:products_id, :parent_id, :group_id, :tax_class_id, :special_status, :special_price, :date_added)'); - $Qgp->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qgp->bindInt(':products_id', $products_id ); - $Qgp->bindInt(':parent_id', $parent_id ); - $Qgp->bindInt(':group_id', $group_id); - $Qgp->bindInt(':tax_class_id', $data['tax_class_id'] ); - $Qgp->bindValue(':special_status', 1); - $Qgp->bindValue(':special_price', number_format($special_price, DECIMAL_PLACES)); - $Qgp->bindRaw(':date_added', 'now()'); - $Qgp->setLogging($_SESSION['module'], $products_id); - $Qgp->execute(); - - if ( $lC_Database->isError() ) { - die($lC_Database->getError()); - - $error = true; - break; - } - } - } - } - } - } - - if ( $error === false ) { - $lC_Database->commitTransaction(); - - lC_Cache::clear('categories'); - lC_Cache::clear('category_tree'); - lC_Cache::clear('also_purchased'); - - return $products_id; // Return the products id for use with the save_close buttons - } - - $lC_Database->rollbackTransaction(); - } - /* - * Batch update the category access levels - * - * @param integer $category_id The parent category id - * @param string $levels The access levels - * @access public - * @return boolean - */ - public static function batchEditAccess($data) { - global $lC_Database; - - $levels = ''; - if (is_array($data['access_levels'])) { - foreach ($data['access_levels'] as $key => $val) { - $levels .= $key . ';'; - } - $levels = substr($levels, 0, -1); - } - - $lC_Database->startTransaction(); - - foreach ( $data['batch'] as $products_id ) { - $Qproduct = $lC_Database->query('update :table_products set `access_levels` = :access_levels where `products_id` = :products_id'); - $Qproduct->bindTable(':table_products', TABLE_PRODUCTS); - $Qproduct->bindInt(':products_id', $products_id); - $Qproduct->bindvalue(':access_levels', $levels); - $Qproduct->setLogging($_SESSION['module'], $products_id); - $Qproduct->execute(); - } - - if ( !$lC_Database->isError() ) { - $lC_Database->commitTransaction(); - return true; - } - - $lC_Database->rollbackTransaction(); - - return false; - } - /* - * Return the product simple options accordian price listing content - * - * @access public - * @return array - */ - public static function getGroupPricingContent($base_price) { - global $lC_Language, $lC_Currencies, $lC_Database, $pInfo; - - $products_id = (isset($pInfo)) ? $pInfo->get('products_id') : null; - - $content = ''; - $groups = lC_Customer_groups_Admin::getAll(); - - foreach($groups['entries'] as $key => $value) { - $group_status = 0; - if ($products_id != null) { - $Qpricing = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id and group_id = :group_id and group_status != :group_status order by qty_break asc'); - $Qpricing->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpricing->bindInt(':products_id', $products_id); - $Qpricing->bindInt(':group_id', $value['customers_group_id']); - $Qpricing->bindInt(':group_status', -1); - $Qpricing->execute(); - - $group_status = $Qpricing->valueInt('group_status'); - $diff = (float)$base_price - $Qpricing->valueDecimal('group_price'); - $discount_text = number_format(round(($diff / $base_price) * 100, DECIMAL_PLACES), DECIMAL_PLACES); - $discounted_price = $Qpricing->valueDecimal('group_price'); - - } else { - $discount = round((float)$base_price * ((float)$value['baseline_discount'] * .01), DECIMAL_PLACES); - $discounted_price = $base_price - $discount; - $discount_text = number_format($value['baseline_discount'], DECIMAL_PLACES); - } - - $checked = ($group_status == 0) ? null : 'checked="checked"'; - - $content .= '
    ' . - ' ' . - ' ' . - '
    ' . - ' ' . $lC_Currencies->getSymbolLeft() . '' . - ' ' . - '
    ' . - ' ' . $lC_Language->get('text_price') . '-' . $discount_text . '%' . - '
    '; - } - - return $content; - } - /* - * Return the product specials price listing content - * - * @access public - * @return array - */ - public static function getSpecialPricingContent() { - global $lC_Language, $lC_Currencies, $lC_Database, $pInfo; - - $products_id = (isset($pInfo)) ? $pInfo->get('products_id') : null; - - $content = ''; - $groups = lC_Customer_groups_Admin::getAll(); - - $has_options = (isset($pInfo) && (lC_Products_pro_Admin::hasComboOptions($products_id) || lC_Products_pro_Admin::hasSubProducts($products_id))) ? true : false; - - foreach($groups['entries'] as $key => $value) { - - $special_status = 0; - $base = (isset($pInfo)) ? (float)$pInfo->get('products_price') : 0.00; - - if ($products_id != null) { - $Qpricing = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id and group_id = :group_id and special_status != :special_status order by group_id asc'); - $Qpricing->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpricing->bindInt(':products_id', $products_id); - $Qpricing->bindInt(':group_id', $value['customers_group_id']); - $Qpricing->bindInt(':special_status', -1); - $Qpricing->execute(); - - $special_status = ($Qpricing->valueInt('special_status') == 1) ? ' checked' : ''; - $special_price = number_format($Qpricing->valueDecimal('special_price'), DECIMAL_PLACES); - - $start_date_formatted = null; - if ($Qpricing->value('special_start') != null && $Qpricing->value('special_start') != '0000-00-00 00:00:00') { - $start_date_formatted = lC_DateTime::getShort($Qpricing->value('special_start')); - } - $expires_date_formatted = null; - if ($Qpricing->value('special_end') != null && $Qpricing->value('special_end') != '0000-00-00 00:00:00') { - $expires_date_formatted = lC_DateTime::getShort($Qpricing->value('special_end')); - } - - } else { - $special_status = (isset($pInfo) && $pInfo->get('products_special_status') != 0) ? ' checked' : null; - $special_price = (isset($pInfo)) ? number_format($pInfo->get('products_special_price'), DECIMAL_PLACES) : 0.00; - $start_date_formatted = (isset($pInfo) && $pInfo->get('products_special_expires_date') != '0000-00-00 00:00:00') ? lC_DateTime::getShort($pInfo->get('products_special_start_date')) : null; - $expires_date_formatted = (isset($pInfo) && $pInfo->get('products_special_expires_date') != '0000-00-00 00:00:00') ? lC_DateTime::getShort($pInfo->get('products_special_expires_date')) : null; - } - - $discount = (isset($base) && $base > 0.00) ? round( ((($base - $special_price) / $base) * 100), DECIMAL_PLACES) : 0.00; - - $checked = ($special_status == 0) ? null : 'checked="checked"'; - - $content .= '' . - '
    ' . - '
    ' . - ' '; -// if ($has_options === false) { - $content .= '
    ' . - ' ' . $lC_Currencies->getSymbolLeft() . '' . - ' ' . - '
    ' . - ' ' . $lC_Language->get('text_special_price') . '-' . number_format($discount, DECIMAL_PLACES) . '%'; -// } - $content .= '
    ' . - '
    ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - '
    ' . - '
    '; - } - - return $content; - } - /* - * Determine if product has group pricing - * - * @param integer $id The product id - * @access public - * @return boolean - */ - public static function hasGroupPricing($id) { - global $lC_Database; - - $Qgp = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id and group_status = :group_status limit 1'); - $Qgp->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qgp->bindInt(':products_id', $id); - $Qgp->bindInt(':group_status', 1); - $Qgp->execute(); - - $rows = $Qgp->numberOfRows(); - - $Qgp->freeResult(); - - if ( $rows > 0 ) { - return true; - } - - return false; - } - /* - * Determine if product has group pricing - * - * @param integer $id The product id - * @access public - * @return boolean - */ - private static function _updateProductPrice($products_id, $products_price) { - global $lC_Database; - - $Qupdate = $lC_Database->query('update :table_products set products_price = :products_price where products_id = :products_id'); - $Qupdate->bindTable(':table_products', TABLE_PRODUCTS); - $Qupdate->bindInt(':products_id', $products_id); - $Qupdate->bindFloat(':products_price', $products_price); - $Qupdate->execute(); - - if ( $lC_Database->isError() ) { - return false; - } - - return true; - } -} \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/rpc.php b/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/rpc.php deleted file mode 100644 index 590c3c74f..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/products/classes/rpc.php +++ /dev/null @@ -1,33 +0,0 @@ - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/products/modal/batchAccess.php b/catalog/addons/Loaded_7_B2B/admin/applications/products/modal/batchAccess.php deleted file mode 100644 index 9a314faf5..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/products/modal/batchAccess.php +++ /dev/null @@ -1,88 +0,0 @@ -modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); - -global $lC_Language, $lC_Template; -?> - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/applications/products/pages/tabs/relationships_access_levels.inc.php b/catalog/addons/Loaded_7_B2B/admin/applications/products/pages/tabs/relationships_access_levels.inc.php deleted file mode 100644 index 37c5e41c2..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/applications/products/pages/tabs/relationships_access_levels.inc.php +++ /dev/null @@ -1,33 +0,0 @@ -modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); -?> -
    - get('section_access_levels_overrides'); ?> -
    -
    -
    get('subsection_access'); ?>
    -

    -
    -
    -
    - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/classes/access.php b/catalog/addons/Loaded_7_B2B/admin/classes/access.php deleted file mode 100644 index 4fd96283a..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/classes/access.php +++ /dev/null @@ -1,16 +0,0 @@ - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_edit.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_edit.xml deleted file mode 100644 index 65542aed1..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_edit.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - Enable B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - get('text_access_levels_upsell_title'); ?>" upselldesc="get('text_access_levels_upsell_desc'); ?>">]]> - ]]> - - - get('access_levels_registered'); ?>

    get('access_levels_wholesale'); ?>

    get('access_levels_dealer'); ?>

    ]]>     - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); echo '

    ' . lC_Customer_groups_b2b_Admin::getCustomerAccessLevelsHtml('categories') . '

    '; ?>]]>     -     - - ]]> - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php')); echo lC_Categories_pro_Admin::getProductRelatedHtml($_GET['categories']); ?>]]> - -     -     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_main.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_main.xml deleted file mode 100644 index 669030f76..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_main.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Enable B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - get('text_with_selected'); ?>]]> - get('text_edit_access'); ?>]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_new.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_new.xml deleted file mode 100644 index c01a3ec52..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/categories_pages_new.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - Enable B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - get('text_access_levels_upsell_title'); ?>" upselldesc="get('text_access_levels_upsell_desc'); ?>">]]> - ]]> - - - get('access_levels_registered'); ?>

    get('access_levels_wholesale'); ?>

    get('access_levels_dealer'); ?>

    ]]>     - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); echo '

    ' . lC_Customer_groups_b2b_Admin::getCustomerAccessLevelsHtml() . '

    '; ?>]]>     -     -     -     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_classes_rpc.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_classes_rpc.xml deleted file mode 100644 index ebdf2f65f..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_classes_rpc.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php'));]]> - - - - - - - - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_modal_edit.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_modal_edit.xml deleted file mode 100644 index 3a83ba41d..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/customer_groups_modal_edit.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - Enable B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - ]]> - ]]> - - - - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/orders_classes_orders.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/orders_classes_orders.xml deleted file mode 100644 index e5382f113..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/orders_classes_orders.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - Admin Orders Mods - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - - - - - - - - - query("SELECT count(o.orders_id) as total - from "); - //Purchase Orders Service Module(PO) START - if (utility::isB2B()) { - $QresultFilterTotal->appendQuery(' :table_purchase_orders_service pos, '); - $QresultFilterTotal->bindTable(':table_purchase_orders_service',DB_TABLE_PREFIX.'purchase_orders_service'); - } - //Purchase Orders Service Module(PO) END - - $QresultFilterTotal->appendQuery(" :table_orders o LEFT JOIN :table_orders_total ot - on (o.orders_id = ot.orders_id and ot.class = 'total') - LEFT JOIN :table_orders_status s - on (s.orders_status_id = o.orders_status and s.language_id = :language_id) " . - $sWhere ." group by o.orders_id "); - /* - ]]> - - - - - - - - - query("SELECT o.orders_id, o.customers_id, o.customers_ip_address, o.customers_name, o.payment_method, o.date_purchased, o.last_modified, o.customers_country_iso3, greatest(date_purchased, coalesce(last_modified, date_purchased)) as date_sort, o.currency, o.currency_value, ot.value as order_total, s.orders_status_name, s.orders_status_type from "); - - //Purchase Orders Service Module(PO) START - if (utility::isB2B()) { - $Qresult->appendQuery(' :table_purchase_orders_service pos, '); - $Qresult->bindTable(':table_purchase_orders_service',DB_TABLE_PREFIX.'purchase_orders_service'); - } - //Purchase Orders Service Module(PO) END - - $Qresult->appendQuery(" :table_orders o - LEFT JOIN :table_orders_total ot - on (o.orders_id = ot.orders_id and ot.class = 'total') - LEFT JOIN :table_orders_status s - on (s.orders_status_id = o.orders_status and s.language_id = :language_id) " . - $sWhere . " group by o.orders_id " . $sOrder . $sLimit); - /* - ]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_edit.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_edit.xml deleted file mode 100644 index d3ae7fd84..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_edit.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - Admin Orders Mods - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - ]]> - modCheck(DIR_FS_CATALOG . 'addons/Purchase_Orders_Service/classes/order.php')); - $po_number = lC_Order_b2b::retrievePONumber($_GET['orders']); - if($po_number != '') { - ?> -
      get('text_po_number_title'); ?> : 
    - - ]]>     -     -     -     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_invoice.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_invoice.xml deleted file mode 100644 index 55c859139..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/orders_pages_invoice.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - Admin Orders Mods - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - modCheck('../addons/purchase_orders_service/classes/order.php')); - } - ]]> - - - getCustomer('email_address') . '">' . $lC_Order->getCustomer('email_address') . ''; ?> - ]]> - - - -   - - - get('text_po_number_title'); ?> :  - - - - ]]> - - - - - - modCheck(DIR_FS_CATALOG . 'addons/Purchase_Orders_Service/classes/order.php')); - } - ]]> - - - getCustomer('email_address') . '">' . $lC_Order->getCustomer('email_address') . ''; ?> - ]]> - - - -   - - - get('text_po_number_title'); ?> :  - - - - ]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_main.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_main.xml deleted file mode 100644 index 1a7dabf9f..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_main.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Enable B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - get('text_with_selected'); ?>]]> - get('text_edit_access'); ?>]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_pricing.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_pricing.xml deleted file mode 100644 index 342ae6202..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_pricing.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - Enable B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_relationships.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_relationships.xml deleted file mode 100644 index b8527156b..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/products_pages_tabs_relationships.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Enable B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/hooks/templates_default_header.xml b/catalog/addons/Loaded_7_B2B/admin/hooks/templates_default_header.xml deleted file mode 100644 index 81af6fda8..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/hooks/templates_default_header.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - After Logo Image, add Pro Indicator - 1.0.0 - 2.3.2 - loadedcommerce.com - - - ]]> - B2B' : null; ?>]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php deleted file mode 100644 index 4f18e445a..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/languages/en_US/b2b_settings.php +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: b2b_settings.php v1.0 2011-11-04 datazen $ -# -# LoadedCommerce, Innovative eCommerce Solutions -# http://www.loadedcommerce.com -# -# Copyright (c) 2014 LoadedCommerce.com -# -# @author LoadedCommerce Team -# @copyright (c) 2014 LoadedCommerce Team -# @license http://loadedcommerce.com/license.html - -heading_title = B2B Settings - -access_b2b_settings_title = B2B Settings - -heading_customers = Customers -heading_products = Products -heading_guest_access = Guest Access -heading_access_group_levels = Access Group Levels -heading_msrp_pricing = MSRP Pricing - -table_heading_id = ID -table_heading_group = Access Level -table_heading_members = Members -table_heading_status = Status -table_heading_action = Action - -label_allow_self_registrations = Allow Self Registrations -label_guest_catalog_access = Guest Catalog Access -label_guest = Guest -label_status = Status -label_active = Active -label_registered = Registered -label_new_access_level = New Access Level -label_show_guest_only_msrp = Show Guest Only MSRP -label_show_retail_only_msrp = Show Retail Only MSRP - -button_create_new = Create New - -modal_heading_delete_customer_access_level = Delete Customer Access Level -modal_heading_edit_customer_access_level = Edit Customer Access Level - -introduction_edit_customer_access_level = Please make the necessary changes for this customer access level. -introduction_delete_customer_access_level = Please verify the removal of this customer access level. -delete_error_customer_access_level_prohibited = Error: The system customer access levels cannot be removed. -delete_error_customer_access_level_in_use = Error: This customer access level is currently assigned to -delete_error_customer_access_level_in_use_end = customers and cannot be removed. - -info_bubble_displays_create_account_form = Displays Create Account Form -info_bubble_guest_catalog_access = Control Guest Access to the Catalog -info_hides_purchase_prices = Hides Purchase Prices - -text_add_to_cart = Add to Cart -text_members = Members -text_none = None -text_see_pricing = See Pricing -text_view_catalog = View Catalog -text_enable_level = Enable Level -text_disable_level = Disable Level diff --git a/catalog/addons/Loaded_7_B2B/admin/languages/en_US/modules/access/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/languages/en_US/modules/access/b2b_settings.php deleted file mode 100644 index fe908d5af..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/languages/en_US/modules/access/b2b_settings.php +++ /dev/null @@ -1,12 +0,0 @@ -# $Id: b2b_settings.php v1.0 2013-01-01 datazen $ -# -# LoadedCommerce, Innovative eCommerce Solutions -# http://www.loadedcommerce.com -# -# Copyright (c) 2014 Loaded Commerce, LLC -# -# @author LoadedCommerce Team -# @copyright (c) 2014 LoadedCommerce Team -# @license http://loadedcommerce.com/license.html - -access_b2b_settings_title = B2B Settings \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/admin/modules/access/b2b_settings.php b/catalog/addons/Loaded_7_B2B/admin/modules/access/b2b_settings.php deleted file mode 100644 index 28d15d098..000000000 --- a/catalog/addons/Loaded_7_B2B/admin/modules/access/b2b_settings.php +++ /dev/null @@ -1,23 +0,0 @@ -_title = $lC_Language->get('access_b2b_settings_title'); - } -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/classes/order.php b/catalog/addons/Loaded_7_B2B/classes/order.php deleted file mode 100644 index 034533322..000000000 --- a/catalog/addons/Loaded_7_B2B/classes/order.php +++ /dev/null @@ -1,75 +0,0 @@ -modCheck(DIR_FS_CATALOG . 'includes/classes/order.php')); - -class lC_Order_b2b { - /* - * Insert the purchase order number - * - * @access public - * @return array - */ - public static function insertPONumber($id = null, $po_number = null) { - global $lC_Database; - - if ($id == null && $po_number == null) return false; - - $Qponumber = $lC_Database->query('insert into :table_po_number (po_number,orders_id) values (:po_number,:orders_id)'); - $Qponumber->bindTable(':table_po_number', DB_TABLE_PREFIX . "purchase_orders_service"); - $Qponumber->bindValue(':po_number', $po_number); - $Qponumber->bindInt(':orders_id', $id); - $Qponumber->execute(); - - return true; - } - /* - * Get the purchase order number email string - * - * @access public - * @return string - */ - public static function getPONumber($id) { - global $lC_Language; - - $email_order = $lC_Language->get('text_po_number_title') . "\n" . - $lC_Language->get('email_order_separator') . "\n"; - $email_order .= self::retrievePONumber($id) . "\n\n"; - - return $email_order; - } - /* - * Get the purchase order number - * - * @access public - * @return string - */ - public static function retrievePONumber($id = 0) { - global $lC_Database, $lC_Customer, $lC_Language; - - if( $id > 0) { - $Qretorders = $lC_Database->query('select po_number_id, po_number from :table_po_number where orders_id = :orders_id '); - $Qretorders->bindTable(':table_po_number', DB_TABLE_PREFIX . "purchase_orders_service"); - $Qretorders->bindInt(':orders_id', $id); - $Qretorders->execute(); - - $id = $Qretorders->value('po_number'); - - $Qretorders->freeResult(); - - return $id; - } - - return false; - - } -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/classes/product.php b/catalog/addons/Loaded_7_B2B/classes/product.php deleted file mode 100644 index 56a8f6938..000000000 --- a/catalog/addons/Loaded_7_B2B/classes/product.php +++ /dev/null @@ -1,182 +0,0 @@ -modCheck(DIR_FS_CATALOG . 'includes/classes/product.php')); - -class lC_Product_b2b extends lC_Product { - /* - * Check to see if product has restricted accesa - * - * @access public - * @return array - */ - public static function hasProductAccess($products_id, $customers_group_id) { - global $lC_Database, $lC_Customer; - - $valid = false; - - if ($lC_Customer->isLoggedOn() === false) $customers_group_id = 0; - - if ($customers_group_id > 0) { // not guest - - // get the access levels for the group - $Qcg = $lC_Database->query('select customers_access_levels from :table_customers_groups_data where customers_group_id = :customers_group_id limit 1'); - $Qcg->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); - $Qcg->bindInt(':customers_group_id', $customers_group_id); - $Qcg->execute(); - - $cg_access_levels = explode(';', $Qcg->value('customers_access_levels')); - - $Qcg->freeResult(); - - // get the product access levels - $Qproduct = $lC_Database->query('select access_levels from :table_products where products_id = :products_id limit 1'); - $Qproduct->bindTable(':table_products', TABLE_PRODUCTS); - $Qproduct->bindInt(':products_id', $products_id); - $Qproduct->execute(); - - $product_access_levels = explode(';', $Qproduct->value('access_levels')); - - $Qproduct->freeResult(); - - // check if product has access - $valid = false; - if ($Qproduct->value('access_levels') == '') { // if nothing set, valid = true - $valid = true; - } else { - foreach ($product_access_levels as $id) { - if ($id != '') { - if (in_array($id, $cg_access_levels)) { - $valid = true; - break; - } - } - } - } - } else { - $guestAccess = (defined('B2B_SETTINGS_GUEST_CATALOG_ACCESS') && B2B_SETTINGS_GUEST_CATALOG_ACCESS > 0) ? (int)B2B_SETTINGS_GUEST_CATALOG_ACCESS : 0; - - if ($guestAccess > 0) { - // get the access levels - $Qproduct = $lC_Database->query('select access_levels from :table_products where products_id = :products_id limit 1'); - $Qproduct->bindTable(':table_products', TABLE_PRODUCTS); - $Qproduct->bindInt(':products_id', $products_id); - $Qproduct->execute(); - - $product_access_levels = explode(';', $Qproduct->value('access_levels')); - - $Qproduct->freeResult(); - - if ($Qproduct->value('access_levels') == '') { // if nothing set, valid = true - $valid = true; - } else if (in_array('1', $product_access_levels)) { // has guest access at the category level - $valid = true; - } - - } - } - - return $valid; - } - /* - * Check to see if category has restricted accesa - * - * @access public - * @return array - */ - public static function hasCategoryAccess($categories_id, $customers_group_id) { - global $lC_Database, $lC_Customer; - - $valid = false; - - if ($lC_Customer->isLoggedOn() === false) $customers_group_id = 0; - - if ($customers_group_id > 0) { // not guest - - // get the access levels for the group - $Qcg = $lC_Database->query('select customers_access_levels from :table_customers_groups_data where customers_group_id = :customers_group_id limit 1'); - $Qcg->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); - $Qcg->bindInt(':customers_group_id', $customers_group_id); - $Qcg->execute(); - - $cg_access_levels = explode(';', $Qcg->value('customers_access_levels')); - - $Qcg->freeResult(); - - // get the category access levels - $Qcat = $lC_Database->query('select access_levels from :table_categories where categories_id = :categories_id limit 1'); - $Qcat->bindTable(':table_categories', TABLE_CATEGORIES); - $Qcat->bindInt(':categories_id', $categories_id); - $Qcat->execute(); - - $category_access_levels = explode(';', $Qcat->value('access_levels')); - - $Qcat->freeResult(); - - // check if product has access - if ($Qcat->value('access_levels') == '') { // if nothing set, valid = true - $valid = true; - } else { - foreach ($category_access_levels as $id) { - if ($id != '') { - if (in_array($id, $cg_access_levels)) { - $valid = true; - break; - } - } - } - } - - } else { - $guestAccess = (defined('B2B_SETTINGS_GUEST_CATALOG_ACCESS') && B2B_SETTINGS_GUEST_CATALOG_ACCESS > 0) ? (int)B2B_SETTINGS_GUEST_CATALOG_ACCESS : 0; - - if ($guestAccess > 0) { - // get the category access levels - $Qcat = $lC_Database->query('select access_levels from :table_categories where categories_id = :categories_id limit 1'); - $Qcat->bindTable(':table_categories', TABLE_CATEGORIES); - $Qcat->bindInt(':categories_id', $categories_id); - $Qcat->execute(); - - $category_access_levels = explode(';', $Qcat->value('access_levels')); - - $Qcat->freeResult(); - - if ($Qcat->value('access_levels') == '') { // if nothing set, valid = true - $valid = true; - } else if (in_array('1', $category_access_levels)) { // has guest access at the category level - $valid = true; - } - - } - } - - return $valid; - } - - public static function restrictCategories($customers_group_id, $data) { -echo "
    ";
-print_r($data);
-echo "
    "; -die('55'); - - foreach ($data[0] as $key => $top) { - foreach ($data[$key] as $ckey => $child) { -// if ($child['item_id'] != NULL && self::hasCategoryAccess($child['item_id'], $customers_group_id) === false) unset($data[$key][$ckey]); - } - - if ($top['item_id'] != NULL && self::hasCategoryAccess($top['item_id'], $customers_group_id) === false) unset($data[0][$key]); - } - - return $data; - } - -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/controller.php b/catalog/addons/Loaded_7_B2B/controller.php deleted file mode 100644 index 6e1c166f8..000000000 --- a/catalog/addons/Loaded_7_B2B/controller.php +++ /dev/null @@ -1,156 +0,0 @@ -modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/controller.php')); -if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/product.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/product.php')); -if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/customer_groups/classes/customer_groups.php')); -if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php')); - -class Loaded_7_B2B extends Loaded_7_Pro { - /* - * Class constructor - */ - public function Loaded_7_B2B() { - global $lC_Language, $lC_Database; - /** - * The addon type (category) - * valid types; payment, shipping, themes, checkout, catalog, admin, reports, connectors, other - */ - $this->_type = 'systems'; - /** - * The addon class name - */ - $this->_code = 'Loaded_7_B2B'; - /** - * The addon title used in the addons store listing - */ - $this->_title = $lC_Language->get('addon_system_b2b_title'); - /** - * The addon description used in the addons store listing - */ - $this->_description = $lC_Language->get('addon_system_b2b_description'); - /** - * The developers name - */ - $this->_author = 'Loaded Commerce, LLC'; - /** - * The developers web address - */ - $this->_authorWWW = 'http://www.loadedcommerce.com'; - /** - * The addon version - */ - $this->_version = '1.0.0'; - /** - * The Loaded 7 core compatibility version - */ - $this->_compatibility = '7.002.2.0'; // the addon is compatible with this core version and later - /** - * The base64 encoded addon image used in the addons store listing - */ - $this->_thumbnail = lc_image(DIR_WS_CATALOG . 'addons/' . $this->_code . '/images/loaded7-b2b.png', $this->_title); - /** - * The addon enable/disable switch - */ - $this->_enabled = $this->_checkAndActivate(); - if ($this->_enabled && !defined('ADDONS_SYSTEM_LOADED_7_B2B_STATUS')) $this->install(); - /** - * Automatically install the module - */ - // $this->_auto_install = true; - } - /** - * Checks to see if the addon has been installed - * - * @access public - * @return boolean - */ - public function isInstalled() { - return (bool)defined('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); - } - /** - * Install the addon - * - * @access public - * @return void - */ - public function install() { - global $lC_Database; - - $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Enable AddOn', 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS', '1', 'Do you want to enable this addon?', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())"); - - $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'B2B_SETTINGS_ALLOW_SELF_REGISTER'"); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_ALLOW_SELF_REGISTER', '1', '', '6', '0', '', '', now())"); - - $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'B2B_SETTINGS_GUEST_CATALOG_ACCESS'"); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'B2B_SETTINGS_GUEST_CATALOG_ACCESS', '4', '', '6', '0', '', '', now())"); - - // po number addition - $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . DB_TABLE_PREFIX . "Purchase_Orders_Service` (`po_number_id` int(11) NOT NULL AUTO_INCREMENT, `po_number` varchar(255) NOT NULL, `orders_id` int(11) NOT NULL, `po_number_status` int(1) NOT NULL DEFAULT '1', PRIMARY KEY (`po_number_id`)) "); - } - /** - * Return the configuration parameter keys an an array - * - * @access public - * @return array - */ - public function getKeys() { - if (!isset($this->_keys)) { - $this->_keys = array('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); - } - - return $this->_keys; - } - /** - * Check if the config key is already in the database - * - * @access protected - * @return boolean - */ - private function _isConfigInstalled($key) { - global $lC_Database; - - $Qcfg = $lC_Database->query('select configuration_id from :table_configuration where configuration_key = :configuration_key'); - $Qcfg->bindTable(':table_configuration', TABLE_CONFIGURATION); - $Qcfg->bindValue(':configuration_key', $key); - $Qcfg->execute(); - - $status = ($Qcfg->numberOfRows() > 0) ? true : false; - - $Qcfg->freeResult(); - - return $status; - } - /** - * Check if the Pro addon is active - * - * @access public - * @return array - */ - protected function _checkAndActivate() { - - $isPro = utility::isPro(); - $isB2B = utility::isB2B(); - - $enabled = false; - if ($isPro) { - $enabled = true; - if ($isB2B) { - } else { - $this->install(); - } - } - - return $enabled; - } -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/account.xml b/catalog/addons/Loaded_7_B2B/hooks/account.xml deleted file mode 100644 index 9eb21f8c8..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/account.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - load('account');]]> - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/application_bottom.xml b/catalog/addons/Loaded_7_B2B/hooks/application_bottom.xml deleted file mode 100644 index d413779e2..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/application_bottom.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - stopServices();]]> - isLoggedOn() === false && $page != 'login') { if (defined('B2B_SETTINGS_ALLOW_SELF_REGISTER') && B2B_SETTINGS_ALLOW_SELF_REGISTER == 1 && $page != 'create') { $lC_NavigationHistory->setSnapshot(); lc_redirect(lc_href_link(FILENAME_ACCOUNT, 'login', 'SSL')); }}} if (file_exists('addons/Loaded_7_B2B/javascript/general.js.php')) { include_once('addons/Loaded_7_B2B/javascript/general.js.php'); }}]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml b/catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml deleted file mode 100644 index fd44d4450..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/includes_classes_order.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/order.php')); lC_Order_b2b::insertPONumber($order_id, $_POST['po_number']);}]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml b/catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml deleted file mode 100644 index cfe156afb..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/includes_content_checkout_process.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - After VQMOD-001 - 1.0.0 - 2.3.2 - loadedcommerce.com - - - process(); - ]]> - - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/order.php')); - } - //Purchase Orders Service Module(PO) END - ]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/includes_content_index.xml b/catalog/addons/Loaded_7_B2B/hooks/includes_content_index.xml deleted file mode 100644 index d72bae846..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/includes_content_index.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - _page_contents = 'category_listing.php';]]> - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/product.php')); if (!lC_Product_b2b::hasCategoryAccess($current_category_id, $lC_Customer->getCustomerGroup($id))) { $this->_page_contents = 'category_not_found.php'; }]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_actions_cart_add.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_actions_cart_add.xml deleted file mode 100644 index e813fe089..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/modules_actions_cart_add.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/product.php')); if (!lC_Product_b2b::hasProductAccess($id, $lC_Customer->getCustomerGroup($id))) { $lC_ShoppingCart->reset(); lc_redirect(lc_href_link(FILENAME_INFO, 'permissions')); }]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_featured_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_featured_products.xml deleted file mode 100644 index 79295187c..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_featured_products.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - valueInt('products_id'));]]> - valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) $this->_content = ''; return true;]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_specials.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_specials.xml deleted file mode 100644 index da9914e2e..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_specials.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - toArray();]]> - valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) $this->_content = ''; return true;]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_whats_new.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_whats_new.xml deleted file mode 100644 index 7dfe38fa2..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/modules_boxes_whats_new.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - valueInt('products_id'));]]> - valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) $this->_content = ''; return true;]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_content_also_purchased_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_content_also_purchased_products.xml deleted file mode 100644 index 985bc601e..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/modules_content_also_purchased_products.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - _content .= '
    ' . "\n";]]> - getID(), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) continue;]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_content_featured_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_content_featured_products.xml deleted file mode 100644 index 9b06d371e..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/modules_content_featured_products.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - valueInt('products_id'));]]> - valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) continue;]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_content_new_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_content_new_products.xml deleted file mode 100644 index 5ce2c9b3d..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/modules_content_new_products.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - valueInt('products_id'));]]> - valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) continue;]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_recently_visited_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_recently_visited_products.xml deleted file mode 100644 index f1f289268..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/modules_recently_visited_products.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - getCustomerGroup($lC_Customer->getID()))) continue;]]> - - - - getCustomerGroup($lC_Customer->getID()))) continue;]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/modules_upcoming_products.xml b/catalog/addons/Loaded_7_B2B/hooks/modules_upcoming_products.xml deleted file mode 100644 index c81c8e104..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/modules_upcoming_products.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hook in B2B Features - 1.0.0 - 2.3.2 - loadedcommerce.com - - - valueInt('products_id'));]]> - valueInt('products_id'), $lC_Customer->getCustomerGroup($lC_Customer->getID()))) continue;]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/template_content_account_receipt.xml b/catalog/addons/Loaded_7_B2B/hooks/template_content_account_receipt.xml deleted file mode 100644 index e991b65b5..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/template_content_account_receipt.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - After VQMOD-001 - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - modCheck('addons/purchase_orders_service/classes/order.php')); - } - //Purchase Orders Service Module(PO) End - ]]> - - - - - get('receipt_payment_method_title'); ?> info['payment_method']; ?>
    - ]]>     - -
    get('text_po_number_title'); ?> - -
    - - - ]]>     -     -     -     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/templates_content_account_account_history.xml b/catalog/addons/Loaded_7_B2B/hooks/templates_content_account_account_history.xml deleted file mode 100644 index f804330fa..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/templates_content_account_account_history.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - After VQMOD-001 - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - ]]> - modCheck('addons/purchase_orders_service/classes/order.php')); - } - //Purchase Orders Service Module(PO) End - ?> - ]]> - - - - - get('text_total'); ?> - ]]> - - get('text_po_number_heading'); ?> - - ]]> - - - - - value('order_total')); ?> - ]]> - - - - valueInt('orders_id')); ?> - - - ]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_confirmation.xml b/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_confirmation.xml deleted file mode 100644 index b5edf0a51..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_confirmation.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - After VQMOD-001 - 1.0.0 - 2.3.2 - loadedcommerce.com - - - isLoggedOn() !== false) { - ]]> - -
    -

    get('text_po_numbers_service_heading'); ?>

    -

    get('text_po_numbers_service_instructions'); ?>

    - -
    - -
    -
    -     -     -     -     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml b/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml deleted file mode 100644 index a29401ebb..000000000 --- a/catalog/addons/Loaded_7_B2B/hooks/templates_content_checkout_checkout_success.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - After VQMOD-001 - 1.0.0 - 2.3.2 - loadedcommerce.com - - - getID()); - ]]> - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/classes/order.php')); - } - //Purchase Orders Service Module(PO) End - ]]> - - - - -

    - ]]>     - -
    -

    get('text_po_number_title'); ?>

    -

    -
    - - ]]>     -     -     -     \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/images/loaded7_b2b.png b/catalog/addons/Loaded_7_B2B/images/loaded7_b2b.png deleted file mode 100644 index ff32445bac3c8609ae0eb6d58958b1ca8e32e297..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3220 zcmaJ^c|4SB8=fKCG?FFTA!8~_*~V@%24iO|Gb4K$Gh>WpX3UH|%MnLIva}r(iaLdZ z6Ov>tOCqIX%My_#vPFgPjZSsGKfb>A_rCA5{I2V|@B6v0e;&4@y`>;X8Uz3U1g)*i zFr3km^BMBJ~!qR+MVR!}!U_zw%kRaAUcrpn?!V@EcpO6dz0B$G+ z=gM+L+rbI6AT|6hMlC#u&S7)Jkl}PZA%Mh!_>jmHDgwG#+W>`7hzO{Q4q5|EN0Iy} zR*?)6HqstPhzuYY5TQsTh+#OKBM?Ml;UVEcfm9|u90C2R3+K#tx7DGLuMk!M0{Tx< zu4qRHipC&8bkwv|2^ugML|0c0rmdr^3sZq;YQQwrH8`)XDoh)$qYKy6gM53SoM;T9 zFC1fL@hui-g@F38Sai6$dRSPPT9}p^jX_q285kJsYG`VzauBM_2r3I7u1aMd`mSI` zViFh>I*UT1LUtALKC}=P0?NtspAv%TKV+%QZ^y(rF!gXeT^**Tv0Ku2AR7Jup+P}E z&`cJF^l!fZQ<#a1pp(=wBql9{LEtpb_t0)AIvm9y;aM~Wjz$aoeu|EMG!~8NN25bf zSY3#c3x!Igg)x=C;?ZchHI>Q2Qwbz%GX#{Qphlq(;X3B#<}h7-4Va0x84PBwWuRlB zfzsF4(9}ZdqO`S9-??TqLP!va%KFYF{>z2^l)Gz%AUY?q8Hqs&B@rzcv>?dWlHrt} z=Avi*Q@w9o;!ktYv-l}jos*3EZe#ze(ciZ??%AFGuq|it!}ugB$L$P`tyhA3-2eaq zerq!mT==Vb&j6;3<$*c`qPFMV)?LDr^C}H-kAn@&o%9v-fuIhYsndGnMD;TJD9ET; zqPduhef=zV0uUR`#2)1$dw@8?SkdkRhp>50A+)Xg%f!kh0-mDU?MMo9II0#(}lsVhMRFomtE2AsQN z*!Yb$f3oV*{&0X$6-g((#In%bWEH%sJP-UL zXJ0hP)lrsM&G)=77nplD?a0|Eg14vHt2R}YdZ{=FVyWGj+*B@*!KR;QhqXJ`U%`2# z)m{dVs%5Am54ZHs=nl(Khx1A%GS|f8)0~vv67%x9ql?GV0orUksANPIt_?esE`YU7 z-WM3>Er-rf?ILIz3aE;@1aXV8u0fjJ-U2=AyRSvuV8pU->syAtHyXTjoallK`2^gf zL(j!6QoJ)>`*!l%SDK0;Op!vKa^c;nsP|YWGqDV+8SLb%uCNOTQsg`(a$0l_9H2`vbY{tbpZwm+r9Ey?Q zm$@|6uCgVu^(A#)X2aN9wm|4mqQRQGpG~!BNadM7ErESJnsw7k57w|Z-VU`F+GC=- zGo>Hik4DP2S*6w4n7npNrfw(9KT7k`IC98c(sC0byf1Z{kGtFH%W^kh5=oC$zLbL4 zF!mj@->2z2?eN%GcB0fr6ZL!4;XvxvHXttc#YoykiO_1vc00L|0`G-1x)EFQVyNz7 zcV}yy;FHN;h*P5yT?B7jw{nj|tj9pb^53DLr5KUW@drGLQ&wcHSnf}w#zn7D!Ai*% zMY%BGF($H9h&Qh-DmLLX&!F3QmD_!5fu5@;{_v!OytlDenjVm!zqKght0S`+i1ST+ z0ffNFkdd`M?xK=Urg1D4|FrNlEny9`WUj$Z^dNAiSU|ymfryN z-n*BrptWO0Iw>L*3jgg2yd>vbNaTS^9j=y^f`>};{^jzW@NjD>zM(%)OJKISV#?Ng zcyhDoW62eb$736HeYIL2Rr8$bc50^_C~JDUW)k)c6=0vT;4HN^t0NN|3gGuRW~MmymwqqMRC5OISI+C)N_w+= zD%0&6D{iO_Xe|6GMQjy0akTOoiIwIe=DRGKOdfBrNueP9KP2U+<QVZHw?TDj#I9`D_!>tHKw61O}nZ zkqhQ%m_q?IH@FP@ z)Dau99pkrq9V+1H7mv%7@uI2$fg>}wZ1$F$zErX)zGDO}U#DWc+IS30TOVwR%odyy zrm$OMk0jd94xcwEu^ks@>W5ss_oU-+{U_ZPD2?WEy2JlN%L`sV;* zxwQ2ZvT^g(O&KXXrG4yLq`51mRxCv^1|>Y;f_E>t+{mYvie*iQdB3~HdI_MUI;R_j zO11436XPxJh0DY^mAEuJM@rmz*bSb9!qWUk(FJm#+h1zADsXuI`QtSi6u^noqn(@H ze+=~s=(jX15jvVq+nSe^gTQQsla?J`%#9)z^PWa-xNc5xg<*!cGLg4uw4@6pdS*hs zS7mWb@VMo3FFf)bYfguVoh9!#5F8wtYg{+^82P5A!%g*QWBlZU;ON8k4xjR_f0rdUgd%F z0lRnJDJ%#vzEQqMNxCF4%hqX+-MW0-Lc;s|@oyNHny>GrhR9od5}q8BEu2_X&RxG^ zck;5&(O?D7w{e6XeLSx^JGfatGg&)-DE9(&s3fM{^=7+%`|MkLm9Fhu8i8PmB$+b` zb{Y7m`H#kJZx;>HgcSEyAC|7cmVrL7c4}1kJKakwy(!^uesN6rDBbOMH7MSx8ld$d zRk@I;zY=n{j@;AbAtEGsaO-YKla?!Uzl*|On(i5^MxKIVPBFi(W~5-i#JiqmAQbxJ zl(-|k^o&{EMdYS5B{%RwkVf>pNMrbmzdC)d+E>ZNHxwr4G=*gAxjJbR8=OvPxv#qD z+!^p(%1p|`xy3>(9%MJKowQXRw7xttsTvvx4z$;fNQD-X_eHiP7R+82^~h4yb-j6f z)VXvTxcD)_gWIQHUTCl09m8c08*#5C5%K+8hLzfp&_NIp}$l|=9=fmiF&suK;J47^ zbPJf8?GbX+p>q;_#a@d%3-XE1A - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_B2B/languages/en_US.xml b/catalog/addons/Loaded_7_B2B/languages/en_US.xml deleted file mode 100644 index 0498bebab..000000000 --- a/catalog/addons/Loaded_7_B2B/languages/en_US.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - addon_system_b2b_title - - checkout - - - addon_system_b2b_description - - checkout - - - text_po_numbers_service_heading - - general - - - text_po_number_heading - - general - - - text_po_number_title - - general - - - text_po_numbers_service_instructions - - general - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php b/catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php deleted file mode 100644 index eef60e63a..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php +++ /dev/null @@ -1,124 +0,0 @@ -modCheck(DIR_FS_ADMIN . 'includes/applications/categories/classes/categories.php')); -include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/classes/category_tree.php')); - -class lC_Categories_pro_Admin extends lC_Categories_Admin { - /* - * Save the category record - * - * @param integer $id The category id on update, null on insert - * @param array $data The category information - * @access public - * @return boolean - */ - public static function save($id = null, $data) { - global $lC_Database, $lC_Language; - - $category_id = parent::save($id, $data); - - return $category_id; - } - /* - * Get related products/categories html - * - * @access public - * @return string - */ - public static function getProductRelatedHtml($cid = '') { - global $lC_Language; - - $lC_Language->loadIniFile('categories.php'); - - $pData = self::_getProductsRelated($cid); - - $html = '' . - '
    ' . - ' ' . $lC_Language->get('field_products_related') . '' . - '
    ' . - '
    ' . - '
    ' . - '
    ' . number_format($pData['products_in_category'], 0) . '
    ' . - '
    ' . $lC_Language->get('field_products_in_category') . '
    ' . - '
    ' . - '
    ' . - '
    ' . number_format($pData['number_of_sub_categories'], 0) . '
    ' . - '
    ' . $lC_Language->get('field_sub_categories') . '
    ' . - '
    ' . - '
    ' . - '
    ' . number_format($pData['products_in_sub_categories'], 0) . '
    ' . - '
    ' . $lC_Language->get('field_products_in_sub_categories') . '
    ' . - '
    ' . - '
    ' . - '
    ' . number_format($pData['total_products'], 0) . '
    ' . - '
    ' . $lC_Language->get('field_total_products') . '
    ' . - '
    ' . - '
    ' . - '
    ' . - '
    '; - - return $html; - } - - protected static function _getProductsRelated($cid) { - global $lC_Database, $lC_CategoryTree; - - $total = 0; - $pData = array(); - if (!is_numeric($cid)) return false; - - // get number of products in this category - $Qp2c = $lC_Database->query('select count(*) as total from :table_products_to_categories where `categories_id` = :categories_id'); - $Qp2c->bindTable(':table_products_to_categories', TABLE_PRODUCTS_TO_CATEGORIES); - $Qp2c->bindInt(':categories_id', $cid); - $Qp2c->execute(); - - $pData['products_in_category'] = $Qp2c->valueInt('total'); - $total = (int)$total + $Qp2c->valueInt('total'); - - // get the number of sub categories under this category - $lC_CategoryTree = new lC_CategoryTree_Admin(); - $catArr = $lC_CategoryTree->getArray($cid); - $pData['number_of_sub_categories'] = count($catArr); - - $pCnt = 0; - foreach ($catArr as $value) { - $catID = end(explode('_', $value['id'])); - $pCnt = (int)$pCnt + self::_numberofProducts($catID); - } - $pData['products_in_sub_categories'] = $pCnt; - $total = (int)$total + $pCnt; - - $pData['total_products'] = $total; - - return $pData; - } - - protected static function _numberofProducts($cid) { - global $lC_Database; - - // get number of products in this category - $Qp2c = $lC_Database->query('select count(*) as total from :table_products_to_categories where `categories_id` = :categories_id'); - $Qp2c->bindTable(':table_products_to_categories', TABLE_PRODUCTS_TO_CATEGORIES); - $Qp2c->bindInt(':categories_id', $cid); - $Qp2c->execute(); - - $total = $Qp2c->valueInt('total'); - - $Qp2c->freeResult(); - - return (int)$total; - } -} \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php deleted file mode 100644 index 7e8bf8374..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/product_classes.php +++ /dev/null @@ -1,219 +0,0 @@ -query('select * from :table_product_classes where language_id = :language_id order by name'); - $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); - $Qclasses->bindInt(':language_id', $lC_Language->getID()); - $Qclasses->execute(); - - $result = array('aaData' => array()); - while ( $Qclasses->next() ) { - $name = $Qclasses->value('name'); - if ( $Qclasses->valueInt('id') == DEFAULT_PRODUCT_CLASSES_ID ) { - $name .= '' . $lC_Language->get('default_entry') . ''; - } - - $title = '' . $name . ''; - $comment = '' . $Qclasses->value('comment') . ''; - $usage = ' '; - $action = ' - ' . (($media === 'mobile-portrait' || $media === 'mobile-landscape') ? NULL : $lC_Language->get('icon_edit')) . ' - - '; - - $result['aaData'][] = array("$title", "$comment", "$usage", "$action"); - $result['entries'][] = $Qclasses->toArray(); - } - - $Qclasses->freeResult(); - - return $result; - } - /* - * Return the data used on the dialog forms - * - * @param integer $id The customer groups id - * @param boolean $edit True = called from edit dialog else called from delete dialog - * @access public - * @return array - */ - public static function getFormData($id = null, $edit = false) { - global $lC_Database, $lC_Language; - - $result = array(); - if (isset($id) && $id != null) { - if ($edit === true) { - $Qclasses = $lC_Database->query('select language_id, name, comment from :table_product_classes where id = :id'); - $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); - $Qclasses->bindInt(':id', $id); - $Qclasses->execute(); - - $status_name = array(); - $result['editComment'] = ''; - while ( $Qclasses->next() ) { - $status_name[$Qclasses->valueInt('language_id')] = $Qclasses->value('name'); - $result['editComment'] = $Qclasses->value('comment'); - } - $result['editNames'] = ''; - foreach ( $lC_Language->getAll() as $l ) { - $result['editNames'] .= '' . lc_draw_input_field('name[' . $l['id'] . ']', (isset($status_name[$l['id']]) ? $status_name[$l['id']] : null), 'class="input-unstyled"') . '
    '; - } - } else { - $Qclasses = $lC_Database->query('select count(*) as total from :table_products where product_class_id = :product_class_id'); - $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); - $Qclasses->bindInt(':product_class_id', $id); - $Qclasses->execute(); - - if ( $Qclasses->valueInt('total') > 0 ) { - $result['totalProducts'] = $Qclasses->valueInt('total'); - $result['rpcStatus'] = -2; - } - } - } else { - $result['names'] = ''; - foreach ( $lC_Language->getAll() as $l ) { - $result['names'] .= '' . lc_draw_input_field('name[' . $l['id'] . ']', null, 'class="input-unstyled"') . '
    '; - } - } - - return $result; - } - /* - * Get the customer group information - * - * @param integer $id The customer group id - * @access public - * @return array - */ - public static function getData($id) { - global $lC_Database, $lC_Language; - - $Qclasses = $lC_Database->query('select* from :table_product_classes where id = :id and language_id = :language_id order by name'); - $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); - $Qclasses->bindInt(':id', $id); - $Qclasses->bindInt(':language_id', $lC_Language->getID()); - - $data = $Qclasses->toArray(); - - $Qclasses->freeResult(); - - return $data; - } - /* - * Save the customer group information - * - * @param integer $id The customer group id used on update, null on insert - * @param array $data An array containing the customer group information - * @param boolean $default True = set the customer group to be the default - * @access public - * @return boolean - */ - public static function save($id = null, $data, $default = false) { - global $lC_Database, $lC_Language; - - $error = false; - - $lC_Database->startTransaction(); - - if ( is_numeric($id) ) { - $product_class_id = $id; - } else { - $Qpc = $lC_Database->query('select max(id) as product_class_id from :table_product_classes'); - $Qpc->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); - $Qpc->execute(); - - $product_class_id = $Qpc->valueInt('product_class_id') + 1; - } - - foreach ( $lC_Language->getAll() as $l ) { - if ( is_numeric($id) ) { - $Qpc = $lC_Database->query('update :table_product_classes set name = :name, comment = :comment where id = :id and language_id = :language_id'); - } else { - $Qpc = $lC_Database->query('insert into :table_product_classes (name, comment, language_id) values (:name, :comment, :language_id)'); - } - - $Qpc->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); - $Qpc->bindInt(':id', $product_class_id); - $Qpc->bindValue(':name', $data['name'][$l['id']]); - $Qpc->bindValue(':comment', $data['comment']); - $Qpc->bindInt(':language_id', $l['id']); - $Qpc->setLogging($_SESSION['module'], $product_class_id); - $Qpc->execute(); - - if ( $lC_Database->isError() ) { - $error = true; - break; - } - } - - if ( $error === false ) { - if ( $default === true ) { - $Qupdate = $lC_Database->query('update :table_configuration set configuration_value = :configuration_value where configuration_key = :configuration_key'); - $Qupdate->bindTable(':table_configuration', TABLE_CONFIGURATION); - $Qupdate->bindInt(':configuration_value', $product_class_id); - $Qupdate->bindValue(':configuration_key', 'DEFAULT_PRODUCT_CLASSES_ID'); - $Qupdate->setLogging($_SESSION['module'], $product_class_id); - $Qupdate->execute(); - - if ( $lC_Database->isError() ) { - $error = true; - } - } - } - - if ( $error === false ) { - $lC_Database->commitTransaction(); - - if ( $default === true ) { - lC_Cache::clear('configuration'); - } - - return true; - } - - $lC_Database->rollbackTransaction(); - - return false; - } - /* - * Delete the customer group record - * - * @param integer $id The customer group id to delete - * @access public - * @return boolean - */ - public static function delete($id) { - global $lC_Database; - - $Qclasses = $lC_Database->query('delete from :table_product_classes where id = :id'); - $Qclasses->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); - $Qclasses->bindInt(':id', $id); - $Qclasses->setLogging($_SESSION['module'], $id); - $Qclasses->execute(); - - if ( $lC_Database->isError() ) { - return false; - } - - return true; - } -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php deleted file mode 100644 index c418dc4ef..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/classes/rpc.php +++ /dev/null @@ -1,78 +0,0 @@ - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php deleted file mode 100644 index faf5f69e2..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/js/product_classes.js.php +++ /dev/null @@ -1,39 +0,0 @@ - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php deleted file mode 100644 index 6895ceaa9..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/delete.php +++ /dev/null @@ -1,94 +0,0 @@ - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php deleted file mode 100644 index 33b2e1160..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/edit.php +++ /dev/null @@ -1,117 +0,0 @@ - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php deleted file mode 100644 index c9f8bede6..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/modal/new.php +++ /dev/null @@ -1,115 +0,0 @@ - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php deleted file mode 100644 index 9836d1d27..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/pages/main.php +++ /dev/null @@ -1,60 +0,0 @@ - - -
    - -
    -

    getPageTitle(); ?>

    -
    - -
    -
    - - - - - - - - - - - - - - - - -
    get('table_heading_name'); ?>get('table_heading_comment'); ?>get('table_heading_usage'); ?>  get('table_heading_action'); ?>
     
    -
    -
    - -
    -
    -loadModal($lC_Template->getModule()); ?> - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php deleted file mode 100644 index fa1be3dfe..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/product_classes/product_classes.php +++ /dev/null @@ -1,28 +0,0 @@ -_page_title = $lC_Language->get('heading_title'); - } -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php deleted file mode 100644 index 96842cc45..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php +++ /dev/null @@ -1,1094 +0,0 @@ -modCheck(DIR_FS_ADMIN . 'includes/applications/products/classes/products.php')); -include_once($lC_Vqmod->modCheck(DIR_FS_ADMIN . 'includes/applications/customer_groups/classes/customer_groups.php')); - -class lC_Products_pro_Admin extends lC_Products_Admin { - /* - * Save the product - * - * @param integer $id The products id to update, null on insert - * @param array $data The products information - * @access public - * @return boolean - */ - public static function save($id = null, $data) { - global $lC_Database, $lC_Language, $lC_Image; - - $error = false; - - $products_id = parent::save($id, $data); - - $group = (defined('DEFAULT_CUSTOMERS_GROUP_ID') && DEFAULT_CUSTOMERS_GROUP_ID != null) ? (int)DEFAULT_CUSTOMERS_GROUP_ID : 1; - - // qty price breaks - if (is_array($data['products_qty_break_point'][$group]) && $data['products_qty_break_point'][$group][1] != null) { - if ($products_id != null) { - - $lC_Database->startTransaction(); - - // remove any old pricing records - $Qpricing = $lC_Database->query('delete from :table_products_pricing where products_id = :products_id'); - $Qpricing->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpricing->bindInt(':products_id', $products_id); - $Qpricing->setLogging($_SESSION['module'], $products_id); - $Qpricing->execute(); - - if ( $lC_Database->isError() ) { - $error = true; - } else { - // add the new records - - foreach($data['products_qty_break_point'][$group] as $key => $val) { - - if ($data['products_qty_break_point'][$group][$key] == null) continue; - if ($data['products_qty_break_point'][$group][$key] == '1') continue; - - $Qpb = $lC_Database->query('insert into :table_products_pricing (products_id, group_id, tax_class_id, qty_break, price_break, date_added) values (:products_id, :group_id, :tax_class_id, :qty_break, :price_break, :date_added)'); - $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpb->bindInt(':products_id', $products_id ); - $Qpb->bindInt(':group_id', $group); - $Qpb->bindInt(':tax_class_id', $data['tax_class_id'] ); - $Qpb->bindValue(':qty_break', $data['products_qty_break_point'][$group][$key] ); - $Qpb->bindValue(':price_break', $data['products_qty_break_price'][$group][$key] ); - $Qpb->bindRaw(':date_added', 'now()'); - $Qpb->setLogging($_SESSION['module'], $products_id); - $Qpb->execute(); - } - } - - if ( $error === false ) { - $lC_Database->commitTransaction(); - } - - $lC_Database->rollbackTransaction(); - } - } - - // subproducts - if ( $error === false ) { - if (isset($data['sub_products_name'])) { - - if (is_numeric($id)) { - // first delete the subproducts that have been removed and not in the post data - $Qchk = $lC_Database->query('select products_id from :table_products where parent_id = :parent_id'); - $Qchk->bindTable(':table_products', TABLE_PRODUCTS); - $Qchk->bindInt(':parent_id', $products_id); - $Qchk->execute(); - - while( $Qchk->next() ) { - if (! @in_array($Qchk->valueInt('products_id'), $data['sub_products_id'])) { - self::delete($Qchk->valueInt('products_id')); - } - } - } else { - // delete any possible ghosts for sanity - $Qdel = $lC_Database->query('delete from :table_products where parent_id = :products_id and is_subproduct = :is_subproduct'); - $Qdel->bindTable(':table_products', TABLE_PRODUCTS); - $Qdel->bindInt(':parent_id', $products_id); - $Qdel->bindInt(':is_subproduct', 1); - $Qdel->execute(); - } - - for ($i=0; $i < sizeof($data['sub_products_name']); $i++) { - if ($data['sub_products_name'][$i] == '') continue; - - if (is_numeric($id) && @in_array($data['sub_products_id'][$i], $data['sub_products_id'])) { - // update the subproduct record - $Qsubproduct = $lC_Database->query('update :table_products set products_quantity = :products_quantity, products_cost = :products_cost, products_price = :products_price, products_sku = :products_sku, products_weight = :products_weight, products_weight_class = :products_weight_class, products_status = :products_status, products_tax_class_id = :products_tax_class_id, products_date_added = :products_date_added, is_subproduct = :is_subproduct where parent_id = :parent_id and products_id = :products_id'); - $Qsubproduct->bindInt(':products_id', $data['sub_products_id'][$i]); - } else { - // add new subproduct record - $Qsubproduct = $lC_Database->query('insert into :table_products (parent_id, products_quantity, products_cost, products_price, products_sku, products_weight, products_weight_class, products_status, products_tax_class_id, products_ordered, products_date_added, is_subproduct) values (:parent_id, :products_quantity, :products_cost, :products_price, :products_sku, :products_weight, :products_weight_class, :products_status, :products_tax_class_id, :products_ordered, :products_date_added, :is_subproduct)'); - $Qsubproduct->bindInt(':products_ordered', $data['products_ordered'][$i]); - } - - $Qsubproduct->bindTable(':table_products', TABLE_PRODUCTS); - $Qsubproduct->bindInt(':parent_id', $products_id); - $Qsubproduct->bindInt(':products_quantity', $data['sub_products_qoh'][$i]); - $Qsubproduct->bindFloat(':products_cost', preg_replace('/[^0-9]\./', '', $data['sub_products_cost'][$i])); - $Qsubproduct->bindFloat(':products_price', preg_replace('/[^0-9]\./', '', $data['sub_products_price'][1][$i])); // retail group - other prices go into pricing table - $Qsubproduct->bindValue(':products_sku', $data['sub_products_sku'][$i]); - $Qsubproduct->bindFloat(':products_weight', $data['sub_products_weight'][$i]); - $Qsubproduct->bindInt(':products_weight_class', $data['weight_class']); - $Qsubproduct->bindInt(':products_status', $data['sub_products_status'][$i]); - $Qsubproduct->bindInt(':products_tax_class_id', $data['tax_class_id']); - $Qsubproduct->bindRaw(':products_date_added', 'now()'); - $Qsubproduct->bindInt(':is_subproduct', ($data['sub_products_default'][$i] == '1' || sizeof($data['sub_products_name']) == 2) ? 2 : 1); - $Qsubproduct->setLogging($_SESSION['module'], $products_id); - $Qsubproduct->execute(); - - if ( $lC_Database->isError() ) { - $error = true; - } else { - if ( is_numeric($id) && @in_array($data['sub_products_id'][$i], $data['sub_products_id']) ) { - $sub_products_id = $data['sub_products_id'][$i]; - } else { - $sub_products_id = self::_getLastID(); - } - // subproduct description - foreach ($lC_Language->getAll() as $l) { - if (is_numeric($id) && @in_array($data['sub_products_id'][$i], $data['sub_products_id'])) { - $Qpd = $lC_Database->query('update :table_products_description set products_name = :products_name where products_id = :products_id and language_id = :language_id'); - } else { - $Qpd = $lC_Database->query('insert into :table_products_description (products_id, language_id, products_name) values (:products_id, :language_id, :products_name)'); - } - $Qpd->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION); - $Qpd->bindInt(':products_id', $sub_products_id); - $Qpd->bindInt(':language_id', $l['id']); - $Qpd->bindValue(':products_name', $data['sub_products_name'][$i]); - $Qpd->setLogging($_SESSION['module'], $sub_products_id); - $Qpd->execute(); - - if ( $lC_Database->isError() ) { - $error = true; - break; - } - } - } - - //subproduct images - if ( $error === false ) { - if (empty($_FILES['sub_products_image']['name'][$i]) === false) { - $images = array(); - $file = array('name' => $_FILES['sub_products_image']['name'][$i], - 'type' => $_FILES['sub_products_image']['type'][$i], - 'size' => $_FILES['sub_products_image']['size'][$i], - 'tmp_name' => $_FILES['sub_products_image']['tmp_name'][$i]); - - $products_image = new upload($file); - - $products_image->set_extensions(array('gif', 'jpg', 'jpeg', 'png')); - - if ( $products_image->exists() ) { - $products_image->set_destination(realpath('../images/products/originals')); - - if ( $products_image->parse() && $products_image->save() ) { - $images[] = $products_image->filename; - } - } - - $default_flag = 1; - - foreach ($images as $image) { - $Qimage = $lC_Database->query('insert into :table_products_images (products_id, image, default_flag, sort_order, date_added) values (:products_id, :image, :default_flag, :sort_order, :date_added)'); - $Qimage->bindTable(':table_products_images', TABLE_PRODUCTS_IMAGES); - $Qimage->bindInt(':products_id', $sub_products_id); - $Qimage->bindValue(':image', $image); - $Qimage->bindInt(':default_flag', $default_flag); - $Qimage->bindInt(':sort_order', 0); - $Qimage->bindRaw(':date_added', 'now()'); - $Qimage->setLogging($_SESSION['module'], $products_id); - $Qimage->execute(); - - if ( $lC_Database->isError() ) { - $error = true; - } else { - foreach ($lC_Image->getGroups() as $group) { - if ($group['id'] != '1') { - $lC_Image->resize($image, $group['id']); - } - } - } - $default_flag = 0; - } - } - } - } - } - } - - // combo variants - if ( $error === false ) { - $variants_array = array(); - $default_variant_combo = null; - - if ( isset($data['variants']) && !empty($data['variants']) ) { - foreach ( $data['variants'] as $key => $combo ) { - if (isset($data['variants'][$key]['product_id']) && $data['variants'][$key]['product_id'] != 0) { - $Qsubproduct = $lC_Database->query('update :table_products set products_quantity = :products_quantity, products_cost = :products_cost, products_price = :products_price, products_msrp = :products_msrp, products_model = :products_model, products_sku = :products_sku, products_weight = :products_weight, products_weight_class = :products_weight_class, products_status = :products_status, products_tax_class_id = :products_tax_class_id where products_id = :products_id'); - $Qsubproduct->bindInt(':products_id', $data['variants'][$key]['product_id']); - } else { - $Qsubproduct = $lC_Database->query('insert into :table_products (parent_id, products_quantity, products_cost, products_price, products_msrp, products_model, products_sku, products_weight, products_weight_class, products_status, products_tax_class_id, products_date_added) values (:parent_id, :products_quantity, :products_cost, :products_price, :products_msrp, :products_model, :products_sku, :products_weight, :products_weight_class, :products_status, :products_tax_class_id, :products_date_added)'); - $Qsubproduct->bindInt(':parent_id', $products_id); - $Qsubproduct->bindRaw(':products_date_added', 'now()'); - } - - $price = 0.00; - if (is_array($data['variants'][$key]['price'])) $price = $data['variants'][$key]['price'][0]; - - $Qsubproduct->bindTable(':table_products', TABLE_PRODUCTS); - $Qsubproduct->bindInt(':products_quantity', $data['variants'][$key]['qoh']); - $Qsubproduct->bindFloat(':products_cost', $data['variants'][$key]['cost']); - $Qsubproduct->bindFloat(':products_price', $price); - $Qsubproduct->bindFloat(':products_msrp', $data['variants'][$key]['msrp']); - $Qsubproduct->bindValue(':products_model', $data['variants'][$key]['model']); - $Qsubproduct->bindValue(':products_sku', $data['variants'][$key]['sku']); - $Qsubproduct->bindFloat(':products_weight', $data['variants'][$key]['weight']); - $Qsubproduct->bindInt(':products_weight_class', $data['weight_class']); - $Qsubproduct->bindInt(':products_status', $data['variants'][$key]['status']); - $Qsubproduct->bindInt(':products_tax_class_id', $data['tax_class_id']); - $Qsubproduct->setLogging($_SESSION['module'], $products_id); - $Qsubproduct->execute(); - - if ( isset($data['variants'][$key]['product_id']) && $data['variants'][$key]['product_id'] != '0') { - $subproduct_id = $data['variants'][$key]['product_id']; - } else { - $Qnext = $lC_Database->query('select max(products_id) as maxID from :table_products'); - $Qnext->bindTable(':table_products', TABLE_PRODUCTS); - $Qnext->execute(); - $subproduct_id = $Qnext->valueInt('maxID'); - $Qnext->freeResult(); - } - - if ( $data['variants'][$key]['default_combo'] == 1) { - $default_variant_combo = $subproduct_id; - } - - foreach ( $data['variants'][$key]['values'] as $values_id => $values_text ) { - - $variants_array[$subproduct_id][] = $values_id; - - $check_combos_array[] = $values_id; - - $Qcheck = $lC_Database->query('select products_id from :table_products_variants where products_id = :products_id and products_variants_values_id = :products_variants_values_id'); - $Qcheck->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); - $Qcheck->bindInt(':products_id', $subproduct_id); - $Qcheck->bindInt(':products_variants_values_id', $values_id); - $Qcheck->execute(); - - if ( $Qcheck->numberOfRows() < 1 ) { - - $Qvcombo = $lC_Database->query('insert into :table_products_variants (products_id, products_variants_values_id) values (:products_id, :products_variants_values_id)'); - $Qvcombo->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); - $Qvcombo->bindInt(':products_id', $subproduct_id); - $Qvcombo->bindInt(':products_variants_values_id', $values_id); - $Qvcombo->setLogging($_SESSION['module'], $products_id); - $Qvcombo->execute(); - - if ( $lC_Database->isError() ) { - $error = true; - break 2; - } - } - } - - } - } - - if ( $error === false ) { - if ( empty($variants_array) ) { - $Qcheck = $lC_Database->query('select pv.* from :table_products p, :table_products_variants pv where p.parent_id = :parent_id and p.products_id = pv.products_id'); - $Qcheck->bindTable(':table_products', TABLE_PRODUCTS); - $Qcheck->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); - $Qcheck->bindInt(':parent_id', $products_id); - $Qcheck->execute(); - - while ( $Qcheck->next() ) { - $Qdel = $lC_Database->query('delete from :table_products_variants where products_id = :products_id'); - $Qdel->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); - $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); - $Qdel->execute(); - - $Qdel = $lC_Database->query('delete from :table_products where products_id = :products_id'); - $Qdel->bindTable(':table_products', TABLE_PRODUCTS); - $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); - $Qdel->execute(); - - } - } else { - $Qcheck = $lC_Database->query('select pv.* from :table_products p, :table_products_variants pv where p.parent_id = :parent_id and p.products_id = pv.products_id and pv.products_id not in (":products_id")'); - $Qcheck->bindTable(':table_products', TABLE_PRODUCTS); - $Qcheck->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); - $Qcheck->bindInt(':parent_id', $products_id); - $Qcheck->bindRaw(':products_id', implode('", "', array_keys($variants_array))); - $Qcheck->execute(); - - while ( $Qcheck->next() ) { - $Qdel = $lC_Database->query('delete from :table_products_variants where products_id = :products_id and products_variants_values_id = :products_variants_values_id'); - $Qdel->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); - $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); - $Qdel->bindInt(':products_variants_values_id', $Qcheck->valueInt('products_variants_values_id')); - $Qdel->execute(); - - $Qdel = $lC_Database->query('delete from :table_products where products_id = :products_id'); - $Qdel->bindTable(':table_products', TABLE_PRODUCTS); - $Qdel->bindInt(':products_id', $Qcheck->valueInt('products_id')); - $Qdel->execute(); - - } - - foreach ( $variants_array as $key => $values ) { - $Qdel = $lC_Database->query('delete from :table_products_variants where products_id = :products_id and products_variants_values_id not in (":products_variants_values_id")'); - $Qdel->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); - $Qdel->bindInt(':products_id', $key); - $Qdel->bindRaw(':products_variants_values_id', implode('", "', $values)); - $Qdel->execute(); - } - } - } - - $Qupdate = $lC_Database->query('update :table_products set has_children = :has_children where products_id = :products_id'); - $Qupdate->bindTable(':table_products', TABLE_PRODUCTS); - $Qupdate->bindInt(':has_children', (empty($variants_array)) ? 0 : 1); - $Qupdate->bindInt(':products_id', $products_id); - $Qupdate->execute(); - - } - - if ( $error === false ) { - $Qupdate = $lC_Database->query('update :table_products_variants set default_combo = :default_combo where products_id in (":products_id")'); - $Qupdate->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); - $Qupdate->bindInt(':default_combo', 0); - $Qupdate->bindRaw(':products_id', implode('", "', array_keys($variants_array))); - $Qupdate->execute(); - - if ( is_numeric($default_variant_combo) ) { - $Qupdate = $lC_Database->query('update :table_products_variants set default_combo = :default_combo where products_id = :products_id'); - $Qupdate->bindTable(':table_products_variants', TABLE_PRODUCTS_VARIANTS); - $Qupdate->bindInt(':default_combo', 1); - $Qupdate->bindInt(':products_id', $default_variant_combo); - $Qupdate->execute(); - } - } - - // customer access levels (B2B) - if ( $error === false ) { - $levels = ''; - if (is_array($data['access_levels'])) { - foreach($data['access_levels'] as $key => $val) { - $levels .= $key . ';'; - } - $levels = substr($levels, 0, -1); - } - - $Qupdate = $lC_Database->query('update :table_products set access_levels = :access_levels where products_id = :products_id'); - $Qupdate->bindTable(':table_products', TABLE_PRODUCTS); - $Qupdate->bindValue(':access_levels', $levels); - $Qupdate->bindInt(':products_id', $products_id); - $Qupdate->execute(); - } - - return $products_id; // Return the products id for use with the save_close buttons - - } - /* - * Return the product simple options accordian price listing content - * - * @access public - * @return array - */ - public static function getOptionsPricingContent() { - global $lC_Language, $pInfo; - - $content = ''; - $groups = lC_Customer_groups_Admin::getAll(); - foreach($groups['entries'] as $key => $value) { - $content .= '
    ' . $value['customers_group_name'] . '
    ' . - '
    ' . - '
    '; - - if (isset($pInfo) && is_array($pInfo->get('simple_options'))) { - $content .= '
    ' . - '
    ' . $lC_Language->get('text_simple_options') . '
    ' . - ' ' . - ' ' . lC_Products_Admin::getSimpleOptionsPricingTbody($pInfo->get('simple_options'), $value['customers_group_id']) . '' . - '
    ' . - '
    '; - - } - - if (isset($pInfo) && $pInfo->get('has_subproducts') == '1') { - $content .= '
    ' . - '
    ' . $lC_Language->get('text_sub_products') . '
    ' . - ' ' . - ' ' . lC_Products_pro_Admin::getSubProductsPricingTbody($pInfo, $value['customers_group_id']) . '' . - '
    ' . - '
    '; - - } - - if (isset($pInfo) && $pInfo->get('has_children') == '1') { - $content .= '
    ' . - '
    ' . $lC_Language->get('text_combo_options') . '
    ' . - ' ' . - ' ' . lC_Products_pro_Admin::getComboOptionsPricingTbody($pInfo, $value['customers_group_id']) . '' . - '
    ' . - '
    '; - } - - if ( (!isset($pInfo)) || (isset($pInfo) && $pInfo->get('has_subproducts') != '1' && $pInfo->get('has_children') != '1' && !is_array($pInfo->get('simple_options'))) ) { - $content .= '
    ' . $lC_Language->get('text_no_options_defined') . '
    '; - } - - $content .= '
    ' . - '
    '; - } - - return $content; - } - - /* - * Returns the icons used in the product listing - * - * @param integer $id The products id - * @access public - * @return string - */ - public static function getlistingIcons($products_id) { - global $lC_Language; - - $icons = parent::getlistingIcons($products_id); - - if (self::hasSubProducts($products_id)) { - $icons .= ''; - } - if (self::hasComboOptions($products_id)) { - $icons .= ''; - } - - return $icons; - } - /* - * Returns the price info used in the product listing - * - * @param integer $data The product data array - * @access public - * @return string - */ - public function getProductsListingPrice($data) { - global $lC_Database, $lC_Language, $lC_Currencies; - - if (self::hasSubProducts($data['products_id']) === false && self::hasComboOptions($data['products_id']) === false) { - $price = parent::getProductsListingPrice($data); - } else { - $mm = self::getMinMaxPrice($data['products_id']); - $price = ($mm['min'] == $mm['max']) ? $lC_Currencies->format($mm['min']) : '(' . $lC_Currencies->format($mm['min']) . ' - ' . $lC_Currencies->format($mm['max']) . ')'; - } - - return $price; - } - /* - * Returns the min/max price used in the product listing - * - * @param integer $id The product id - * @access public - * @return string - */ - public static function getMinMaxPrice($id) { - global $lC_Database; - - $Qproducts = $lC_Database->query('select MAX(products_price) as max, MIN(products_price) as min from :table_products where parent_id = :parent_id'); - $Qproducts->bindTable(':table_products', TABLE_PRODUCTS); - $Qproducts->bindInt(':parent_id', $id); - $Qproducts->execute(); - - $result = $Qproducts->toArray(); - - $Qproducts->freeResult(); - - return $result; - } - /* - * Returns the price info used in the product listing - * - * @param integer $data The product data array - * @access public - * @return string - */ - public function getProductsListingQty($data) { - global $lC_Database; - - if (self::hasSubProducts($data['products_id']) === false && self::hasComboOptions($data['products_id']) === false) { - $result = $data['products_quantity']; - } else { - $Qproducts = $lC_Database->query('select SUM(products_quantity) as total from :table_products where parent_id = :parent_id'); - $Qproducts->bindTable(':table_products', TABLE_PRODUCTS); - $Qproducts->bindInt(':parent_id', $data['products_id']); - $Qproducts->execute(); - - $result = '(' . $Qproducts->valueInt('total') . ')'; - - $Qproducts->freeResult(); - } - - return $result; - } - /* - * Determine if product has qty price breaks - * - * @param integer $id The product id - * @access public - * @return boolean - */ - public static function hasQPBPricing($id) { - global $lC_Database; - - $Qpb = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id and qty_break != :qty_break limit 1'); - $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpb->bindInt(':products_id', $id); - $Qpb->bindInt(':qty_break', -1); - $Qpb->execute(); - - $rows = $Qpb->numberOfRows(); - - $Qpb->freeResult(); - - if ( $rows > 0 ) { - return true; - } - - return false; - } - /* - * Retrieve qty price breaks - * - * @param integer $id The product id - * @param integer $group The customer group id - * @access public - * @return array - */ - public static function getQPBPricing($id, $group = null) { - global $lC_Database; - - if ($group == null) $group = (defined('DEFAULT_CUSTOMERS_GROUP_ID') && DEFAULT_CUSTOMERS_GROUP_ID != null) ? (int)DEFAULT_CUSTOMERS_GROUP_ID : 1; - - $Qpb = $lC_Database->query('select * from :table_products_pricing where products_id = :products_id and group_id = :group_id and qty_break != :qty_break order by qty_break asc'); - $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpb->bindInt(':products_id', $id); - $Qpb->bindInt(':group_id', $group); - $Qpb->bindInt(':qty_break', -1); - $Qpb->execute(); - - $data = array(); - while($Qpb->next()) { - $data[] = $Qpb->toArray(); - } - - $Qpb->freeResult(); - - return $data; - } - /* - * Return the qty price breaks listing content - * - * @access public - * @return array - */ - public static function getQPBPricingContent() { - global $lC_Language, $lC_Currencies, $pInfo; - - $content = ''; - $groups = lC_Customer_groups_Admin::getAll(); - foreach($groups['entries'] as $key => $value) { - $cnt = 0; - $show_line = false; - if (utility::isB2B()) { - if (count($groups['entries'] > 1) && $cnt != count($groups['entries']) ) $show_line = true; - } else { - if ($value['customers_group_id'] != DEFAULT_CUSTOMERS_GROUP_ID) continue; // locked to default for Pro - } - - $base = (isset($pInfo)) ? (float)$pInfo->get('products_price') : 0.00; - $special = (isset($pInfo)) ? (float)$pInfo->get('products_special_price') : 0.00; - - $has_options = (isset($pInfo) && (self::hasComboOptions($pInfo->get('products_id')) || self::hasSubProducts($pInfo->get('products_id')))) ? true : false; - - $content .= '' . - - '
    ' . - '
    ' . - '
    ' . - ' #' . - ' ' . - '
    ' . - ' Qty'; - if ($has_options === false) { - $content .= '
    ' . - ' ' . $lC_Currencies->getSymbolLeft() . '' . - ' ' . - '
    ' . - ' Price'; - } - $content .= '
    '; - - if ( isset($pInfo) && self::hasQPBPricing($pInfo->get('products_id')) ) { - - $qpbData = self::getQPBPricing($pInfo->get('products_id'), $value['customers_group_id']); - - foreach ($qpbData as $key => $val) { - $content .= self::_getNewQPBPricingRow($val['group_id'], $cnt+1, $val); - $cnt++; - } - // add a new row - $content .= self::_getNewQPBPricingRow($value['customers_group_id'], $cnt+1); - } else { // no qpb recorded, setup new - $content .= self::_getNewQPBPricingRow($value['customers_group_id'], 1); - } - - $content .= '
    '; - - if ($show_line) $content .= '
    '; - - $cnt++; - } - - return $content; - } - /* - * Generate qty price break row - * - * @param integer $group The customer group id - * @param integer $cnt The product id - * @param array $data The product data - * @access private - * @return string - */ - private static function _getNewQPBPricingRow($group, $cnt, $data = array()) { - global $lC_Currencies, $pInfo; - - $has_options = (isset($pInfo) && (self::hasComboOptions($pInfo->get('products_id')) || self::hasSubProducts($pInfo->get('products_id')))) ? true : false; - - $content = '
    ' . - '
    ' . - ' #' . - ' ' . - '
    ' . - ' Qty'; - if ($has_options === false) { - $content .= '
    ' . - ' ' . $lC_Currencies->getSymbolLeft() . '' . - ' ' . - '
    ' . - ' Price'; - } - $content .= ' ' . - '
    '; - - return $content; - } - /* - * Determine if the product has combo options - * - * @param integer $id The product id - * @access public - * @return boolean - */ - public static function hasComboOptions($id) { - global $lC_Database; - - $Qchk = $lC_Database->query('select has_children from :table_products where parent_id = :parent_id and products_id = :products_id limit 1'); - $Qchk->bindTable(':table_products', TABLE_PRODUCTS); - $Qchk->bindInt(':parent_id', 0); - $Qchk->bindInt(':products_id', $id); - $Qchk->execute(); - - return ( $Qchk->valueInt('has_children') === 1 ); - } - /* - * Return the combo options listing content - * - * @param array $options The multi sku options array - * @access public - * @return array - */ - public static function getComboOptionsContent($options = array()) { - $content = ''; - - $content .= self::_getComboOptionsTbody($options); - - return $content; - } - /* - * Return the combo options pricing content - * - * @param array $data The product data object - * @access public - * @return string - */ - public static function getComboOptionsPricingTbody($pInfo, $customers_group_id) { - global $lC_Currencies; - - if ($customers_group_id == '') return false; - - $products_id = (isset($pInfo)) ? $pInfo->get('products_id') : null; - - $hasQPBPricing = self::hasQPBPricing($products_id); - - if (utility::isB2B()) { - $ok = true; - $input_class = null; - $readonly = null; - } else if (utility::isPro()) { - $ok = true; - $input_class = (($customers_group_id == DEFAULT_CUSTOMERS_GROUP_ID) ? null : ' disabled'); - $readonly = (($customers_group_id == '1' && $ok) ? '' : ' READONLY'); - } - - $tbody = ''; - $cnt = 0; - $bpArr = array(); - if (isset($pInfo) && $pInfo->get('has_children') == '1') { - - foreach ($pInfo->get('variants') as $product_id => $val) { - $title = ''; - if (is_array($val['values'])) { - foreach ($val['values'] as $group_id => $value_id) { - foreach ($value_id as $value) { - $title .= $value['value_title'] . ', '; - } - } - } - if (strstr($title, ',')) $title = substr($title, 0, -2); - - if ((isset($title) && $title != NULL)) { - if (isset($pInfo) && $hasQPBPricing && $cnt == 0) { - $qpbData = self::getQPBPricing($pInfo->get('products_id'), $customers_group_id); - $tbody .= '' . - '  ' . - ' Qty 1'; - foreach ($qpbData as $qkey => $qval) { - $bpArr[] = $qval['qty_break']; - $tbody .= ' Qty ' . $qval['qty_break'] . ''; - } - - // added for options w/special price - if (utility::isB2B()) { - $tbody .= ' Special Price'; - } - - $tbody .= ''; - } - - if (utility::isB2B()) { - $default_value = number_format($val['data']['price'], DECIMAL_PLACES); - } else if (utility::isPro()) { - $default_value = (($customers_group_id == DEFAULT_CUSTOMERS_GROUP_ID) ? number_format($val['data']['price'], DECIMAL_PLACES) : number_format(0, DECIMAL_PLACES)); - } - - $tbody .= '' . - ' ' . $title . ''; - - $tbody .= self::_getNewQPBPricingCol($product_id, $customers_group_id, $bpArr); - - // added for options w/special price - if (utility::isB2B()) { - $tbody .= self::_getNewSpecialPricingCol($product_id, $customers_group_id); - } - - $tbody .= ''; - - $cnt++; - } - } - } - - return $tbody; - } - /* - * Generate special price column - * - * @param integer $group The customer group id - * @param integer $cnt The product id - * @param array $data The product data - * @access private - * @return string - */ - private static function _getNewSpecialPricingCol($product_id, $group_id) { - global $lC_Currencies; - - $content .= ' ' . - '
    ' . - ' ' . $lC_Currencies->getSymbolLeft() . '' . - ' ' . - '
    ' . - ' '; - - return $content; - } - /* - * Generate qty price break column - * - * @param integer $group The customer group id - * @param integer $cnt The product id - * @param array $data The product data - * @access private - * @return string - */ - private static function _getNewQPBPricingCol($product_id, $group_id, $bpArr) { - global $lC_Currencies, $lC_Database, $pInfo; - - $content = ''; - if (is_array($bpArr)) { - - $content .= ' ' . - '
    ' . - ' ' . $lC_Currencies->getSymbolLeft() . '' . - ' ' . - '
    ' . - ' '; - - $cnt = 0; - reset($bpArr); - foreach($bpArr as $qty_break) { - - $Qpb = $lC_Database->query('select price_break from :table_products_pricing where products_id = :products_id and group_id = :group_id and qty_break = :qty_break limit 1'); - $Qpb->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qpb->bindInt(':products_id', $product_id); - $Qpb->bindInt(':group_id', $group_id); - $Qpb->bindInt(':qty_break', $qty_break); - $Qpb->execute(); - - if ($Qpb->numberOfRows() > 0) { - $default_value = number_format($Qpb->valueDecimal('price_break'), DECIMAL_PLACES); - } else { - $default_value = number_format(0, DECIMAL_PLACES); - } - - $Qpb-> freeResult(); - - $content .= ' ' . - '
    ' . - ' ' . $lC_Currencies->getSymbolLeft() . '' . - ' ' . - '
    ' . - ' '; - $cnt++; - } - } - - return $content; - } - /* - * Return the product simple options tbody content - * - * @param array $options The product simple options array - * @access public - * @return string - */ - private static function _getComboOptionsTbody($options) { - global $lC_Currencies, $lC_Language; - - $tbody = ''; - $sort = 10; - $cnt = 0; - if (isset($options) && !empty($options)) { - foreach ($options as $product_id => $mso) { - $combo = ''; - $default = ''; - $module = ''; - $comboInput = ''; - if (is_array($mso['values'])) { - foreach ($mso['values'] as $group_id => $value_id) { - foreach ($value_id as $key => $data) { - $combo .= $data['value_title'] . ', '; - $module = $data['module']; - $default = $data['default']; - $default_visual = $data['default_visual']; - $comboInput .= ''; - $comboInput .= ''; - } - } - if (strstr($combo, ',')) $combo = substr($combo, 0, -2); - - $statusIcon = (isset($mso['data']['status']) && $mso['data']['status'] == '1') ? '' : ''; - $defaultIcon = (isset($default) && $default == '1') ? '' : ''; - - $tbody .= '' . $comboInput . - ' ' . - ' ' . $combo . '' . - ' ' . $defaultIcon . '' . - ' -
    - - ' . lC_Weight::getCode(SHIPPING_WEIGHT_UNIT) . ' -
    - ' . - ' ' . - ' ' . - ' -
    - ' . $lC_Currencies->getSymbolLeft() . ' - -
    - ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . $statusIcon . '' . - ' - - - ' . - ''; - } - $sort = ($sort + 10); - $cnt++; - } - } - - return $tbody; - } - /* - * Determine if the product has subproducts - * - * @param integer $id The product id - * @access public - * @return boolean - */ - public static function hasSubProducts($id) { - global $lC_Database; - - $Qchk = $lC_Database->query('select products_id from :table_products where parent_id = :parent_id and is_subproduct > :is_subproduct limit 1'); - $Qchk->bindTable(':table_products', TABLE_PRODUCTS); - $Qchk->bindInt(':parent_id', $id); - $Qchk->bindInt(':is_subproduct', 0); - $Qchk->execute(); - - if ( $Qchk->numberOfRows() === 1 ) { - return true; - } - - return false; - } - /* - * Return the sub products pricing content - * - * @param array $data The product data object - * @access public - * @return string - */ - public static function getSubProductsPricingTbody($pInfo, $customers_group_id) { - global $lC_Currencies; - - if ($customers_group_id == '') return false; - - $products_id = (isset($pInfo)) ? $pInfo->get('products_id') : null; - - $hasQPBPricing = self::hasQPBPricing($products_id); - - if (utility::isB2B()) { - $ok = true; - $input_class = null; - $readonly = null; - } else if (utility::isPro()) { - $ok = true; - $input_class = (($customers_group_id == DEFAULT_CUSTOMERS_GROUP_ID) ? null : ' disabled'); - $readonly = (($customers_group_id == '1' && $ok) ? '' : ' READONLY'); - } - - $tbody = ''; - $cnt = 0; - $bpArr = array(); - - if (isset($pInfo) && $pInfo->get('has_subproducts') == '1') { - foreach ($pInfo->get('subproducts') as $key => $sub) { - if ((isset($sub['products_name']) && $sub['products_name'] != NULL)) { - - if (isset($pInfo) && $hasQPBPricing && $cnt == 0) { - $qpbData = self::getQPBPricing($pInfo->get('products_id'), $customers_group_id); - $tbody .= '' . - '  ' . - ' Qty 1'; - foreach ($qpbData as $qkey => $qval) { - $bpArr[] = $qval['qty_break']; - $tbody .= ' Qty ' . $qval['qty_break'] . ''; - } - - // added for options w/special price - if (utility::isB2B()) { - $tbody .= ' Special Price'; - } - - $tbody .= ''; - } - - $default_value = (isset($sub['products_price']) ? number_format($sub['products_price'], DECIMAL_PLACES) : number_format(0, DECIMAL_PLACES)); - - $tbody .= '' . - ' ' . $sub['products_name'] . ''; - - $tbody .= self::_getNewQPBPricingCol($sub['products_id'], $customers_group_id, $bpArr); - - // added for options w/special price - if (utility::isB2B()) { - $tbody .= self::_getNewSpecialPricingCol($sub['products_id'], $customers_group_id); - } - - $tbody .= ''; - - $cnt++; - } - } - } - - return $tbody; - } - /* - * Get the QPB options product price - * - * @param integer $id The product id - * @access public - * @return boolean - */ - private static function _getQPBOptionPrice($products_id, $group_id, $qty_break) { - global $lC_Database; - - $Qproducts = $lC_Database->query('select price_break from :table_products_pricing where products_id = :products_id and group_id = :group_id and qty_break = :qty_break limit 1'); - $Qproducts->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qproducts->bindInt(':products_id', $products_id); - $Qproducts->bindInt(':group_id', $group_id); - $Qproducts->bindInt(':qty_break', $qty_break); - $Qproducts->execute(); - - $result = 0; - if ($Qproducts->numberOfRows() > 0) { - $result = $Qproducts->valueDecimal('price_break'); - } - - $Qproducts->freeResult(); - - return number_format($result, DECIMAL_PLACES); - } - - /* - * Get the special options product price - * - * @param integer $products_id The product id - * @param integer $group_id The customer group id - * @access public - * @return boolean - */ - private static function _getSpecialOptionPrice($products_id, $group_id) { - global $lC_Database; - - $Qproducts = $lC_Database->query('select special_price from :table_products_pricing where products_id = :products_id and group_id = :group_id and special_status = :special_status limit 1'); - $Qproducts->bindTable(':table_products_pricing', TABLE_PRODUCTS_PRICING); - $Qproducts->bindInt(':products_id', $products_id); - $Qproducts->bindInt(':group_id', $group_id); - $Qproducts->bindInt(':special_status', 1); - $Qproducts->execute(); - - $result = 0; - if ($Qproducts->numberOfRows() > 0) { - $result = $Qproducts->valueDecimal('special_price'); - } - - $Qproducts->freeResult(); - - return number_format($result, DECIMAL_PLACES); - } -} \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php deleted file mode 100644 index 4c2e2fc1b..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php +++ /dev/null @@ -1,30 +0,0 @@ - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php deleted file mode 100644 index 8ede8347c..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/products/modal/addComboOption.php +++ /dev/null @@ -1,603 +0,0 @@ - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php deleted file mode 100644 index 8776f5e85..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php +++ /dev/null @@ -1,347 +0,0 @@ - -
    - - -
    - -
    - get('button_setup'); ?> - - - - - - - - - - - - - - - - get('variants')) : null); ?> -
     get('table_heading_option_set_name'); ?> get('table_heading_weight'); ?>get('table_heading_sku'); ?>get('table_heading_qoh'); ?>get('table_heading_price'); ?>get('table_heading_img'); ?>get('table_heading_status'); ?>get('table_heading_action'); ?>
    -
    - -
    - - - - - - - - - - - - - - -
    get('table_heading_name'); ?>get('table_heading_status'); ?>get('table_heading_weight'); ?>get('table_heading_sku'); ?>get('table_heading_qoh'); ?>get('table_heading_base_price'); ?>get('table_heading_img'); ?>get('table_heading_action'); ?>
    -
    - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php b/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php deleted file mode 100644 index af9a472c2..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php +++ /dev/null @@ -1,143 +0,0 @@ - -
    - - get('info_bubble_pricing_qty_price_breaks'), null, 'info-spot on-left grey margin-left'); ?> - -
    -     -
    - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml deleted file mode 100644 index 105dfd5e7..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - Categories Save - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/categories/classes/categories.php'));]]> - - - - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml deleted file mode 100644 index 496b547ae..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Modify Customers Listing Page - 1.0.0 - 2.3.2 - loadedcommerce.com - - - get('icon_login_as_customer') . ' (PRO)">]]> - value('customers_email_address')) . '" class="button icon-monitor with-tooltip' . ((int)($_SESSION['admin']['access'][$_module] < 4) ? ' disabled' : NULL) . '" title="' . $lC_Language->get('icon_login_as_customer') . '">]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml deleted file mode 100644 index 41ee6411f..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/database_tables.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Add Pro DB Tables - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml deleted file mode 100644 index dd08bab59..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - extend products save() - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/products/classes/products.php')); if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php'));]]> - - - _module]) && is_numeric($_GET[$this->_module]) ? $_GET[$this->_module] : null), $data);]]> - _module]) && is_numeric($_GET[$this->_module]) ? $_GET[$this->_module] : null), $data); } else { $id = (int)lC_Products_pro_Admin::save((isset($_GET[$this->_module]) && is_numeric($_GET[$this->_module]) ? $_GET[$this->_module] : null), $data); }]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml deleted file mode 100644 index 38c0134f4..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/product_classes.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - After Image Groups, add Product Classes - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - loadIniFile(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php', null, null, true);]]> - $lC_Template->setSubOf('product_settings'); - - - - '?image_groups'),]]> - 'classes.png', - 'title' => $lC_Language->get('access_product_classes_title'), - 'identifier' => '?product_classes'), ]]> - - - - - 0) { $ok = TRUE;]]> - 0) { $ok = TRUE;]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml deleted file mode 100644 index 4ea50ef92..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_data.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - Enable Multi SKU Inv Control - 1.0.0 - 2.3.2 - loadedcommerce.com - - - get('text_multi_sku'); ?>" upselldesc="get('text_multi_sku_desc'); ?>" for="ic_radio_2" class="upsellinfo disabled oicb button red-activegetInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> - getInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> - - - get('text_multi_sku') . '' . lc_go_pro() . ''; ?>]]> - get('text_multi_sku'); ?>]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml deleted file mode 100644 index f98547c16..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_images.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - Enable Pro on Images Tab - 1.0.0 - 2.3.2 - loadedcommerce.com - - - get('text_additional_images'); ?>]]> - get('text_additional_images'); ?>]]> - - - ]]> -
    get('subsection_original_images'); ?>
    get('subsection_images'); ?>
    ]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml deleted file mode 100644 index 22a99b369..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_options.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - Enable Pro on Options Tab - 1.0.0 - 2.3.2 - loadedcommerce.com - - - get('text_multi_sku'); ?>" upselldesc="get('text_multi_sku_desc'); ?>" for="ioc_radio_2" class="upsellinfo disabled oicb button red-activegetInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> - getInt('has_children') == 1 || $pInfo->getInt('has_subproducts') == 1) ? ' active' : ''); ?>">]]> - - - get('text_multi_sku') . '' . lc_go_pro() . ''; ?>]]> - get('text_multi_sku'); ?>]]> - - - ]]> - ]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml deleted file mode 100644 index 4e12adc5d..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - QPB Pricing - 1.0.0 - 2.3.2 - loadedcommerce.com - - - ]]> - ]]> - - - ]]> - ]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml deleted file mode 100644 index 920126449..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - Products Class - 1.0.0 - 2.3.2 - loadedcommerce.com - - - valueInt('products_id'));]]> - valueInt('products_id'));]]> - - - toArray());]]> - toArray());]]> - - - toArray());]]> - toArray());]]> - - - - modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_B2B/admin/applications/products/classes/products.php')); if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php'));]]> - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml b/catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml deleted file mode 100644 index 83959d3d1..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/hooks/store_class.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Hide Pro Template Pack - 1.0.0 - 2.3.2 - loadedcommerce.com - - - $type ) {]]> - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_file_upload.inc.php b/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_file_upload.inc.php deleted file mode 100644 index 9187ab10e..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_file_upload.inc.php +++ /dev/null @@ -1,59 +0,0 @@ - $val) { - if (isset($val['group_title']) && empty($val['group_title']) === false) { - $group_title = $val['group_title']; - break; - } - } - - $string = '
    ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - '
    '; - - reset($data); - $cnt = 0; - foreach($data as $key => $val) { - $price_ind = ((float)$val['price_modifier'] < 0.00) ? '-' : '+'; - $price_formatted = ((float)$val['price_modifier'] != 0.00) ? $price_ind . $lC_Currencies->format(number_format($val['price_modifier'], DECIMAL_PLACES), $lC_Currencies->getCode()) : null; - $options[$val['value_id']] = $val['price_modifier']; - $group_id = $val['group_id']; - $group_title = $val['group_title']; - - $string .= '
    ' . - ' ' . - '
    '; - $cnt++; - } - - $string .= '
    ' . - '
    '; - - } else { - - $string = '
    '; - $cnt = 0; - foreach ( $data['data'] as $field ) { - $string .= '
    ' . - ' ' . - ' ' . - ' ' . - ' ' . - '
    '; - $cnt++; - } - $string .= '
    '; - } -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_multiple_file_upload.inc.php b/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_multiple_file_upload.inc.php deleted file mode 100644 index 3b8400312..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/inc/modules_variants_multiple_file_upload.inc.php +++ /dev/null @@ -1,59 +0,0 @@ - $val) { - if (isset($val['group_title']) && empty($val['group_title']) === false) { - $group_title = $val['group_title']; - break; - } - } - - $string = '
    ' . - ' ' . - ' ' . - ' ' . - ' ' . - ' ' . - '
    '; - - reset($data); - $cnt = 0; - foreach($data as $key => $val) { - $price_ind = ((float)$val['price_modifier'] < 0.00) ? '-' : '+'; - $price_formatted = ((float)$val['price_modifier'] != 0.00) ? $price_ind . $lC_Currencies->format(number_format($val['price_modifier'], DECIMAL_PLACES), $lC_Currencies->getCode()) : null; - $options[$val['value_id']] = $val['price_modifier']; - $group_id = $val['group_id']; - $group_title = $val['group_title']; - - $string .= '
    ' . - ' ' . - '
    '; - $cnt++; - } - - $string .= '
    ' . - '
    '; - - } else { - - $string = '
    '; - $cnt = 0; - foreach ( $data['data'] as $field ) { - $string .= '
    ' . - ' ' . - ' ' . - ' ' . - ' ' . - '
    '; - $cnt++; - } - $string .= '
    '; - } -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php deleted file mode 100644 index 7dc443b88..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/access/product_classes.php +++ /dev/null @@ -1,12 +0,0 @@ -# $Id: product_classes.php v1.0 2013-01-01 datazen $ -# -# LoadedCommerce, Innovative eCommerce Solutions -# http://www.loadedcommerce.com -# -# Copyright (c) 2013 Loaded Commerce, LLC -# -# @author LoadedCommerce Team -# @copyright (c) 2013 LoadedCommerce Team -# @license http://loadedcommerce.com/license.html - -access_product_classes_title = Product Classes \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php deleted file mode 100644 index c0acd0786..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/modules/product_attributes/product_classes.php +++ /dev/null @@ -1,12 +0,0 @@ -# $Id: product_classes.php v1.0 2013-01-01 datazen $ -# -# LoadedCommerce, Innovative eCommerce Solutions -# http://www.loadedcommerce.com -# -# Copyright (c) 2013 Loaded Commerce, LLC -# -# @author LoadedCommerce Team -# @copyright (c) 2013 LoadedCommerce Team -# @license http://loadedcommerce.com/license.html - -product_attributes_product_classes_title = Product Classes \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php deleted file mode 100644 index c15fcc747..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/languages/en_US/product_classes.php +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: product_classes.php v1.0 2011-11-04 datazen $ -# -# LoadedCommerce, Innovative eCommerce Solutions -# http://www.loadedcommerce.com -# -# Copyright (c) 2011 LoadedCommerce.com -# -# @author LoadedCommerce Team -# @copyright (c) 2011 LoadedCommerce Team -# @license http://loadedcommerce.com/license.html - -heading_title = Product Classes - -access_product_classes_title = Product Classes - -table_heading_name = Name -table_heading_comment = Comment -table_heading_usage = Usage -table_heading_action = Action - -modal_heading_new_class = New Product Class -modal_heading_edit_class = Edit Product Class -modal_heading_delete_class = Delete Product Class - -field_name = Name: -field_comment = Comment: -field_status = Status: -field_set_as_default = Set as Default? - -button_new_class = New Class - -introduction_new_class = Please fill in the following information for the new class. -introduction_edit_class = Please make the necessary changes for this class. -introduction_delete_class = Please verify the removal of this classe. - -delete_error_class_prohibited = Error: The default class cannot be removed. -delete_error_class_in_use_1 = Error: This class is currently assigned to -delete_error_class_in_use_2 = product(s) and cannot be removed. \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php b/catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php deleted file mode 100644 index 16087e42f..000000000 --- a/catalog/addons/Loaded_7_Pro/admin/modules/product_attributes/product_classes.php +++ /dev/null @@ -1,45 +0,0 @@ -_section = 'dataManagementSettings'; - } - - public function setFunction($value) { - global $lC_Database, $lC_Language; - - $string = ''; - - if (defined('ADDONS_SYSTEM_LOADED_7_PRO_STATUS') && ADDONS_SYSTEM_LOADED_7_PRO_STATUS == '1') { - $Qclass = $lC_Database->query('select id, name from :table_product_classes where language_id = :language_id order by name'); - $Qclass->bindTable(':table_product_classes', TABLE_PRODUCT_CLASSES); - $Qclass->bindInt(':language_id', $lC_Language->getID()); - $Qclass->execute(); - - $classes = array(); - while ( $Qclass->next() ) { - $classes[] = array('id' => $Qclass->valueInt('id'), - 'text' => $Qclass->value('name')); - } - - if ( !empty($classes) ) { - $string = lc_draw_pull_down_menu('attributes[' . self::getID() . ']', $classes, $value, 'class="select full-width"'); - } - } - - return $string; - } -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/content/account/login.inc.php b/catalog/addons/Loaded_7_Pro/content/account/login.inc.php deleted file mode 100644 index 053cfed2d..000000000 --- a/catalog/addons/Loaded_7_Pro/content/account/login.inc.php +++ /dev/null @@ -1,67 +0,0 @@ -query('select user_password from :table_administrators'); - $Qadmin->bindTable(':table_administrators', TABLE_ADMINISTRATORS); - $Qadmin->execute(); - - $validated = false; - while ( $Qadmin->next()) { - if ( _validateAdminPassword($password, $Qadmin->value('user_password')) ) { - $validated = true; - break; - } - } - - return $validated; -} - -// check for admin session -if (isset($_SESSION['admin_login'])) unset($_SESSION['admin_login']); -if (validateAdminPassword($_POST['password'])) { - $_SESSION['admin_login'] = true; - } - } -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/controller.php b/catalog/addons/Loaded_7_Pro/controller.php deleted file mode 100644 index 069c3eb5c..000000000 --- a/catalog/addons/Loaded_7_Pro/controller.php +++ /dev/null @@ -1,288 +0,0 @@ -modCheck(DIR_FS_CATALOG . 'includes/classes/transport.php')); -if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/products/classes/products.php')); -if (file_exists(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php')) include_once($lC_Vqmod->modCheck(DIR_FS_CATALOG . 'addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php')); - -class Loaded_7_Pro extends lC_Addon { // your addon must extend lC_Addon - /* - * Class constructor - */ - public function Loaded_7_Pro() { - global $lC_Language, $lC_Database; - /** - * The addon type (category) - * valid types; payment, shipping, themes, checkout, catalog, admin, reports, connectors, other - */ - $this->_type = 'systems'; - /** - * The addon class name - */ - $this->_code = 'Loaded_7_Pro'; - /** - * The addon title used in the addons store listing - */ - $this->_title = $lC_Language->get('addon_system_pro_title'); - /** - * The addon description used in the addons store listing - */ - $this->_description = $lC_Language->get('addon_system_pro_description'); - /** - * The developers name - */ - $this->_author = 'Loaded Commerce, LLC'; - /** - * The developers web address - */ - $this->_authorWWW = 'http://www.loadedcommerce.com'; - /** - * The addon version - */ - $this->_version = '1.2.0'; - /** - * The Loaded 7 core compatibility version - */ - $this->_compatibility = '7.002.0.0'; // the addon is compatible with this core version and later - /** - * The base64 encoded addon image used in the addons store listing - */ - $this->_thumbnail = lc_image(DIR_WS_CATALOG . 'addons/' . $this->_code . '/images/loaded7_pro.png', $this->_title); - /** - * The addon enable/disable switch - */ - if (defined('INSTALLATION_ID') && INSTALLATION_ID != '') { - // if ($this->_timeToCheck() === true) { - // $this->_enabled = $this->_validateSerial(INSTALLATION_ID); - // if ($this->_enabled) $this->_updateLastChecked(); - // } else { - $this->_enabled = (defined('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS') && @constant('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS') == '1') ? true : false; - // } - // if (!$this->_enabled) { - // $lC_Database->simpleQuery("update " . TABLE_CONFIGURATION . " set configuration_value = '0' where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); - // } else { - // $lC_Database->simpleQuery("update " . TABLE_CONFIGURATION . " set configuration_value = '1' where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); - // } - } else { - $this->_enabled = false; - } - /** - * Automatically install the module - */ - $this->_auto_install = true; - } - /** - * Checks to see if the addon has been installed - * - * @access public - * @return boolean - */ - public function isInstalled() { - return (bool)defined('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); - } - /** - * Install the addon - * - * @access public - * @return void - */ - public function install() { - global $lC_Database; - - if (isset($_SESSION['remove_loaded_7_pro']) && $_SESSION['remove_loaded_7_pro'] == true) { - unset($_SESSION['remove_loaded_7_pro']); - $this->_clearCache(); - } else if (!$this->_checkStatus()) { - $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS'"); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Enable AddOn', 'ADDONS_SYSTEM_" . strtoupper($this->_code) . "_STATUS', '1', 'Do you want to enable this addon?', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())"); - $lC_Database->simpleQuery("delete from " . TABLE_TEMPLATES_BOXES . " where modules_group like '%Loaded_7_Pro%'"); - $lC_Database->simpleQuery("insert into " . TABLE_TEMPLATES_BOXES . " (title, code, author_name, author_www, modules_group) values ('Loaded 7 Pro', '" . $this->_type . "', '" . $this->_author . "','" . $this->_authorWWW . "', 'systems|Loaded_7_Pro')"); - // product classes - if (!defined('DEFAULT_PRODUCT_CLASSES_ID')) { - $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'DEFAULT_PRODUCT_CLASSES_ID'"); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('', 'DEFAULT_PRODUCT_CLASSES_ID', '1', '', '6', '0', '', '', now())"); - $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . DB_TABLE_PREFIX . "product_classes` (id int(11) NOT NULL AUTO_INCREMENT,`name` varchar(128) NOT NULL DEFAULT '', `comment` varchar(255) DEFAULT NULL, `status` tinyint(1) NOT NULL DEFAULT '0', language_id int(11) NOT NULL DEFAULT '1', PRIMARY KEY (id)) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci AUTO_INCREMENT=2;"); - $lC_Database->simpleQuery("delete from `" . DB_TABLE_PREFIX . "product_classes` where id = '1'"); - $lC_Database->simpleQuery("insert into `" . DB_TABLE_PREFIX . "product_classes` (id, name, comment, status, language_id) VALUES ('1', 'Common', 'Common Class', 1, 1);"); - $lC_Database->simpleQuery("delete from " . TABLE_TEMPLATES_BOXES . " where code = 'product_classes'"); - $lC_Database->simpleQuery("insert into " . TABLE_TEMPLATES_BOXES . " (title, code, author_name, author_www, modules_group) VALUES ('Product Classes', 'product_classes', 'Loaded Commerce, LLC', 'http://www.loadedcommerce.com', 'product_attributes')"); - $lC_Database->simpleQuery("alter table " . TABLE_PRODUCTS . " ADD `is_subproduct` TINYINT( 1 ) NOT NULL DEFAULT '0'"); - } - // skip shipping - if (!defined('SKIP_CHECKOUT_SHIPPING_PAGE')) { - $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'SKIP_CHECKOUT_SHIPPING_PAGE'"); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Skip Shipping Page', 'SKIP_CHECKOUT_SHIPPING_PAGE', '-1', 'Bypass the checkout shipping page? No shipping will be charged.', 19, 0, NULL, now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))')"); - } - // qty breaks config - if (!defined('PRODUCT_PRICING_QPB_FORMAT')) { - $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'PRODUCT_PRICING_QPB_FORMAT'"); - $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Price Break Format', 'PRODUCT_PRICING_QPB_FORMAT', 'Range', 'The price break format shown on the product listing pages.', 8, 11, NULL, now(), NULL, 'lc_cfg_set_boolean_value(array(''None'', ''Range'', ''Starts At'', ''Low As''))')"); - } - - $this->_clearCache(); - } - } - /** - * Return the configuration parameter keys an an array - * - * @access public - * @return array - */ - public function getKeys() { - global $lC_Database; - - if (!isset($this->_keys)) { - $this->_keys = array('ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); - } - - return $this->_keys; - } - /** - * Remove the addon - * - * @access public - * @return void - */ - public function remove() { - global $lC_Database, $lC_Language; - - if ($this->hasKeys()) { - $Qdel = $lC_Database->query('delete from :table_configuration where configuration_key in (":configuration_key")'); - $Qdel->bindTable(':table_configuration', TABLE_CONFIGURATION); - $Qdel->bindRaw(':configuration_key', implode('", "', $this->getKeys())); - $Qdel->execute(); - } - - if (file_exists(DIR_FS_CATALOG . 'addons/' . $this->_code . '/languages/' . $lC_Language->getCode() . '.xml')) { - foreach ($lC_Language->extractAddonDefinitions(DIR_FS_CATALOG . 'addons/' . $this->_code . '/languages/' . $lC_Language->getCode() . '.xml') as $def) { - $Qdel = $lC_Database->query('delete from :table_languages_definitions where definition_key = :definition_key and content_group = :content_group'); - $Qdel->bindTable(':table_languages_definitions', TABLE_LANGUAGES_DEFINITIONS); - $Qdel->bindValue(':definition_key', $def['key']); - $Qdel->bindValue(':content_group', $def['group']); - $Qdel->execute(); - } - } - // product classes - $lC_Database->simpleQuery("DROP TABLE IF EXISTS `" . DB_TABLE_PREFIX . "product_classes`"); - $lC_Database->simpleQuery("alter table " . TABLE_PRODUCTS . " DROP COLUMN `is_subproduct`"); - $lC_Database->simpleQuery("delete from " . TABLE_TEMPLATES_BOXES . " where modules_group like '%Loaded_7_Pro%'"); - $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'DEFAULT_PRODUCT_CLASSES_ID'"); - $lC_Database->simpleQuery("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'SKIP_CHECKOUT_SHIPPING_PAGE'"); - - $_SESSION['remove_loaded_7_pro'] = true; - - $this->_clearCache(); - } - /** - * Clear the cache - * - * @access public - * @return void - */ - private function _clearCache() { - lC_Cache::clear('configuration'); - lC_Cache::clear('languages'); - lC_Cache::clear('addons'); - lC_Cache::clear('vqmoda'); - } - /** - * Check the addon install status - * - * @access public - * @return void - */ - private function _checkStatus() { - $addons = ''; - if (file_exists('../includes/work/cache/addons.cache')) { - $addons = @file_get_contents('../includes/work/cache/addons.cache'); - } - - return (strstr($addons, 'Loaded_7_Pro/controller.php') != '') ? true : false; - } - /** - * Validate the serial is valid and active - * - * @access private - * @return boolean - */ - private function _validateSerial($serial) { - $result = array(); - $validateArr = array('serial' => $serial, - 'storeName' => STORE_NAME, - 'storeEmail' => STORE_OWNER_EMAIL_ADDRESS, - 'storeWWW' => HTTP_SERVER . DIR_WS_HTTP_CATALOG); - - $checksum = hash('sha256', json_encode($validateArr)); - $validateArr['checksum'] = $checksum; - - $resultXML = transport::getResponse(array('url' => 'https://api.loadedcommerce.com/1_0/check/serial/?product=pro', 'method' => 'post', 'parameters' => $validateArr)); - $result = utility::xml2arr($resultXML); - - if ($result['data']['error'] == '1') return false; - - return ($result['data']['valid'] == '1') ? true : false; - } - /** - * Check to see if it's time to re-check addon validity - * - * @access private - * @return boolean - */ - private function _timeToCheck() { - global $lC_Database; - - $itsTime = false; - - $today = substr(lC_DateTime::getShort(@date("Y-m-d H:m:s")), 3, 2); - - $instID = (defined('INSTALLATION_ID') && INSTALLATION_ID != '') ? INSTALLATION_ID : NULL; - if ($instID == NULL) return true; - - $last_checked = (isset($_SESSION['Loaded_7_Pro']['last_checked']) && $_SESSION['Loaded_7_Pro']['last_checked'] != NULL) ? $_SESSION['Loaded_7_Pro']['last_checked'] : NULL; - - if ($last_checked == NULL || $today != substr(lC_DateTime::getShort($last_checked), 3, 2)) { - - $itsTime = true; - - $Qcheck = $lC_Database->query('select last_modified from :table_configuration where configuration_key = :configuration_key'); - $Qcheck->bindTable(':table_configuration', TABLE_CONFIGURATION); - $Qcheck->bindValue(':configuration_key', 'ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); - $Qcheck->execute(); - - $last_checked = $Qcheck->value('last_modified'); - $_SESSION['Loaded_7_Pro']['last_checked'] = $last_checked; - - $Qcheck->freeResult(); - } - - return $itsTime; - } - /** - * Update the time last checked the install ID - * - * @access private - * @return void - */ - private function _updateLastChecked() { - global $lC_Database; - - $Qcheck = $lC_Database->query('update :table_configuration set last_modified = :last_modified where configuration_key = :configuration_key'); - $Qcheck->bindTable(':table_configuration', TABLE_CONFIGURATION); - $Qcheck->bindValue(':configuration_key', 'ADDONS_SYSTEM_' . strtoupper($this->_code) . '_STATUS'); - $Qcheck->bindRaw(':last_modified', 'now()'); - $Qcheck->execute(); - } -} -?> \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml b/catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml deleted file mode 100644 index 832693dfd..000000000 --- a/catalog/addons/Loaded_7_Pro/hooks/content_account_login.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Admin Login as Customer - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml b/catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml deleted file mode 100644 index 73ae92ab2..000000000 --- a/catalog/addons/Loaded_7_Pro/hooks/modules_variants_file_upload.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - File Upload - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml b/catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml deleted file mode 100644 index f276868ca..000000000 --- a/catalog/addons/Loaded_7_Pro/hooks/modules_variants_multiple_file_upload.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Multiple File Upload - 1.0.0 - 2.3.2 - loadedcommerce.com - - - - - - - \ No newline at end of file diff --git a/catalog/addons/Loaded_7_Pro/images/loaded7_pro.png b/catalog/addons/Loaded_7_Pro/images/loaded7_pro.png deleted file mode 100644 index 5529704c677ed7ee1095f75c7e7b683aa705f6cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3708 zcmaJ^dpy(o{~xkkBT7iDxus!-O&@$2`wy)TdF^Z9zdU$56cpC}tEGhqQ~0RR9Xj5WvDaz-1@ zi{=AzzKhDbEY2XsFmYtqQQa5;cp3>{NTj-wKv*)~on%YG6EFF-kk9}C57^V*k>Q9t zfg(`J>i8XudLY@C!{&(T2m0a(-XsRdmE`V8(FM;}R)ayFL|yP{I8FoSYfSR+G!LSY z?1HT92|?ZjBoVBy2SNv;I09r60}l!$`%vhpKwa=JT@+`&vke7Uty zjHxsd2(GTBM$mx4KnR37OdF0sz*Iq+8Zb?$2IoPj!L(6u1WHo}^v?z6M57ViP_`J; ze`0Y~x?m3m!xsgG1_T7C2WY8NY3@)M5{cZ=(9~4pAk^rWC=7g{8ig+ZTLD9&6KI~k z3{NTrw4;c3rTQ~;!5pXmIRe@DUs($MpEPk21`WjfLSgC}J4gBr#NqybD4F~(n$EB# z{nzjRDNMJ&YUuu?8G&qyaP3#=u}ET1YK8{Fo^m zW`xny#F!W(eseKYfkwi45QOTfRM@D)6(TkzU zANBs>694GM(DaX7D8~$Rr?CI4(7(4h-Lo_Ow{1C#e;c1f;dDEV)7FjF#xVeZzycOy zXdgH*>->Xm*Smjf_`UiWN6iauUK)L>Sf1wwT`Ig?+BFJ1<=UMs&>#0>tt^he?@$QA zY#yj7$7QA=xWw*;E5w!(jm{WpGFahXP1i37q57S3c;xorgX@z&_Z>=<*-K?vQahWxi{vH3KX>FI;vi4 z2R3@$-n@n3Hbw6-uGXLb>=IOTrDE{@Ldu;>``V(LG~=;S$r+?a1z}$ww}j^IzTWw= z^0QuqUUG>k;LTT~6s0!_^e5*8XC|=53D+cY)_|F7D~2;)jh0&X=b%uTF;YC6guhyH zV;1+Y(L>jI`gwH+L>|97)bcj@{@;@-Ru2JQ#5+y*49~jVL-MR9NjN^lh2_4M^}@+s zs|9^8qU3m_Hbe-TyHpD3riU9Dw3_N4xwhW~$dz|YMzZWnvajAsckrf`FZXc8Ok~DS zp|~(6kt?Q$H;+9uk0*OPpO<`eJb<*wiPpLOm56G8tQ{5*rr z@BB8Y7C|umu{bwulGqd_tHb-vmBm9aK&ZUiEpN;lg#< z8*=^Zvy#4)3yf174%kZ1^9qcx(Qr@VU-b`lwDU`!0 zMtj*sVcVf|d~CK{XXG9DOi$f2k|39^r%k!X+MJ=hR7s4S^5HbWQy;h?CEaVSkflnO z0nsyd4(H7hLUT7@_l)MN!lt9dvmi-+{=Rx!$38+FY7nGW05AtT_b^20bHif!>cm@! zCvl-Y&D{B=IX5-zE2FmmrRcE#On4*GK|FHqHe~NsFPG!NgJVO*c+tQ``c&uI@a4!1 z-QBOMzhtZbtC%FQrprD1`>ig9B&4!vil5Iy^54^LU5w2V7vfMRZCG*}# z>p^{4&~5bDnQyq`5o3w8p#7&?MEx&kuFp&_)n}SCtGi$>OsOk8IWJe`-C$9{XVBSj z+X=eQHKmTV{Csb@8hD);g@Z8bGl4o8|U+&R3sAgN`c(S@7*V23u938)FCMyu#r78$(w!(jPS(RT( zP1tR2T2rc>*ZrM+$A2=#wQ*DOyfQ=ilW2 zHprA+qVCablzG6r{4nF&uAmn^BNwH0k3W@PuVsEgIU5#9tHkatieg5JxhZ>}3mtPi z*TL;rM`ESi!iu;I@$|_nsmy|vt+QrUbVRd*lE^Gudsy+)Tofv|+TTc5)n04rS>KOk zK3Nn?;kL`s2ui$WS*^d{Q@PL@C*ZwPIT)1^Su0T?nX+@a@r=yLZiO8B=xIM&ZLrWj z_L#Ud_u*g*qke14!-k(7;tS2E6RbM}z90E=nyF!}a+0EW1YP-b-hd^>3SkFzlRw&s z*1;`9`1ILD2}UXXsk779Bm`QA@SyEi+yQ*XV zc0qC-B>iTfNl@?*YS*pQYCr=v!Wui>#m#j`VN?6IaW3XXLx$Pw4S`^@7z1miyzzzX ziy!h+hsG9)2A{`Ojgk9fr+W{?c~qaiKuRSRA5ts3FQcpElzcwPudiTYcbYYt%goMh ztn85j%hpX|21Dyx2B{rt6V^k!DL2m}~ngM1TBnzVKMkf0JCBgZ5+ z?>TYxTZMCf^TF{mrIIU9YEzp2&%HzQ^AVL5{s5xa9Is&K!r(}a>2O@Z;TZ1pdxRkQ zpYL>;(l4t4Xw8vVo2&AMD;i}Ehvx9tUHsIXx5{R76Qv-R0r?`x8+!^Wf!I>5q03wR z2fjER^2|~sFeMvGpjFp)MbMOQlfIpO=Gs;8q%J)mbM#D=WJi)4W}qVyK{ukcQ*My2 z1moGbt}fil<#)|;#_urEE}u6S$6&?N3MT$2+T@44iK}1F#`0>p*jhk=uw|A)i{a+M zK^0hcef3g*>VuLdgwGFnd@UeI@27cw8vi|=`Z)J6)e1e@$6{hI`mE}tI-q|>X2-hyjD5XseQtMGq z_rUFkCNiKK86mRl?N`@ho?Qf6DLU6r;udV=fZ6*%uUs9GsujS`-BWQupG9?51}XILE=moj!LlK8y&Vtz=UE#=VDcEVBl4W#MC8+YNh z^eb9?<YStWW^1|4}sQRD#0^+3cE!cyXOEi>R>Y>z~Q zf>FAr=~EN2^sLGJ*fDKIZ)tsRpIJkb?Q+Ao1-scq&kEKl&`_5+R^`);@_y4Bx()*P zj_!O#w&hl~_m^k>yp2`yuum|qdLu=bjoT!|EV(qw>3m9Gs;E{6Q)rc6xHw+8)!GeR zBq6jn@*AzZan0gZJHSEY{JaR|V_v~VuB`;`E$=Mzw_nk@ZwOu~Fw4wsuj-ubMszK>VkMb$O+LcJDy5(7^ziVnB#uPO+ReXvkD zesq59Q;~&>zT1Y%jmK@k7@xOgu=P0|!agqTZCV`vXg05nPDx;=f-9|4Xv|EyPU*T5 z4-QZr(f;%7h7wOT3~*QUuF#bnz+Jw(*ol+O;& - - - - addon_system_pro_title - - checkout - - - addon_system_pro_description - - checkout - - - text_admin_session_active - - general - - - \ No newline at end of file From ac174798f986b382c914aea9645a0d7201818301 Mon Sep 17 00:00:00 2001 From: datazen Date: Sun, 24 Aug 2014 14:18:15 -0400 Subject: [PATCH 128/168] updated version.txt --- catalog/includes/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/includes/version.txt b/catalog/includes/version.txt index 6f3ac2bfa..18c17c5a8 100644 --- a/catalog/includes/version.txt +++ b/catalog/includes/version.txt @@ -1 +1 @@ -7.002.5.0|07/15/2014 +7.002.5.0|08/27/2014 From 368dd2c2810a3bf08e58e6289abf82b51b78764d Mon Sep 17 00:00:00 2001 From: datazen Date: Sun, 24 Aug 2014 15:17:44 -0400 Subject: [PATCH 129/168] fixed product.js error --- .../applications/products/js/products.js.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/catalog/admin/includes/applications/products/js/products.js.php b/catalog/admin/includes/applications/products/js/products.js.php index e440f6ef4..bf1f6d19b 100644 --- a/catalog/admin/includes/applications/products/js/products.js.php +++ b/catalog/admin/includes/applications/products/js/products.js.php @@ -7,9 +7,18 @@ @copyright Template built on Developr theme by DisplayInline http://themeforest.net/user/displayinline under Extended license @license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt @version $Id: products.js.php v1.0 2013-08-08 datazen $ -*/ +*/ global $lC_Template, $lC_Language, $lC_Image, $pInfo; if (!empty($_GET['action']) && ($_GET['action'] == 'save')) { // edit a product + + class lC_Products_pro_Admin { + public static function hasComboOptions() {} + } + + $has_options = false; + if (isset($pInfo) && method_exists('lC_Products_pro_Admin', "hasComboOptions") && method_exists('lC_Products_pro_Admin', "hasSubProducts")) { + $has_options = (lC_Products_pro_Admin::hasComboOptions($pInfo->get('products_id')) || lC_Products_pro_Admin::hasSubProducts($pInfo->get('products_id'))) ? 1 : 0; + } ?>