diff --git a/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
index 5e8d4e00d..98e1aeda6 100755
--- a/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
@@ -41,7 +41,7 @@
{foreach from=$categories item='category'}
- {$category.name}
+ ({$category.id_category|intval}) {$category.name}
{/foreach}
diff --git a/classes/Cart.php b/classes/Cart.php
index 71b9eaee4..4ad99456e 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -340,6 +340,7 @@ class CartCore extends ObjectModel
'.($filter == CartRule::FILTER_ACTION_SHIPPING ? 'AND free_shipping = 1' : '').'
'.($filter == CartRule::FILTER_ACTION_GIFT ? 'AND gift_product != 0' : '').'
'.($filter == CartRule::FILTER_ACTION_REDUCTION ? 'AND (reduction_percent != 0 OR reduction_amount != 0)' : '')
+ .' ORDER by cr.priority ASC'
);
Cache::store($cache_key, $result);
}
@@ -1260,7 +1261,7 @@ class CartCore extends ObjectModel
return true;
}
- public static function getTotalCart($id_cart, $use_tax_display = false, $type = CART::BOTH)
+ public static function getTotalCart($id_cart, $use_tax_display = false, $type = Cart::BOTH)
{
$cart = new Cart($id_cart);
if (!Validate::isLoadedObject($cart))
diff --git a/classes/Language.php b/classes/Language.php
index e90700112..ce3762ab2 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -691,6 +691,7 @@ class LanguageCore extends ObjectModel
// Initialize the language
$lang = new Language();
$lang->iso_code = $iso_code;
+ $lang->language_code = $iso_code;
$lang->active = true;
// If the language pack has not been provided, retrieve it from prestashop.com
@@ -700,13 +701,15 @@ class LanguageCore extends ObjectModel
// If a language pack has been found or provided, prefill the language object with the value
if ($lang_pack)
foreach (get_object_vars($lang_pack) as $key => $value)
- $lang->$key = $value;
+ if ($key != 'iso_code' && isset(Language::$definition['fields'][$key]))
+ $lang->$key = $value;
// Use the values given in parameters to override the data retrieved automatically
if ($params_lang !== null && is_array($params_lang))
foreach ($params_lang as $key => $value)
- $lang->$key = $value;
-
+ if ($key != 'iso_code' && isset(Language::$definition['fields'][$key]))
+ $lang->$key = $value;
+
if (!$lang->add(true, false, $only_add))
return false;
@@ -724,7 +727,7 @@ class LanguageCore extends ObjectModel
}
else
Language::_copyNoneFlag((int)$lang->id);
-
+
$files_copy = array(
'/en.jpg',
'/en-default-'.ImageType::getFormatedName('thickbox').'.jpg',
@@ -734,7 +737,7 @@ class LanguageCore extends ObjectModel
'/en-default-'.ImageType::getFormatedName('small').'.jpg',
'/en-default-'.ImageType::getFormatedName('scene').'.jpg'
);
-
+
foreach (array(_PS_CAT_IMG_DIR_, _PS_MANU_IMG_DIR_, _PS_PROD_IMG_DIR_, _PS_SUPP_IMG_DIR_) as $to)
foreach ($files_copy as $file)
@copy(dirname(__FILE__).'/../img/l'.$file, $to.str_replace('/en', '/'.$iso_code, $file));
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index 022e580ec..9d638ecd3 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -399,6 +399,8 @@ abstract class PaymentModuleCore extends Module
} // end foreach ($products)
$cart_rules_list = '';
+ $total_reduction_value_ti = 0;
+ $total_reduction_value_tex = 0;
foreach ($cart_rules as $cart_rule)
{
$package = array('id_carrier' => $order->id_carrier, 'id_address' => $order->id_address_delivery, 'products' => $order->product_list);
@@ -419,7 +421,8 @@ abstract class PaymentModuleCore extends Module
** THEN
** The voucher is cloned with a new value corresponding to the remainder
*/
- if (count($order_list) == 1 && $values['tax_incl'] > $order->total_products_wt && $cart_rule['obj']->partial_use == 1 && $cart_rule['obj']->reduction_amount > 0)
+
+ if (count($order_list) == 1 && $values['tax_incl'] > ($order->total_products_wt - $total_reduction_value_ti) && $cart_rule['obj']->partial_use == 1 && $cart_rule['obj']->reduction_amount > 0)
{
// Create a new voucher from the original
$voucher = new CartRule($cart_rule['obj']->id); // We need to instantiate the CartRule without lang parameter to allow saving it
@@ -432,9 +435,9 @@ abstract class PaymentModuleCore extends Module
// Set the new voucher value
if ($voucher->reduction_tax)
- $voucher->reduction_amount = $values['tax_incl'] - $order->total_products_wt - ($voucher->free_shipping == 1 ? $order->total_shipping_tax_incl : 0);
+ $voucher->reduction_amount = $values['tax_incl'] - ($order->total_products_wt - $total_reduction_value_ti) - ($voucher->free_shipping == 1 ? $order->total_shipping_tax_incl : 0);
else
- $voucher->reduction_amount = $values['tax_excl'] - $order->total_products - ($voucher->free_shipping == 1 ? $order->total_shipping_tax_excl : 0);
+ $voucher->reduction_amount = $values['tax_excl'] - ($order->total_products - $total_reduction_value_tex) - ($voucher->free_shipping == 1 ? $order->total_shipping_tax_excl : 0);
$voucher->id_customer = $order->id_customer;
$voucher->quantity = 1;
@@ -466,7 +469,10 @@ abstract class PaymentModuleCore extends Module
$values['tax_incl'] -= $values['tax_incl'] - $order->total_products_wt;
$values['tax_excl'] -= $values['tax_excl'] - $order->total_products;
+
}
+ $total_reduction_value_ti += $values['tax_incl'];
+ $total_reduction_value_tex += $values['tax_excl'];
$order->addCartRule($cart_rule['obj']->id, $cart_rule['obj']->name, $values, 0, $cart_rule['obj']->free_shipping);
diff --git a/classes/Product.php b/classes/Product.php
index 5c91ccb90..b43e19015 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -1368,8 +1368,8 @@ class ProductCore extends ObjectModel
}
$product_supplier->product_supplier_reference = pSQL($supplier_reference);
- $product_supplier->product_supplier_price_te = (float)$price;
- $product_supplier->id_currency = (int)$id_currency;
+ $product_supplier->product_supplier_price_te = !is_null($price) ? (float)$price : (float)$product_supplier->product_supplier_price_te;
+ $product_supplier->id_currency = !is_null($id_currency) ? (int)$id_currency : (int)$product_supplier->id_currency;
$product_supplier->save();
}
}
@@ -3160,8 +3160,9 @@ class ProductCore extends ObjectModel
LEFT JOIN `'._DB_PREFIX_.'manufacturer` m ON (p.`id_manufacturer`= m.`id_manufacturer`)
'.Product::sqlStock('p', 0).'
WHERE `id_product_1` = '.(int)$this->id.
- ($active ? ' AND product_shop.`active` = 1' : '').'
+ ($active ? ' AND product_shop.`active` = 1 AND product_shop.`visibility` != \'none\'' : '').'
GROUP BY product_shop.id_product';
+
if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql))
return false;
foreach ($result as &$row)
diff --git a/classes/ProductSale.php b/classes/ProductSale.php
index 2f8166a4d..2e6d2973c 100644
--- a/classes/ProductSale.php
+++ b/classes/ProductSale.php
@@ -103,7 +103,7 @@ class ProductSaleCore
LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.`id_tax` = tr.`id_tax`)
'.Product::sqlStock('p').'
WHERE product_shop.`active` = 1
- AND p.`visibility` != \'none\'
+ AND product_shop.`visibility` != \'none\'
AND p.`id_product` IN (
SELECT cp.`id_product`
FROM `'._DB_PREFIX_.'category_group` cg
@@ -156,7 +156,7 @@ class ProductSaleCore
ON cl.`id_category` = product_shop.`id_category_default`
AND cl.`id_lang` = '.(int)$id_lang.Shop::addSqlRestrictionOnLang('cl').'
WHERE product_shop.`active` = 1
- AND p.`visibility` != \'none\'
+ AND product_shop.`visibility` != \'none\'
AND p.`id_product` IN (
SELECT cp.`id_product`
FROM `'._DB_PREFIX_.'category_group` cg
diff --git a/classes/SpecificPrice.php b/classes/SpecificPrice.php
index 27475c771..ca3795f41 100644
--- a/classes/SpecificPrice.php
+++ b/classes/SpecificPrice.php
@@ -169,7 +169,8 @@ class SpecificPriceCore extends ObjectModel
$priority = SpecificPrice::getPriority($id_product);
foreach (array_reverse($priority) as $k => $field)
- $select .= ' IF (`'.bqSQL($field).'` = '.(int)$$field.', '.pow(2, $k + 1).', 0) + ';
+ if (!empty($field))
+ $select .= ' IF (`'.bqSQL($field).'` = '.(int)$$field.', '.pow(2, $k + 1).', 0) + ';
return rtrim($select, ' +').') AS `score`';
}
@@ -228,7 +229,7 @@ class SpecificPriceCore extends ObjectModel
(`to` = \'0000-00-00 00:00:00\' OR \''.$now.'\' <= `to`)
)
AND id_cart IN (0, '.(int)$id_cart.')'.
- (($real_quantity != 0 && !Configuration::get('PS_QTY_DISCOUNT_ON_COMBINATION')) ? ' AND IF(`from_quantity` > 1, `from_quantity`, 0) <= IF(id_product_attribute=0,'.(int)$quantity.' ,'.(int)$real_quantity.')' : 'AND `from_quantity` <= '.(int)$real_quantity).'
+ (($real_quantity != 0 && !Configuration::get('PS_QTY_DISCOUNT_ON_COMBINATION')) ? ' AND IF(`from_quantity` > 1, `from_quantity`, 0) <= IF(id_product_attribute=0,'.(int)$quantity.' ,'.(int)$real_quantity.')' : 'AND `from_quantity` <= '.max(1, (int)$real_quantity)).'
ORDER BY `id_product_attribute` DESC, `from_quantity` DESC, `id_specific_price_rule` ASC, `score` DESC');
}
return self::$_specificPriceCache[$key];
diff --git a/classes/Tools.php b/classes/Tools.php
index 9a68d7685..343eb070b 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -494,6 +494,20 @@ class ToolsCore
if (($is_negative = ($price < 0)))
$price *= -1;
$price = Tools::ps_round($price, $c_decimals);
+
+ /*
+ * If the language is RTL and the selected currency format contains spaces as thousands separator
+ * then the number will be printed in reverse since the space is interpreted as separating words.
+ * To avoid this we replace the currency format containing a space with the one containing a comma (,) as thousand
+ * separator when the language is RTL.
+ *
+ * TODO: This is not ideal, a currency format should probably be tied to a language, not to a currency.
+ */
+ if(($c_format == 2) && ($context->language->is_rtl == 1))
+ {
+ $c_format = 4;
+ }
+
switch ($c_format)
{
/* X 0,000.00 */
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 1cb676e22..00ddd5964 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -654,7 +654,7 @@ class AdminControllerCore extends Controller
'export_content' => $content
)
);
-
+
$this->layout = 'layout-export.tpl';
}
@@ -2112,6 +2112,7 @@ class AdminControllerCore extends Controller
*/
public function getList($id_lang, $order_by = null, $order_way = null, $start = 0, $limit = null, $id_lang_shop = false)
{
+
if (!isset($this->list_id))
$this->list_id = $this->table;
@@ -2166,12 +2167,20 @@ class AdminControllerCore extends Controller
$order_by = $this->fields_list[$order_by]['order_key'];
/* Determine offset from current page */
+
+
if ((isset($_POST['submitFilter'.$this->list_id]) ||
isset($_POST['submitFilter'.$this->list_id.'_x']) ||
isset($_POST['submitFilter'.$this->list_id.'_y'])) &&
!empty($_POST['submitFilter'.$this->list_id]) &&
is_numeric($_POST['submitFilter'.$this->list_id]))
$start = ((int)$_POST['submitFilter'.$this->list_id] - 1) * $limit;
+ elseif (empty($start) && isset($this->context->cookie->{$this->list_id.'_start'}) && Tools::isSubmit('export'.$this->table))
+ $start = $this->context->cookie->{$this->list_id.'_start'};
+ else
+ $start = $this->_listTotal;
+
+ $this->context->cookie->{$this->list_id.'_start'} = $start;
/* Cache */
$this->_lang = (int)$id_lang;
@@ -2241,8 +2250,6 @@ class AdminControllerCore extends Controller
$having_clause .= $this->_having.' ';
}
-
-
$this->_listsql = '
SELECT SQL_CALC_FOUND_ROWS
'.($this->_tmpTableFilter ? ' * FROM (SELECT ' : '');
diff --git a/classes/controller/ModuleFrontController.php b/classes/controller/ModuleFrontController.php
index f2db4a085..437fad571 100644
--- a/classes/controller/ModuleFrontController.php
+++ b/classes/controller/ModuleFrontController.php
@@ -60,7 +60,7 @@ class ModuleFrontControllerCore extends FrontController
elseif (Tools::file_exists_cache($this->getTemplatePath().$template))
$this->template = $this->getTemplatePath().$template;
else
- throw new PrestaShopException("Template '$template'' not found");
+ throw new PrestaShopException("Template '$template' not found");
}
/**
diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php
index 31614f2c5..4e4e0d2ab 100644
--- a/classes/order/OrderInvoice.php
+++ b/classes/order/OrderInvoice.php
@@ -243,7 +243,7 @@ class OrderInvoiceCore extends ObjectModel
WHERE od.`id_order` = '.(int)$this->id_order.'
AND od.`id_order_invoice` = '.(int)$this->id.'
AND od.`tax_computation_method` = '.(int)TaxCalculator::ONE_AFTER_ANOTHER_METHOD
- );
+ ) || Configuration::get('PS_INVOICE_TAXES_BREAKDOWN');
}
/**
@@ -301,7 +301,7 @@ class OrderInvoiceCore extends ObjectModel
{
// sum by order details in order to retrieve real taxes rate
$taxes_infos = Db::getInstance()->executeS('
- SELECT odt.`id_order_detail`, t.`rate` AS `name`, SUM(od.`total_price_tax_excl`) AS total_price_tax_excl, SUM(t.`rate`) AS rate, SUM(`total_amount`) AS `total_amount`, od.`ecotax`, od.`ecotax_tax_rate`, od.`product_quantity`
+ SELECT odt.`id_order_detail`, t.`rate` AS `name`, od.`total_price_tax_excl` AS total_price_tax_excl, SUM(t.`rate`) AS rate, SUM(`total_amount`) AS `total_amount`, od.`ecotax`, od.`ecotax_tax_rate`, od.`product_quantity`
FROM `'._DB_PREFIX_.'order_detail_tax` odt
LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.`id_tax` = odt.`id_tax`)
LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON (od.`id_order_detail` = odt.`id_order_detail`)
diff --git a/classes/webservice/WebserviceRequest.php b/classes/webservice/WebserviceRequest.php
index 2dca1bdb3..5e4ec0b3f 100644
--- a/classes/webservice/WebserviceRequest.php
+++ b/classes/webservice/WebserviceRequest.php
@@ -1187,7 +1187,7 @@ class WebserviceRequestCore
else
{
$object = new $this->resourceConfiguration['retrieveData']['className']();
- if ($object->isMultiShopField($this->resourceConfiguration['fields'][$fieldName]['sqlId']))
+ if ($object->isMultiShopField($this->resourceConfiguration['fields'][$fieldName]['sqlId']) || $fieldName == 'id')
$table_alias = 'multi_shop_'.$this->resourceConfiguration['retrieveData']['table'];
else
$table_alias = '';
diff --git a/controllers/admin/AdminAttributesGroupsController.php b/controllers/admin/AdminAttributesGroupsController.php
index 80d665edb..2ddc03360 100644
--- a/controllers/admin/AdminAttributesGroupsController.php
+++ b/controllers/admin/AdminAttributesGroupsController.php
@@ -264,7 +264,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
'input' => array(
array(
'type' => 'select',
- 'label' => $this->l('Attribute type:'),
+ 'label' => $this->l('Attribute group:'),
'name' => 'id_attribute_group',
'required' => true,
'options' => array(
@@ -272,7 +272,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
'id' => 'id_attribute_group',
'name' => 'name'
),
- 'desc' => $this->l('Choose the type of the attribute')
+ 'desc' => $this->l('Choose the group of the attribute')
),
array(
'type' => 'text',
diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index b4c5bf35c..32e01834a 100755
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -684,18 +684,21 @@ class AdminCartsControllerCore extends AdminController
$free_shipping = true;
break;
}
- return array('summary' => $this->getCartSummary(),
- 'delivery_option_list' => $this->getDeliveryOptionList(),
- 'cart' => $this->context->cart,
- 'addresses' => $this->context->customer->getAddresses((int)$this->context->cart->id_lang),
- 'id_cart' => $id_cart,
- 'order_message' => $message_content,
- 'link_order' => $this->context->link->getPageLink(
- 'order', false,
- (int)$this->context->cart->id_lang,
- 'step=3&recover_cart='.$id_cart.'&token_cart='.md5(_COOKIE_KEY_.'recover_cart_'.$id_cart)),
- 'free_shipping' => (int)$free_shipping
- );
+ return array(
+ 'summary' => $this->getCartSummary(),
+ 'delivery_option_list' => $this->getDeliveryOptionList(),
+ 'cart' => $this->context->cart,
+ 'currency' => new Currency($this->context->cart->id_currency),
+ 'addresses' => $this->context->customer->getAddresses((int)$this->context->cart->id_lang),
+ 'id_cart' => $id_cart,
+ 'order_message' => $message_content,
+ 'link_order' => $this->context->link->getPageLink(
+ 'order', false,
+ (int)$this->context->cart->id_lang,
+ 'step=3&recover_cart='.$id_cart.'&token_cart='.md5(_COOKIE_KEY_.'recover_cart_'.$id_cart)
+ ),
+ 'free_shipping' => (int)$free_shipping
+ );
}
public function initToolbar()
diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php
index 007bd38b0..7579370c7 100644
--- a/controllers/admin/AdminGroupsController.php
+++ b/controllers/admin/AdminGroupsController.php
@@ -30,6 +30,7 @@ class AdminGroupsControllerCore extends AdminController
{
$this->table = 'group';
$this->className = 'Group';
+ $this->list_id = 'group';
$this->lang = true;
$this->addRowAction('edit');
$this->addRowAction('view');
@@ -153,6 +154,16 @@ class AdminGroupsControllerCore extends AdminController
if (Tools::isSubmit('changeShowPricesVal') && $this->id_object)
$this->action = 'change_show_prices_val';
+ if (Tools::getIsset('viewgroup'))
+ {
+ $this->list_id = 'customer_group';
+
+ if (isset($_POST['submitReset'.$this->list_id]))
+ $this->processResetFilters();
+ }
+ else
+ $this->list_id = 'group';
+
parent::initProcess();
}
@@ -181,30 +192,29 @@ class AdminGroupsControllerCore extends AdminController
$genders_icon[$gender->id] = '../genders/'.(int)$gender->id.'.jpg';
$genders[$gender->id] = $gender->name;
}
- $customer_fields_display = (array(
- 'id_customer' => array('title' => $this->l('ID'), 'width' => 15, 'align' => 'center'),
+ $this->table = 'customer_group';
+ $this->lang = false;
+ $this->list_id = 'customer_group';
+ $this->actions = array();
+ $this->bulk_actions = false;
+ $this->no_link = true;
+ $this->fields_list = (array(
+ 'id_customer' => array('title' => $this->l('ID'), 'width' => 15, 'align' => 'center', 'filter_key' => 'c!id_customer'),
'id_gender' => array('title' => $this->l('Titles'), 'align' => 'center', 'width' => 50,'icon' => $genders_icon, 'list' => $genders),
- 'firstname' => array('title' => $this->l('Name'), 'align' => 'center'),
- 'lastname' => array('title' => $this->l('Name'), 'align' => 'center'),
- 'email' => array('title' => $this->l('Email address'), 'width' => 150, 'align' => 'center'),
+ 'firstname' => array('title' => $this->l('First name'), 'align' => 'center'),
+ 'lastname' => array('title' => $this->l('Last name'), 'align' => 'center'),
+ 'email' => array('title' => $this->l('Email address'), 'width' => 150, 'align' => 'center', 'filter_key' => 'c!email', 'orderby' => true),
'birthday' => array('title' => $this->l('Birth date'), 'width' => 150, 'align' => 'right', 'type' => 'date'),
'date_add' => array('title' => $this->l('Register date'), 'width' => 150, 'align' => 'right', 'type' => 'date'),
- 'orders' => array('title' => $this->l('Orders'), 'align' => 'center'),
'active' => array('title' => $this->l('Enabled'),'align' => 'center','width' => 20, 'active' => 'status','type' => 'bool')
));
- $customer_list = $group->getCustomers(false, 0, 100, true);
-
- $helper = new HelperList();
- $helper->currentIndex = Context::getContext()->link->getAdminLink('AdminCustomers', false);
- $helper->token = Tools::getAdminTokenLite('AdminCustomers');
- $helper->shopLinkType = '';
- $helper->table = 'customer';
- $helper->identifier = 'id_customer';
- $helper->actions = array('edit', 'view');
- $helper->show_toolbar = false;
-
- return $helper->generateList($customer_list, $customer_fields_display);
+ $this->_select = 'c.*';
+ $this->_join = 'LEFT JOIN `'._DB_PREFIX_.'customer` c ON (a.`id_customer` = c.`id_customer`)';
+ $this->_where = 'AND a.`id_group` = '.(int)$group->id.' AND c.`deleted` != 1';
+ self::$currentIndex = self::$currentIndex.'&viewgroup';
+ $this->processFilter();
+ return parent::renderList();
}
public function renderForm()
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index 8d8b81c6b..4087f8c6c 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -513,7 +513,7 @@ class AdminImportControllerCore extends AdminController
$this->context->cookie->entity_selected = (int)Tools::getValue('entity');
- if ($csv_selected = Tools::getValue('csv'))
+ if (Tools::getValue('csv'))
$this->context->cookie->csv_selected = Tools::getValue('csv');
$this->tpl_view_vars = array(
@@ -670,7 +670,8 @@ class AdminImportControllerCore extends AdminController
$fd = fopen($uniqid_path, 'r');
$tab = fgetcsv($fd, MAX_LINE_SIZE, $separator);
fclose($fd);
- unlink($uniqid_path);
+ if (file_exists($uniqid_path))
+ @unlink($uniqid_path);
}
if (empty($tab) || (!is_array($tab)))
@@ -928,7 +929,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$category_to_create->name[$default_language_id],
- (isset($category_to_create->id) ? $category_to_create->id : 'null')
+ (isset($category_to_create->id) && !empty($category_to_create->id))? $category_to_create->id : 'null'
);
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError();
@@ -961,7 +962,7 @@ class AdminImportControllerCore extends AdminController
$this->warnings[] = sprintf(
Tools::displayError('Rewrite link for %1$s (ID: %2$s) was re-written as %3$s.'),
$bak,
- (isset($info['id']) ? $info['id'] : 'null'),
+ (isset($info['id']) && !empty($info['id']))? $info['id'] : 'null',
$category->link_rewrite[$default_language_id]
);
$res = false;
@@ -1009,8 +1010,8 @@ class AdminImportControllerCore extends AdminController
{
$this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
- (isset($info['name']) ? Tools::safeOutput($info['name']) : 'No Name'),
- (isset($info['id']) ? Tools::safeOutput($info['id']) : 'No ID')
+ (isset($info['name']) && !empty($info['name']))? Tools::safeOutput($info['name']) : 'No Name',
+ (isset($info['id']) && !empty($info['id']))? Tools::safeOutput($info['id']) : 'No ID'
);
$error_tmp = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').Db::getInstance()->getMsgError();
if ($error_tmp != '')
@@ -1067,13 +1068,23 @@ class AdminImportControllerCore extends AdminController
if (Tools::getValue('forceIDs') && isset($info['id']) && (int)$info['id'])
$product = new Product((int)$info['id']);
- else
+ elseif (Tools::getValue('match_ref') && array_key_exists('reference', $info))
{
- if (array_key_exists('id', $info) && (int)$info['id'] && Product::existsInDatabase((int)$info['id'], 'product'))
- $product = new Product((int)$info['id']);
- else
- $product = new Product();
+ $datas = Db::getInstance()->getRow('
+ SELECT p.`id_product`
+ FROM `'._DB_PREFIX_.'product` p
+ '.Shop::addSqlAssociation('product', 'p').'
+ WHERE p.`reference` = "'.pSQL($info['reference']).'"
+ ');
+ if (isset($datas['id_product']) && $datas['id_product'])
+ $product = new Product((int)$datas['id_product']);
+ else
+ $product = new Product();
}
+ elseif (array_key_exists('id', $info) && (int)$info['id'] && Product::existsInDatabase((int)$info['id'], 'product'))
+ $product = new Product((int)$info['id']);
+ else
+ $product = new Product();
if (array_key_exists('id', $info) && (int)$info['id'] && Product::existsInDatabase((int)$info['id'], 'product'))
{
@@ -1138,7 +1149,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$manufacturer->name,
- (isset($manufacturer->id) ? $manufacturer->id : 'null')
+ (isset($manufacturer->id) && !empty($manufacturer->id))? $manufacturer->id : 'null'
);
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError();
@@ -1169,7 +1180,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$supplier->name,
- (isset($supplier->id) ? $supplier->id : 'null')
+ (isset($supplier->id) && !empty($supplier->id))? $supplier->id : 'null'
);
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError();
@@ -1215,7 +1226,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$category_to_create->name[$default_language_id],
- (isset($category_to_create->id) ? $category_to_create->id : 'null')
+ (isset($category_to_create->id) && !empty($category_to_create->id))? $category_to_create->id : 'null'
);
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError();
@@ -1247,7 +1258,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$category_to_create->name[$default_language_id],
- (isset($category_to_create->id) ? $category_to_create->id : 'null')
+ (isset($category_to_create->id) && !empty($category_to_create->id))? $category_to_create->id : 'null'
);
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError();
@@ -1259,7 +1270,7 @@ class AdminImportControllerCore extends AdminController
$product->id_category_default = isset($product->id_category[0]) ? (int)$product->id_category[0] : '';
- $link_rewrite = (is_array($product->link_rewrite) && count($product->link_rewrite)) ? trim($product->link_rewrite[$id_lang]) : '';
+ $link_rewrite = (is_array($product->link_rewrite) && isset($product->link_rewrite[$id_lang])) ? trim($product->link_rewrite[$id_lang]) : '';
$valid_link = Validate::isLinkRewrite($link_rewrite);
@@ -1274,11 +1285,11 @@ class AdminImportControllerCore extends AdminController
$this->warnings[] = sprintf(
Tools::displayError('Rewrite link for %1$s (ID: %2$s) was re-written as %3$s.'),
$product->name[$id_lang],
- (isset($info['id']) ? $info['id'] : 'null'),
+ (isset($info['id']) && !empty($info['id']))? $info['id'] : 'null',
$link_rewrite
);
- if (!Tools::getValue('match_ref') || !(is_array($product->link_rewrite) && count($product->link_rewrite)))
+ if (!Tools::getValue('match_ref') || !(is_array($product->link_rewrite) && count($product->link_rewrite) && !empty($product->link_rewrite[$id_lang])))
$product->link_rewrite = AdminImportController::createMultiLangField($link_rewrite);
// replace the value of separator by coma
@@ -1311,7 +1322,7 @@ class AdminImportControllerCore extends AdminController
SELECT product_shop.`date_add`, p.`id_product`
FROM `'._DB_PREFIX_.'product` p
'.Shop::addSqlAssociation('product', 'p').'
- WHERE p.`reference` = "'.$product->reference.'"
+ WHERE p.`reference` = "'.pSQL($product->reference).'"
');
$product->id = (int)$datas['id_product'];
$product->date_add = pSQL($datas['date_add']);
@@ -1357,8 +1368,8 @@ class AdminImportControllerCore extends AdminController
{
$this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
- (isset($info['name']) ? Tools::safeOutput($info['name']) : 'No Name'),
- (isset($info['id']) ? Tools::safeOutput($info['id']) : 'No ID')
+ (isset($info['name']) && !empty($info['name']))? Tools::safeOutput($info['name']) : 'No Name',
+ (isset($info['id']) && !empty($info['id']))? Tools::safeOutput($info['id']) : 'No ID'
);
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError();
@@ -1384,31 +1395,67 @@ class AdminImportControllerCore extends AdminController
}
// SpecificPrice (only the basic reduction feature is supported by the import)
- if ((isset($info['reduction_price']) && $info['reduction_price'] > 0) || (isset($info['reduction_percent']) && $info['reduction_percent'] > 0))
- {
- $specific_price = new SpecificPrice();
- $specific_price->id_product = (int)$product->id;
- // @todo multishop specific price import
- $specific_price->id_shop = $this->context->shop->id;
- $specific_price->id_currency = 0;
- $specific_price->id_country = 0;
- $specific_price->id_group = 0;
- $specific_price->price = -1;
- $specific_price->id_customer = 0;
- $specific_price->from_quantity = 1;
- $specific_price->reduction = (isset($info['reduction_price']) && $info['reduction_price']) ? $info['reduction_price'] : $info['reduction_percent'] / 100;
- $specific_price->reduction_type = (isset($info['reduction_price']) && $info['reduction_price']) ? 'amount' : 'percentage';
- $specific_price->from = (isset($info['reduction_from']) && Validate::isDate($info['reduction_from'])) ? $info['reduction_from'] : '0000-00-00 00:00:00';
- $specific_price->to = (isset($info['reduction_to']) && Validate::isDate($info['reduction_to'])) ? $info['reduction_to'] : '0000-00-00 00:00:00';
- if (!$specific_price->add())
- $this->addProductWarning(Tools::safeOutput($info['name']), $product->id, $this->l('Discount is invalid'));
- }
+ if (!Shop::isFeatureActive())
+ $info['shop'] = 1;
+ elseif (!isset($info['shop']) || empty($info['shop']))
+ $info['shop'] = implode($this->multiple_value_separator, Shop::getContextListShopID());
+
+ // Get shops for each attributes
+ $info['shop'] = explode($this->multiple_value_separator, $info['shop']);
+
+ $id_shop_list = array();
+ foreach ($info['shop'] as $shop)
+ if (!is_numeric($shop))
+ $id_shop_list[] = (int)Shop::getIdByName($shop);
+ else
+ $id_shop_list[] = $shop;
+
+ if ((isset($info['reduction_price']) && $info['reduction_price'] > 0) || (isset($info['reduction_percent']) && $info['reduction_percent'] > 0))
+ foreach($id_shop_list as $id_shop)
+ {
+ $specific_price = SpecificPrice::getSpecificPrice($product->id, $id_shop, 0, 0, 0, 1, 0, 0, 0, 0);
+
+ if (is_array($specific_price))
+ $specific_price = new SpecificPrice((int)$specific_price['id_specific_price']);
+ else
+ $specific_price = new SpecificPrice();
+ $specific_price->id_product = (int)$product->id;
+ $specific_price->id_specific_price_rule = 0;
+ $specific_price->id_shop = $id_shop;
+ $specific_price->id_currency = 0;
+ $specific_price->id_country = 0;
+ $specific_price->id_group = 0;
+ $specific_price->price = -1;
+ $specific_price->id_customer = 0;
+ $specific_price->from_quantity = 1;
+ $specific_price->reduction = (isset($info['reduction_price']) && $info['reduction_price']) ? $info['reduction_price'] : $info['reduction_percent'] / 100;
+ $specific_price->reduction_type = (isset($info['reduction_price']) && $info['reduction_price']) ? 'amount' : 'percentage';
+ $specific_price->from = (isset($info['reduction_from']) && Validate::isDate($info['reduction_from'])) ? $info['reduction_from'] : '0000-00-00 00:00:00';
+ $specific_price->to = (isset($info['reduction_to']) && Validate::isDate($info['reduction_to'])) ? $info['reduction_to'] : '0000-00-00 00:00:00';
+ if (!$specific_price->save())
+ $this->addProductWarning(Tools::safeOutput($info['name']), $product->id, $this->l('Discount is invalid'));
+ }
if (isset($product->tags) && !empty($product->tags))
{
+ if (isset($product->id) && $product->id)
+ {
+ $tags = Tag::getProductTags($product->id);
+ if (is_array($tags) && count($tags))
+ {
+ if (!empty($product->tags))
+ $product->tags = explode($this->multiple_value_separator, $product->tags);
+ if (is_array($product->tags) && count($product->tags))
+ {
+ foreach ($product->tags as $key => $tag)
+ $product->tags[$key] = trim($tag);
+ $tags[$id_lang] = $product->tags;
+ $product->tags = $tags;
+ }
+ }
+ }
// Delete tags for this id product, for no duplicating error
Tag::deleteTagsForProduct($product->id);
-
if (!is_array($product->tags))
{
$product->tags = AdminImportController::createMultiLangField($product->tags);
@@ -1761,8 +1808,9 @@ class AdminImportControllerCore extends AdminController
null,
$id_shop_list
);
-
$id_product_attribute_update = true;
+ if (isset($info['supplier_reference']) && !empty($info['supplier_reference']))
+ $product->addSupplierReference($product->id_supplier, $id_product_attribute, $info['supplier_reference']);
}
}
}
@@ -1788,8 +1836,10 @@ class AdminImportControllerCore extends AdminController
(int)$info['minimal_quantity'],
$id_shop_list
);
+ if (isset($info['supplier_reference']) && !empty($info['supplier_reference']))
+ $product->addSupplierReference($product->id_supplier, $id_product_attribute, $info['supplier_reference']);
}
-
+
// fills our attributes array, in order to add the attributes to the product_attribute afterwards
if(isset($attributes[$group.'_'.$attribute]))
$attributes_to_add[] = (int)$attributes[$group.'_'.$attribute];
@@ -1964,7 +2014,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$info['email'],
- (isset($info['id']) ? $info['id'] : 'null')
+ (isset($info['id']) && !empty($info['id']))? $info['id'] : 'null'
);
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError();
@@ -2061,7 +2111,7 @@ class AdminImportControllerCore extends AdminController
Tools::displayError('%1$s does not exist in database %2$s (ID: %3$s) cannot be saved'),
Db::getInstance()->getMsgError(),
$address->customer_email,
- (isset($info['id']) ? $info['id'] : 'null')
+ (isset($info['id']) && !empty($info['id']))? $info['id'] : 'null'
);
}
else
@@ -2110,7 +2160,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = Db::getInstance()->getMsgError().' '.sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$manufacturer->name,
- (isset($manufacturer->id) ? $manufacturer->id : 'null')
+ (isset($manufacturer->id) && !empty($manufacturer->id))? $manufacturer->id : 'null'
);
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError();
@@ -2131,7 +2181,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = Db::getInstance()->getMsgError().' '.sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$supplier->name,
- (isset($supplier->id) ? $supplier->id : 'null')
+ (isset($supplier->id) && !empty($supplier->id))? $supplier->id : 'null'
);
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError();
@@ -2160,7 +2210,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$info['alias'],
- (isset($info['id']) ? $info['id'] : 'null')
+ (isset($info['id']) && !empty($info['id']))? $info['id'] : 'null'
);
}
}
@@ -2177,7 +2227,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$info['alias'],
- (isset($info['id']) ? $info['id'] : 'null')
+ (isset($info['id']) && !empty($info['id']))? $info['id'] : 'null'
);
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError();
@@ -2247,8 +2297,8 @@ class AdminImportControllerCore extends AdminController
{
$this->errors[] = Db::getInstance()->getMsgError().' '.sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
- (isset($info['name']) ? Tools::safeOutput($info['name']) : 'No Name'),
- (isset($info['id']) ? Tools::safeOutput($info['id']) : 'No ID')
+ (isset($info['name']) && !empty($info['name']))? Tools::safeOutput($info['name']) : 'No Name',
+ (isset($info['id']) && !empty($info['id']))? Tools::safeOutput($info['id']) : 'No ID'
);
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError();
@@ -2294,8 +2344,8 @@ class AdminImportControllerCore extends AdminController
if (!$res)
$this->errors[] = Db::getInstance()->getMsgError().' '.sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
- (isset($info['name']) ? Tools::safeOutput($info['name']) : 'No Name'),
- (isset($info['id']) ? Tools::safeOutput($info['id']) : 'No ID')
+ (isset($info['name']) && !empty($info['name']))? Tools::safeOutput($info['name']) : 'No Name',
+ (isset($info['id']) && !empty($info['id']))? Tools::safeOutput($info['id']) : 'No ID'
);
else
{
@@ -2553,13 +2603,9 @@ class AdminImportControllerCore extends AdminController
protected static function usortFiles($a, $b)
{
- $a = strrev(substr(strrev($a), 0, 14));
- $b = strrev(substr(strrev($b), 0, 14));
-
if ($a == $b)
return 0;
-
- return ($a < $b) ? 1 : -1;
+ return ($b < $a) ? 1 : -1;
}
protected function openCsvFile()
@@ -2604,37 +2650,37 @@ class AdminImportControllerCore extends AdminController
unlink(_PS_CAT_IMG_DIR_.$d);
break;
case $this->entities[$this->l('Products')]:
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_shop');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'feature_product');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_lang');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'category_product');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_tag');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image_lang');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image_shop');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'specific_price');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'specific_price_priority');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_carrier');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'cart_product');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'compare_product');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_shop`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'feature_product`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_lang`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'category_product`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_tag`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image_lang`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image_shop`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'specific_price`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'specific_price_priority`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_carrier`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'cart_product`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'compare_product`');
if (count(Db::getInstance()->executeS('SHOW TABLES LIKE \''._DB_PREFIX_.'favorite_product\' '))) //check if table exist
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'favorite_product');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attachment');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_country_tax');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_download');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_group_reduction_cache');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_sale');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_supplier');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'scene_products');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'warehouse_product_location');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'stock');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'stock_available');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'stock_mvt');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customization');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customization_field');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supply_order_detail');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_impact');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'favorite_product`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attachment`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_country_tax`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_download`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_group_reduction_cache`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_sale`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_supplier`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'scene_products`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'warehouse_product_location`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'stock`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'stock_available`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'stock_mvt`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customization`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customization_field`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supply_order_detail`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_impact`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute_shop`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute_combination`');
@@ -2645,7 +2691,7 @@ class AdminImportControllerCore extends AdminController
break;
case $this->entities[$this->l('Combinations')]:
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute`');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_impact');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_impact`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_lang`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_group`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_group_lang`');
@@ -2655,26 +2701,26 @@ class AdminImportControllerCore extends AdminController
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute_shop`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute_combination`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute_image`');
- Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'stock_available` WHERE id_product_attribute !=0');
+ Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'stock_available` WHERE id_product_attribute != 0');
break;
case $this->entities[$this->l('Customers')]:
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customer');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customer`');
break;
case $this->entities[$this->l('Addresses')]:
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'address');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'address`');
break;
case $this->entities[$this->l('Manufacturers')]:
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer_lang');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer_shop');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer_lang`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer_shop`');
foreach (scandir(_PS_MANU_IMG_DIR_) as $d)
if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d))
unlink(_PS_MANU_IMG_DIR_.$d);
break;
case $this->entities[$this->l('Suppliers')]:
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier_lang');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier_shop');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier_lang`');
+ Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier_shop`');
foreach (scandir(_PS_SUPP_IMG_DIR_) as $d)
if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d))
unlink(_PS_SUPP_IMG_DIR_.$d);
@@ -2703,6 +2749,7 @@ class AdminImportControllerCore extends AdminController
if (Tools::isSubmit('submitFileUpload'))
{
+ $path = _PS_ADMIN_DIR_.'/import/'.date('Ymdhis').'-';
if (isset($_FILES['file']) && !empty($_FILES['file']['error']))
{
switch ($_FILES['file']['error'])
@@ -2729,12 +2776,15 @@ class AdminImportControllerCore extends AdminController
}
}
else if (!file_exists($_FILES['file']['tmp_name']) ||
- !@move_uploaded_file($_FILES['file']['tmp_name'], _PS_ADMIN_DIR_.'/import/'.date('Ymdhis').'-'.$_FILES['file']['name']))
+ !@move_uploaded_file($_FILES['file']['tmp_name'], $path.$_FILES['file']['name']))
$this->errors[] = $this->l('An error occurred while uploading / copying the file.');
else
+ {
+ @chmod($path.$_FILES['file']['name'], 0664);
Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=18');
+ }
}
- else if (Tools::getValue('import'))
+ elseif (Tools::getValue('import'))
{
// Check if the CSV file exist
if (Tools::getValue('csv'))
@@ -2798,7 +2848,41 @@ class AdminImportControllerCore extends AdminController
else
$this->errors[] = $this->l('You must upload a file in order to proceed to the next step');
}
-
+ elseif ($filename = Tools::getValue('csvfilename'))
+ {
+ $filename = base64_decode($filename);
+ $file = _PS_ADMIN_DIR_.'/import/'.basename($filename);
+ if (realpath(dirname($file)) != _PS_ADMIN_DIR_.'/import')
+ exit();
+ if (!empty($filename))
+ {
+ $bName = basename($filename);
+ if ($delete = Tools::getValue('delete') && file_exists($file))
+ @unlink($file);
+ elseif (file_exists($file))
+ {
+ $bName = explode('.', $bName);
+ $bName = strtolower($bName[count($bName) - 1]);
+ $mimeTypes = array('csv' => 'text/csv');
+
+ if (isset($mimeTypes[$bName]))
+ $mimeType = $mimeTypes[$bName];
+ else
+ $mimeType = 'application/octet-stream';
+ if (ob_get_level())
+ ob_end_clean();
+
+ header('Content-Transfer-Encoding: binary');
+ header('Content-Type: '.$mimeType);
+ header('Content-Length: '.filesize($file));
+ header('Content-Disposition: attachment; filename="'.$filename.'"');
+ $fp = fopen($file, 'rb');
+ while (is_resource($fp) && !feof($fp))
+ echo fgets($fp, 16384);
+ exit;
+ }
+ }
+ }
parent::postProcess();
}
diff --git a/controllers/admin/AdminInvoicesController.php b/controllers/admin/AdminInvoicesController.php
index 4eee707a4..11a285f75 100644
--- a/controllers/admin/AdminInvoicesController.php
+++ b/controllers/admin/AdminInvoicesController.php
@@ -42,6 +42,12 @@ class AdminInvoicesControllerCore extends AdminController
'cast' => 'intval',
'type' => 'bool'
),
+ 'PS_INVOICE_TAXES_BREAKDOWN' => array(
+ 'title' => $this->l('Enable the breakdown of taxes on the invoice:'),
+ 'desc' => $this->l('Show a breakdown of taxes by tax rate on the invoice when there are several taxes combined'),
+ 'cast' => 'intval',
+ 'type' => 'bool'
+ ),
'PS_INVOICE_PREFIX' => array(
'title' => $this->l('Invoice prefix:'),
'desc' => $this->l('Prefix used for invoice name (e.g. IN00001)'),
diff --git a/controllers/admin/AdminLogsController.php b/controllers/admin/AdminLogsController.php
index 5a4dc1255..b9db383c1 100644
--- a/controllers/admin/AdminLogsController.php
+++ b/controllers/admin/AdminLogsController.php
@@ -35,7 +35,7 @@ class AdminLogsControllerCore extends AdminController
$this->fields_list = array(
'id_log' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
- 'employee' => array('title' => $this->l('Employee'), 'align' => 'center', 'width' => 100),
+ 'employee' => array('title' => $this->l('Employee'), 'align' => 'center', 'width' => 100, 'havingFilter' => true),
'severity' => array('title' => $this->l('Severity (1-4)'), 'align' => 'center', 'width' => 50),
'message' => array('title' => $this->l('Message')),
'object_type' => array('title' => $this->l('Object type'), 'width' => 75),
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 03764fe67..cbc235f59 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2023,7 +2023,7 @@ class AdminProductsControllerCore extends AdminController
// Check multilingual fields validity
foreach ($rules['validateLang'] as $fieldLang => $function)
foreach ($languages as $language)
- if ($this->isProductFieldUpdated('description_short', $language['id_lang']) && ($value = Tools::getValue($fieldLang.'_'.$language['id_lang'])))
+ if ($this->isProductFieldUpdated($fieldLang, $language['id_lang']) && ($value = Tools::getValue($fieldLang.'_'.$language['id_lang'])))
if (!Validate::$function($value, (int)Configuration::get('PS_ALLOW_HTML_IFRAME')))
$this->errors[] = sprintf(
Tools::displayError('The %1$s field (%2$s) is invalid.'),
diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index 10e17bb85..3a02dd9dd 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -372,6 +372,7 @@ class ParentOrderControllerCore extends FrontController
'currencyFormat' => $this->context->currency->format,
'currencyBlank' => $this->context->currency->blank,
'show_option_allow_separate_package' => $show_option_allow_separate_package,
+ 'smallSize' => Image::getSize(ImageType::getFormatedName('small')),
));
diff --git a/install-dev/fixtures/apple/langs/bn/data/attribute.xml b/install-dev/fixtures/apple/langs/bn/data/attribute.xml
new file mode 100644
index 000000000..f27df851c
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/attribute.xml
@@ -0,0 +1,63 @@
+
+
+
+ 2GB
+
+
+ 4GB
+
+
+ Metal
+
+
+ Blue
+
+
+ Pink
+
+
+ Green
+
+
+ Orange
+
+
+ Optional 64GB solid-state drive
+
+
+ 80GB Parallel ATA Drive @ 4200 rpm
+
+
+ 1.60GHz Intel Core 2 Duo
+
+
+ 1.80GHz Intel Core 2 Duo
+
+
+ 80GB: 20,000 Songs
+
+
+ 160GB: 40,000 Songs
+
+
+ Black
+
+
+ 8GB
+
+
+ 16GB
+
+
+ 32GB
+
+
+ Purple
+
+
+ Yellow
+
+
+ Red
+
+
diff --git a/install-dev/fixtures/apple/langs/bn/data/attribute_group.xml b/install-dev/fixtures/apple/langs/bn/data/attribute_group.xml
new file mode 100644
index 000000000..221a81bc7
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/attribute_group.xml
@@ -0,0 +1,15 @@
+
+
+
+ Disk space
+ Disk space
+
+
+ Color
+ Color
+
+
+ ICU
+ Processor
+
+
diff --git a/install-dev/fixtures/apple/langs/bn/data/attributegroup.xml b/install-dev/fixtures/apple/langs/bn/data/attributegroup.xml
new file mode 100644
index 000000000..977fceeb7
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/attributegroup.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/install-dev/fixtures/apple/langs/bn/data/carrier.xml b/install-dev/fixtures/apple/langs/bn/data/carrier.xml
new file mode 100644
index 000000000..c59766e73
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/carrier.xml
@@ -0,0 +1,6 @@
+
+
+
+ Delivery next day!
+
+
diff --git a/install-dev/fixtures/apple/langs/bn/data/category.xml b/install-dev/fixtures/apple/langs/bn/data/category.xml
new file mode 100644
index 000000000..eeae63831
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/category.xml
@@ -0,0 +1,27 @@
+
+
+
+ iPods
+ Now that you can buy movies from the iTunes Store and sync them to your iPod, the whole world is your theater.
+ music-ipods
+
+
+ Accessories
+ Wonderful accessories for your iPod
+ accessories-ipod
+
+
+ Laptops
+ The latest Intel processor, a bigger hard drive, plenty of memory, and even more new features all fit inside just one liberating inch. The new Mac laptops have the performance, power, and connectivity of a desktop computer. Without the desk part.
+ laptops
+ Apple laptops
+ Apple laptops MacBook Air
+ Powerful and chic Apple laptops
+
+
diff --git a/install-dev/fixtures/apple/langs/bn/data/feature.xml b/install-dev/fixtures/apple/langs/bn/data/feature.xml
new file mode 100644
index 000000000..7682c6495
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/feature.xml
@@ -0,0 +1,18 @@
+
+
+
+ Height
+
+
+ Width
+
+
+ Depth
+
+
+ Weight
+
+
+ Headphone
+
+
diff --git a/install-dev/fixtures/apple/langs/bn/data/feature_value.xml b/install-dev/fixtures/apple/langs/bn/data/feature_value.xml
new file mode 100644
index 000000000..d3a824d22
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/feature_value.xml
@@ -0,0 +1,45 @@
+
+
+
+ Jack stereo
+
+
+ Mini-jack stereo
+
+
+ 2.75 in
+
+
+ 2.06 in
+
+
+ 49.2 g
+
+
+ 0.26 in
+
+
+ 1.07 in
+
+
+ 1.62 in
+
+
+ 15.5 g
+
+
+ 0.41 in (clip included)
+
+
+ 4.33 in
+
+
+ 2.76 in
+
+
+ 120g
+
+
+ 0.31 in
+
+
diff --git a/install-dev/fixtures/apple/langs/bn/data/featurevalue.xml b/install-dev/fixtures/apple/langs/bn/data/featurevalue.xml
new file mode 100644
index 000000000..d101bed96
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/featurevalue.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/install-dev/fixtures/apple/langs/bn/data/image.xml b/install-dev/fixtures/apple/langs/bn/data/image.xml
new file mode 100644
index 000000000..49a836dc3
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/image.xml
@@ -0,0 +1,81 @@
+
+
+
+ MacBook Air
+
+
+ MacBook Air
+
+
+ MacBook Air
+
+
+ MacBook Air
+
+
+ MacBook Air
+
+
+ MacBook Air SuperDrive
+
+
+ iPod touch
+
+
+ iPod touch
+
+
+ iPod touch
+
+
+ iPod touch
+
+
+ iPod touch
+
+
+ iPod touch
+
+
+ housse-portefeuille-en-cuir
+
+
+ Shure SE210 Sound-Isolating Earphones for iPod and iPhone
+
+
+ iPod Nano
+
+
+ iPod Nano
+
+
+ iPod Nano
+
+
+ iPod Nano
+
+
+ iPod Nano
+
+
+ iPod Nano
+
+
+ iPod Nano
+
+
+ iPod Nano
+
+
+ iPod shuffle
+
+
+ iPod shuffle
+
+
+ iPod shuffle
+
+
+ iPod shuffle
+
+
diff --git a/install-dev/fixtures/apple/langs/bn/data/index.php b/install-dev/fixtures/apple/langs/bn/data/index.php
new file mode 100644
index 000000000..fcb7f5c2b
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2013 PrestaShop SA
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/fixtures/apple/langs/bn/data/manufacturer.xml b/install-dev/fixtures/apple/langs/bn/data/manufacturer.xml
new file mode 100644
index 000000000..f06ff9661
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/manufacturer.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
diff --git a/install-dev/fixtures/apple/langs/bn/data/order_message.xml b/install-dev/fixtures/apple/langs/bn/data/order_message.xml
new file mode 100644
index 000000000..93ad3b501
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/order_message.xml
@@ -0,0 +1,12 @@
+
+
+
+ Delay
+ Hi,
+
+Unfortunately, an item on your order is currently out of stock. This may cause a slight delay in delivery.
+Please accept our apologies and rest assured that we are working hard to rectify this.
+
+Best regards,
+
+
diff --git a/install-dev/fixtures/apple/langs/bn/data/ordermessage.xml b/install-dev/fixtures/apple/langs/bn/data/ordermessage.xml
new file mode 100644
index 000000000..e743f5d97
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/ordermessage.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
diff --git a/install-dev/fixtures/apple/langs/bn/data/product.xml b/install-dev/fixtures/apple/langs/bn/data/product.xml
new file mode 100644
index 000000000..0c405b001
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/product.xml
@@ -0,0 +1,135 @@
+
+
+
+ <p><strong><span style="font-size: small;">Curved ahead of the curve.</span></strong></p>
+<p>For those about to rock, we give you nine amazing colors. But that's only part of the story. Feel the curved, all-aluminum and glass design and you won't want to put iPod nano down.</p>
+<p><strong><span style="font-size: small;">Great looks. And brains, too.</span></strong></p>
+<p>The new Genius feature turns iPod nano into your own highly intelligent, personal DJ. It creates playlists by finding songs in your library that go great together.</p>
+<p><strong><span style="font-size: small;">Made to move with your moves.</span></strong></p>
+<p>The accelerometer comes to iPod nano. Give it a shake to shuffle your music. Turn it sideways to view Cover Flow. And play games designed with your moves in mind.</p>
+ <p>New design. New features. Now in 8GB and 16GB. iPod nano rocks like never before.</p>
+ ipod-nano
+ iPod Nano
+ In stock
+
+
+ <p><span style="font-size: small;"><strong>Instant attachment.</strong></span></p>
+<p>Wear up to 500 songs on your sleeve. Or your belt. Or your gym shorts. iPod shuffle is a badge of musical devotion. Now in new, more brilliant colors.</p>
+<p><span style="font-size: small;"><strong>Feed your iPod shuffle.</strong></span></p>
+<p>iTunes is your entertainment superstore. It’s your ultra-organized music collection and jukebox. And it’s how you load up your iPod shuffle in one click.</p>
+<p><span style="font-size: small;"><strong>Beauty and the beat.</strong></span></p>
+<p>Intensely colorful anodized aluminum complements the simple design of iPod shuffle. Now in blue, green, pink, red, and original silver.</p>
+ <p>iPod shuffle, the world’s most wearable music player, now clips on in more vibrant blue, green, pink, and red.</p>
+ ipod-shuffle
+ iPod shuffle
+ In stock
+
+
+ <p>MacBook Air is nearly as thin as your index finger. Practically every detail that could be streamlined has been. Yet it still has a 13.3-inch widescreen LED display, full-size keyboard, and large multi-touch trackpad. It’s incomparably portable without the usual ultraportable screen and keyboard compromises.</p><p>The incredible thinness of MacBook Air is the result of numerous size- and weight-shaving innovations. From a slimmer hard drive to strategically hidden I/O ports to a lower-profile battery, everything has been considered and reconsidered with thinness in mind.</p><p>MacBook Air is designed and engineered to take full advantage of the wireless world. A world in which 802.11n Wi-Fi is now so fast and so available, people are truly living untethered — buying and renting movies online, downloading software, and sharing and storing files on the web. </p>
+ MacBook Air is ultrathin, ultraportable, and ultra unlike anything else. But you don’t lose inches and pounds overnight. It’s the result of rethinking conventions. Of multiple wireless innovations. And of breakthrough design. With MacBook Air, mobile computing suddenly has a new standard.
+ macbook-air
+ MacBook Air
+
+
+ Every MacBook has a larger hard drive, up to 250GB, to store growing media collections and valuable data.<br /><br />The 2.4GHz MacBook models now include 2GB of memory standard — perfect for running more of your favorite applications smoothly.
+ MacBook makes it easy to hit the road thanks to its tough polycarbonate case, built-in wireless technologies, and innovative MagSafe Power Adapter that releases automatically if someone accidentally trips on the cord.
+ macbook
+ MacBook
+
+
+ <h3>Five new hands-on applications</h3>
+<p>View rich HTML email with photos as well as PDF, Word, and Excel attachments. Get maps, directions, and real-time traffic information. Take notes and read stock and weather reports.</p>
+<h3>Touch your music, movies, and more</h3>
+<p>The revolutionary Multi-Touch technology built into the gorgeous 3.5-inch display lets you pinch, zoom, scroll, and flick with your fingers.</p>
+<h3>Internet in your pocket</h3>
+<p>With the Safari web browser, see websites the way they were designed to be seen and zoom in and out with a tap.<sup>2</sup> And add Web Clips to your Home screen for quick access to favorite sites.</p>
+<h3>What's in the box</h3>
+<ul>
+<li><span></span>iPod touch</li>
+<li><span></span>Earphones</li>
+<li><span></span>USB 2.0 cable</li>
+<li><span></span>Dock adapter</li>
+<li><span></span>Polishing cloth</li>
+<li><span></span>Stand</li>
+<li><span></span>Quick Start guide</li>
+</ul>
+ <ul>
+<li>Revolutionary Multi-Touch interface</li>
+<li>3.5-inch widescreen color display</li>
+<li>Wi-Fi (802.11b/g)</li>
+<li>8 mm thin</li>
+<li>Safari, YouTube, Mail, Stocks, Weather, Notes, iTunes Wi-Fi Music Store, Maps</li>
+</ul>
+ ipod-touch
+ iPod touch
+
+
+ <p>Lorem ipsum</p>
+ <p>Lorem ipsum</p>
+ belkin-leather-folio-for-ipod-nano-black-chocolate
+ Belkin Leather Folio for iPod nano - Black / Chocolate
+
+
+ <div class="product-overview-full">Using Hi-Definition MicroSpeakers to deliver full-range audio, the ergonomic and lightweight design of the SE210 earphones is ideal for premium on-the-go listening on your iPod or iPhone. They offer the most accurate audio reproduction from both portable and home stereo audio sources--for the ultimate in precision highs and rich low end. In addition, the flexible design allows you to choose the most comfortable fit from a variety of wearing positions. <br /> <br /> <strong>Features </strong> <br />
+<ul>
+<li>Sound-isolating design </li>
+<li> Hi-Definition MicroSpeaker with a single balanced armature driver </li>
+<li> Detachable, modular cable so you can make the cable longer or shorter depending on your activity </li>
+<li> Connector compatible with earphone ports on both iPod and iPhone </li>
+</ul>
+<strong>Specifications </strong><br />
+<ul>
+<li>Speaker type: Hi-Definition MicroSpeaker </li>
+<li> Frequency range: 25Hz-18.5kHz </li>
+<li> Impedance (1kHz): 26 Ohms </li>
+<li> Sensitivity (1mW): 114 dB SPL/mW </li>
+<li> Cable length (with extension): 18.0 in./45.0 cm (54.0 in./137.1 cm) </li>
+</ul>
+<strong>In the box</strong><br />
+<ul>
+<li>Shure SE210 earphones </li>
+<li> Extension cable (36.0 in./91.4 cm) </li>
+<li> Three pairs foam earpiece sleeves (small, medium, large) </li>
+<li> Three pairs soft flex earpiece sleeves (small, medium, large) </li>
+<li> One pair triple-flange earpiece sleeves </li>
+<li> Carrying case </li>
+</ul>
+Warranty<br /> Two-year limited <br />(For details, please visit <br />www.shure.com/PersonalAudio/CustomerSupport/ProductReturnsAndWarranty/index.htm.) <br /><br /> Mfr. Part No.: SE210-A-EFS <br /><br />Note: Products sold through this website that do not bear the Apple Brand name are serviced and supported exclusively by their manufacturers in accordance with terms and conditions packaged with the products. Apple's Limited Warranty does not apply to products that are not Apple-branded, even if packaged or sold with Apple products. Please contact the manufacturer directly for technical support and customer service.</div>
+ <p>Evolved from personal monitor technology road-tested by pro musicians and perfected by Shure engineers, the lightweight and stylish SE210 delivers full-range audio that's free from outside noise.</p>
+ ecouteurs-a-isolation-sonore-shure-se210-blanc
+ Shure SE210 Sound-Isolating Earphones for iPod and iPhone
+
+
diff --git a/install-dev/fixtures/apple/langs/bn/data/profile.xml b/install-dev/fixtures/apple/langs/bn/data/profile.xml
new file mode 100644
index 000000000..02aa4d76c
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/profile.xml
@@ -0,0 +1,15 @@
+
+
+
+ Administrator
+
+
+ Logistician
+
+
+ Translator
+
+
+ Salesman
+
+
diff --git a/install-dev/fixtures/apple/langs/bn/data/scene.xml b/install-dev/fixtures/apple/langs/bn/data/scene.xml
new file mode 100644
index 000000000..f7270d3ff
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/scene.xml
@@ -0,0 +1,12 @@
+
+
+
+ The iPods Nano
+
+
+ The iPods
+
+
+ The MacBooks
+
+
diff --git a/install-dev/fixtures/apple/langs/bn/data/supplier.xml b/install-dev/fixtures/apple/langs/bn/data/supplier.xml
new file mode 100644
index 000000000..e9db64034
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/supplier.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
diff --git a/install-dev/fixtures/apple/langs/bn/data/tag.xml b/install-dev/fixtures/apple/langs/bn/data/tag.xml
new file mode 100644
index 000000000..b781c0ed2
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/tag.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/install-dev/fixtures/apple/langs/bn/index.php b/install-dev/fixtures/apple/langs/bn/index.php
new file mode 100644
index 000000000..67d9932bf
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2013 PrestaShop SA
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/fixtures/apple/langs/id/data/attribute.xml b/install-dev/fixtures/apple/langs/id/data/attribute.xml
new file mode 100644
index 000000000..f27df851c
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/attribute.xml
@@ -0,0 +1,63 @@
+
+
+
+ 2GB
+
+
+ 4GB
+
+
+ Metal
+
+
+ Blue
+
+
+ Pink
+
+
+ Green
+
+
+ Orange
+
+
+ Optional 64GB solid-state drive
+
+
+ 80GB Parallel ATA Drive @ 4200 rpm
+
+
+ 1.60GHz Intel Core 2 Duo
+
+
+ 1.80GHz Intel Core 2 Duo
+
+
+ 80GB: 20,000 Songs
+
+
+ 160GB: 40,000 Songs
+
+
+ Black
+
+
+ 8GB
+
+
+ 16GB
+
+
+ 32GB
+
+
+ Purple
+
+
+ Yellow
+
+
+ Red
+
+
diff --git a/install-dev/fixtures/apple/langs/id/data/attribute_group.xml b/install-dev/fixtures/apple/langs/id/data/attribute_group.xml
new file mode 100644
index 000000000..221a81bc7
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/attribute_group.xml
@@ -0,0 +1,15 @@
+
+
+
+ Disk space
+ Disk space
+
+
+ Color
+ Color
+
+
+ ICU
+ Processor
+
+
diff --git a/install-dev/fixtures/apple/langs/id/data/attributegroup.xml b/install-dev/fixtures/apple/langs/id/data/attributegroup.xml
new file mode 100644
index 000000000..977fceeb7
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/attributegroup.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/install-dev/fixtures/apple/langs/id/data/carrier.xml b/install-dev/fixtures/apple/langs/id/data/carrier.xml
new file mode 100644
index 000000000..c59766e73
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/carrier.xml
@@ -0,0 +1,6 @@
+
+
+
+ Delivery next day!
+
+
diff --git a/install-dev/fixtures/apple/langs/id/data/category.xml b/install-dev/fixtures/apple/langs/id/data/category.xml
new file mode 100644
index 000000000..eeae63831
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/category.xml
@@ -0,0 +1,27 @@
+
+
+
+ iPods
+ Now that you can buy movies from the iTunes Store and sync them to your iPod, the whole world is your theater.
+ music-ipods
+
+
+ Accessories
+ Wonderful accessories for your iPod
+ accessories-ipod
+
+
+ Laptops
+ The latest Intel processor, a bigger hard drive, plenty of memory, and even more new features all fit inside just one liberating inch. The new Mac laptops have the performance, power, and connectivity of a desktop computer. Without the desk part.
+ laptops
+ Apple laptops
+ Apple laptops MacBook Air
+ Powerful and chic Apple laptops
+
+
diff --git a/install-dev/fixtures/apple/langs/id/data/feature.xml b/install-dev/fixtures/apple/langs/id/data/feature.xml
new file mode 100644
index 000000000..7682c6495
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/feature.xml
@@ -0,0 +1,18 @@
+
+
+
+ Height
+
+
+ Width
+
+
+ Depth
+
+
+ Weight
+
+
+ Headphone
+
+
diff --git a/install-dev/fixtures/apple/langs/id/data/feature_value.xml b/install-dev/fixtures/apple/langs/id/data/feature_value.xml
new file mode 100644
index 000000000..d3a824d22
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/feature_value.xml
@@ -0,0 +1,45 @@
+
+
+
+ Jack stereo
+
+
+ Mini-jack stereo
+
+
+ 2.75 in
+
+
+ 2.06 in
+
+
+ 49.2 g
+
+
+ 0.26 in
+
+
+ 1.07 in
+
+
+ 1.62 in
+
+
+ 15.5 g
+
+
+ 0.41 in (clip included)
+
+
+ 4.33 in
+
+
+ 2.76 in
+
+
+ 120g
+
+
+ 0.31 in
+
+
diff --git a/install-dev/fixtures/apple/langs/id/data/featurevalue.xml b/install-dev/fixtures/apple/langs/id/data/featurevalue.xml
new file mode 100644
index 000000000..d101bed96
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/featurevalue.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/install-dev/fixtures/apple/langs/id/data/image.xml b/install-dev/fixtures/apple/langs/id/data/image.xml
new file mode 100644
index 000000000..49a836dc3
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/image.xml
@@ -0,0 +1,81 @@
+
+
+
+ MacBook Air
+
+
+ MacBook Air
+
+
+ MacBook Air
+
+
+ MacBook Air
+
+
+ MacBook Air
+
+
+ MacBook Air SuperDrive
+
+
+ iPod touch
+
+
+ iPod touch
+
+
+ iPod touch
+
+
+ iPod touch
+
+
+ iPod touch
+
+
+ iPod touch
+
+
+ housse-portefeuille-en-cuir
+
+
+ Shure SE210 Sound-Isolating Earphones for iPod and iPhone
+
+
+ iPod Nano
+
+
+ iPod Nano
+
+
+ iPod Nano
+
+
+ iPod Nano
+
+
+ iPod Nano
+
+
+ iPod Nano
+
+
+ iPod Nano
+
+
+ iPod Nano
+
+
+ iPod shuffle
+
+
+ iPod shuffle
+
+
+ iPod shuffle
+
+
+ iPod shuffle
+
+
diff --git a/install-dev/fixtures/apple/langs/id/data/index.php b/install-dev/fixtures/apple/langs/id/data/index.php
new file mode 100644
index 000000000..fcb7f5c2b
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2013 PrestaShop SA
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/fixtures/apple/langs/id/data/manufacturer.xml b/install-dev/fixtures/apple/langs/id/data/manufacturer.xml
new file mode 100644
index 000000000..f06ff9661
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/manufacturer.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
diff --git a/install-dev/fixtures/apple/langs/id/data/order_message.xml b/install-dev/fixtures/apple/langs/id/data/order_message.xml
new file mode 100644
index 000000000..93ad3b501
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/order_message.xml
@@ -0,0 +1,12 @@
+
+
+
+ Delay
+ Hi,
+
+Unfortunately, an item on your order is currently out of stock. This may cause a slight delay in delivery.
+Please accept our apologies and rest assured that we are working hard to rectify this.
+
+Best regards,
+
+
diff --git a/install-dev/fixtures/apple/langs/id/data/ordermessage.xml b/install-dev/fixtures/apple/langs/id/data/ordermessage.xml
new file mode 100644
index 000000000..e743f5d97
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/ordermessage.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
diff --git a/install-dev/fixtures/apple/langs/id/data/product.xml b/install-dev/fixtures/apple/langs/id/data/product.xml
new file mode 100644
index 000000000..0c405b001
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/product.xml
@@ -0,0 +1,135 @@
+
+
+
+ <p><strong><span style="font-size: small;">Curved ahead of the curve.</span></strong></p>
+<p>For those about to rock, we give you nine amazing colors. But that's only part of the story. Feel the curved, all-aluminum and glass design and you won't want to put iPod nano down.</p>
+<p><strong><span style="font-size: small;">Great looks. And brains, too.</span></strong></p>
+<p>The new Genius feature turns iPod nano into your own highly intelligent, personal DJ. It creates playlists by finding songs in your library that go great together.</p>
+<p><strong><span style="font-size: small;">Made to move with your moves.</span></strong></p>
+<p>The accelerometer comes to iPod nano. Give it a shake to shuffle your music. Turn it sideways to view Cover Flow. And play games designed with your moves in mind.</p>
+ <p>New design. New features. Now in 8GB and 16GB. iPod nano rocks like never before.</p>
+ ipod-nano
+ iPod Nano
+ In stock
+
+
+ <p><span style="font-size: small;"><strong>Instant attachment.</strong></span></p>
+<p>Wear up to 500 songs on your sleeve. Or your belt. Or your gym shorts. iPod shuffle is a badge of musical devotion. Now in new, more brilliant colors.</p>
+<p><span style="font-size: small;"><strong>Feed your iPod shuffle.</strong></span></p>
+<p>iTunes is your entertainment superstore. It’s your ultra-organized music collection and jukebox. And it’s how you load up your iPod shuffle in one click.</p>
+<p><span style="font-size: small;"><strong>Beauty and the beat.</strong></span></p>
+<p>Intensely colorful anodized aluminum complements the simple design of iPod shuffle. Now in blue, green, pink, red, and original silver.</p>
+ <p>iPod shuffle, the world’s most wearable music player, now clips on in more vibrant blue, green, pink, and red.</p>
+ ipod-shuffle
+ iPod shuffle
+ In stock
+
+
+ <p>MacBook Air is nearly as thin as your index finger. Practically every detail that could be streamlined has been. Yet it still has a 13.3-inch widescreen LED display, full-size keyboard, and large multi-touch trackpad. It’s incomparably portable without the usual ultraportable screen and keyboard compromises.</p><p>The incredible thinness of MacBook Air is the result of numerous size- and weight-shaving innovations. From a slimmer hard drive to strategically hidden I/O ports to a lower-profile battery, everything has been considered and reconsidered with thinness in mind.</p><p>MacBook Air is designed and engineered to take full advantage of the wireless world. A world in which 802.11n Wi-Fi is now so fast and so available, people are truly living untethered — buying and renting movies online, downloading software, and sharing and storing files on the web. </p>
+ MacBook Air is ultrathin, ultraportable, and ultra unlike anything else. But you don’t lose inches and pounds overnight. It’s the result of rethinking conventions. Of multiple wireless innovations. And of breakthrough design. With MacBook Air, mobile computing suddenly has a new standard.
+ macbook-air
+ MacBook Air
+
+
+ Every MacBook has a larger hard drive, up to 250GB, to store growing media collections and valuable data.<br /><br />The 2.4GHz MacBook models now include 2GB of memory standard — perfect for running more of your favorite applications smoothly.
+ MacBook makes it easy to hit the road thanks to its tough polycarbonate case, built-in wireless technologies, and innovative MagSafe Power Adapter that releases automatically if someone accidentally trips on the cord.
+ macbook
+ MacBook
+
+
+ <h3>Five new hands-on applications</h3>
+<p>View rich HTML email with photos as well as PDF, Word, and Excel attachments. Get maps, directions, and real-time traffic information. Take notes and read stock and weather reports.</p>
+<h3>Touch your music, movies, and more</h3>
+<p>The revolutionary Multi-Touch technology built into the gorgeous 3.5-inch display lets you pinch, zoom, scroll, and flick with your fingers.</p>
+<h3>Internet in your pocket</h3>
+<p>With the Safari web browser, see websites the way they were designed to be seen and zoom in and out with a tap.<sup>2</sup> And add Web Clips to your Home screen for quick access to favorite sites.</p>
+<h3>What's in the box</h3>
+<ul>
+<li><span></span>iPod touch</li>
+<li><span></span>Earphones</li>
+<li><span></span>USB 2.0 cable</li>
+<li><span></span>Dock adapter</li>
+<li><span></span>Polishing cloth</li>
+<li><span></span>Stand</li>
+<li><span></span>Quick Start guide</li>
+</ul>
+ <ul>
+<li>Revolutionary Multi-Touch interface</li>
+<li>3.5-inch widescreen color display</li>
+<li>Wi-Fi (802.11b/g)</li>
+<li>8 mm thin</li>
+<li>Safari, YouTube, Mail, Stocks, Weather, Notes, iTunes Wi-Fi Music Store, Maps</li>
+</ul>
+ ipod-touch
+ iPod touch
+
+
+ <p>Lorem ipsum</p>
+ <p>Lorem ipsum</p>
+ belkin-leather-folio-for-ipod-nano-black-chocolate
+ Belkin Leather Folio for iPod nano - Black / Chocolate
+
+
+ <div class="product-overview-full">Using Hi-Definition MicroSpeakers to deliver full-range audio, the ergonomic and lightweight design of the SE210 earphones is ideal for premium on-the-go listening on your iPod or iPhone. They offer the most accurate audio reproduction from both portable and home stereo audio sources--for the ultimate in precision highs and rich low end. In addition, the flexible design allows you to choose the most comfortable fit from a variety of wearing positions. <br /> <br /> <strong>Features </strong> <br />
+<ul>
+<li>Sound-isolating design </li>
+<li> Hi-Definition MicroSpeaker with a single balanced armature driver </li>
+<li> Detachable, modular cable so you can make the cable longer or shorter depending on your activity </li>
+<li> Connector compatible with earphone ports on both iPod and iPhone </li>
+</ul>
+<strong>Specifications </strong><br />
+<ul>
+<li>Speaker type: Hi-Definition MicroSpeaker </li>
+<li> Frequency range: 25Hz-18.5kHz </li>
+<li> Impedance (1kHz): 26 Ohms </li>
+<li> Sensitivity (1mW): 114 dB SPL/mW </li>
+<li> Cable length (with extension): 18.0 in./45.0 cm (54.0 in./137.1 cm) </li>
+</ul>
+<strong>In the box</strong><br />
+<ul>
+<li>Shure SE210 earphones </li>
+<li> Extension cable (36.0 in./91.4 cm) </li>
+<li> Three pairs foam earpiece sleeves (small, medium, large) </li>
+<li> Three pairs soft flex earpiece sleeves (small, medium, large) </li>
+<li> One pair triple-flange earpiece sleeves </li>
+<li> Carrying case </li>
+</ul>
+Warranty<br /> Two-year limited <br />(For details, please visit <br />www.shure.com/PersonalAudio/CustomerSupport/ProductReturnsAndWarranty/index.htm.) <br /><br /> Mfr. Part No.: SE210-A-EFS <br /><br />Note: Products sold through this website that do not bear the Apple Brand name are serviced and supported exclusively by their manufacturers in accordance with terms and conditions packaged with the products. Apple's Limited Warranty does not apply to products that are not Apple-branded, even if packaged or sold with Apple products. Please contact the manufacturer directly for technical support and customer service.</div>
+ <p>Evolved from personal monitor technology road-tested by pro musicians and perfected by Shure engineers, the lightweight and stylish SE210 delivers full-range audio that's free from outside noise.</p>
+ ecouteurs-a-isolation-sonore-shure-se210-blanc
+ Shure SE210 Sound-Isolating Earphones for iPod and iPhone
+
+
diff --git a/install-dev/fixtures/apple/langs/id/data/profile.xml b/install-dev/fixtures/apple/langs/id/data/profile.xml
new file mode 100644
index 000000000..02aa4d76c
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/profile.xml
@@ -0,0 +1,15 @@
+
+
+
+ Administrator
+
+
+ Logistician
+
+
+ Translator
+
+
+ Salesman
+
+
diff --git a/install-dev/fixtures/apple/langs/id/data/scene.xml b/install-dev/fixtures/apple/langs/id/data/scene.xml
new file mode 100644
index 000000000..f7270d3ff
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/scene.xml
@@ -0,0 +1,12 @@
+
+
+
+ The iPods Nano
+
+
+ The iPods
+
+
+ The MacBooks
+
+
diff --git a/install-dev/fixtures/apple/langs/id/data/supplier.xml b/install-dev/fixtures/apple/langs/id/data/supplier.xml
new file mode 100644
index 000000000..e9db64034
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/supplier.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
diff --git a/install-dev/fixtures/apple/langs/id/data/tag.xml b/install-dev/fixtures/apple/langs/id/data/tag.xml
new file mode 100644
index 000000000..b781c0ed2
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/tag.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/install-dev/fixtures/apple/langs/id/index.php b/install-dev/fixtures/apple/langs/id/index.php
new file mode 100644
index 000000000..67d9932bf
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2013 PrestaShop SA
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/langs/bn/data/carrier.xml b/install-dev/langs/bn/data/carrier.xml
new file mode 100644
index 000000000..db968ca0e
--- /dev/null
+++ b/install-dev/langs/bn/data/carrier.xml
@@ -0,0 +1,6 @@
+
+
+
+ দোকান থেকে নিন
+
+
diff --git a/install-dev/langs/bn/data/category.xml b/install-dev/langs/bn/data/category.xml
new file mode 100644
index 000000000..be0c6bd95
--- /dev/null
+++ b/install-dev/langs/bn/data/category.xml
@@ -0,0 +1,19 @@
+
+
+
+ রুট
+ root
+
+
+ হোম
+ home
+
+
diff --git a/install-dev/langs/bn/data/cms.xml b/install-dev/langs/bn/data/cms.xml
new file mode 100644
index 000000000..85941f6ef
--- /dev/null
+++ b/install-dev/langs/bn/data/cms.xml
@@ -0,0 +1,45 @@
+
+
+
+ বিতরন
+ বিতরনের শর্ত সমূহ
+ conditions, delivery, delay, shipment, pack
+ <h2>বিলি এবং ফেরত</h2><h3>আপনার প্যাক বিলিt</h3><p>প্যাকেজ সাধারণত পেমেন্ট প্রাপ্তির পর 2 দিনের মধ্যে প্রেষিত হয় এবং স্বাক্ষর ছাড়াই ট্র্যাকিং এবং ড্রপ অফ সঙ্গে ইউ.পি. মাধ্যমে প্রেরণ করা হয়. আপনি প্রয়োজনীয় স্বাক্ষর সঙ্গে অতিরিক্ত ইউ.পি. দ্বারা ডেলিভারি পছন্দ করেন, একটি অতিরিক্ত খরচ প্রয়োগ করা হবে, তাই এই পদ্ধতি চয়ন করার আগে আমাদের সাথে যোগাযোগ করুন. আপনি যেটা পছন্দ চালান, আমরা আপনাকে আপনার প্যাকেজ অনলাইন ট্র্যাক একটি লিঙ্ক প্রদান করা হবে.</p><p>শিপিং ফি ফি হিসেবে ডাকমাসুল খরচ সামলাচ্ছে ও প্যাকিং অন্তর্ভুক্ত. পরিবহন ফি চালানের মোট ওজন অনুযায়ী পরিবর্তন হওয়ার সম্ভাবনা রয়েছে, যেহেতু সামলাচ্ছে ফি, সংশোধন করা হয়. আমরা এক করার জন্য আপনার আইটেম গ্রুপে আপনাকে উপদেশ. আমরা আলাদা আলাদাভাবে স্থাপিত দুটি স্বতন্ত্র আদেশ গ্রুপ করতে পারবে না, এবং শিপিং ফি তাদের প্রতিটি ক্ষেত্রে প্রযোজ্য হবে. আপনার প্যাকেজ আপনার নিজের ঝুঁকিতে প্রেষিত করা হবে, কিন্তু ভঙ্গুর বস্তুর রক্ষা বিশেষ যত্ন নেওয়া হয়.<br /><br />বক্সগুলিতে যা আছে পর্যাপ্তভাবে মাপের এবং আপনার আইটেম ভাল সুরক্ষিত হয়.</p>
+ delivery
+
+
+ আইনি বিজ্ঞপ্তি
+ আইনি বিজ্ঞপ্তি
+ notice, legal, credits
+ <h2>আইনগত</h2><h3>বকেয়া</h3><p>ধারনা এবং উৎপাদন:</p><p>এই ওয়েব সাইট টি ব্যাবহার করে তৈরি<a href="http://www.prestashop.com">PrestaShop</a>™ open-source software.</p>
+ legal-notice
+
+
+ ব্যাবহারের শর্ত
+ আমাদের ব্যাবহারের শর্ত
+ conditions, terms, use, sell
+ <h2>আপনার জন্য ব্যাবহারের শর্ত</h2><h3>নিয়ম ১</h3><p>এখানে নিয়ম ১ content</p>
+<h3>নিয়ম২</h3><p>এখানে নিয়ম২</p>
+<h3>নিয়ম ৩</h3><p>এখানে নিয়ম৩ content</p>
+ terms-and-conditions-of-use
+
+
+ আমাদের সম্পর্কে
+ আমাদের সম্পর্কে আরও জানুন
+ about us, informations
+ <h2>আমাদের সম্পর্কে</h2>
+<h3>আমাদের কোম্পানি</h3><p>Our company</p>
+<h3>আমাদের টিম</h3><p>Our team</p>
+<h3>তথ্য</h3><p>Informations</p>
+ about-us
+
+
+ নিরাপদ পরিশোধ
+ আমাদের নিরাপদ পরিশোধ পদ্ধতি
+ secure payment, ssl, visa, mastercard, paypal
+ <h2>নিরাপদ পরিশোধ</h2>
+<h3>আমাদের নিরাপদ পরিশোধ</h3><p>With SSL</p>
+<h3>ব্যাবহার করে Visa/Mastercard/Paypal</h3><p>এই সেবা সম্পর্কে</p>
+ secure-payment
+
+
diff --git a/install-dev/langs/bn/data/cms_category.xml b/install-dev/langs/bn/data/cms_category.xml
new file mode 100644
index 000000000..ae6a122c7
--- /dev/null
+++ b/install-dev/langs/bn/data/cms_category.xml
@@ -0,0 +1,11 @@
+
+
+
+ হোম
+ home
+
+
diff --git a/install-dev/langs/bn/data/configuration.xml b/install-dev/langs/bn/data/configuration.xml
new file mode 100644
index 000000000..8f30677d3
--- /dev/null
+++ b/install-dev/langs/bn/data/configuration.xml
@@ -0,0 +1,18 @@
+
+
+
+ ভিতরে
+
+
+ ডি ই
+
+
+ একটি|এটি|থেকে|এবং|হতে
+
+
+ 0
+
+
+ প্রিয় গ্রাহক, শুভেচ্ছা, গ্রাহক সেবা বিভাগ
+
+
diff --git a/install-dev/langs/bn/data/contact.xml b/install-dev/langs/bn/data/contact.xml
new file mode 100644
index 000000000..d1917ad61
--- /dev/null
+++ b/install-dev/langs/bn/data/contact.xml
@@ -0,0 +1,9 @@
+
+
+
+ যদি এই ওয়েব সাইটে একটি টেকনিকাল ত্রুটি ঘটে
+
+
+ যে কোনো পণ্য সম্পর্কে প্রশ্ন, একটি অর্ডার
+
+
diff --git a/install-dev/langs/bn/data/country.xml b/install-dev/langs/bn/data/country.xml
new file mode 100644
index 000000000..d57ea1e36
--- /dev/null
+++ b/install-dev/langs/bn/data/country.xml
@@ -0,0 +1,735 @@
+
+
+
+ Germany
+
+
+ Austria
+
+
+ Belgium
+
+
+ Canada
+
+
+ China
+
+
+ Spain
+
+
+ Finland
+
+
+ France
+
+
+ Greece
+
+
+ Italy
+
+
+ Japan
+
+
+ Luxemburg
+
+
+ Netherlands
+
+
+ Poland
+
+
+ Portugal
+
+
+ Czech Republic
+
+
+ United Kingdom
+
+
+ Sweden
+
+
+ Switzerland
+
+
+ Denmark
+
+
+ United States
+
+
+ HongKong
+
+
+ Norway
+
+
+ Australia
+
+
+ Singapore
+
+
+ Ireland
+
+
+ New Zealand
+
+
+ South Korea
+
+
+ Israel
+
+
+ South Africa
+
+
+ Nigeria
+
+
+ Ivory Coast
+
+
+ Togo
+
+
+ Bolivia
+
+
+ Mauritius
+
+
+ Romania
+
+
+ Slovakia
+
+
+ Algeria
+
+
+ American Samoa
+
+
+ Andorra
+
+
+ Angola
+
+
+ Anguilla
+
+
+ Antigua and Barbuda
+
+
+ Argentina
+
+
+ Armenia
+
+
+ Aruba
+
+
+ Azerbaijan
+
+
+ Bahamas
+
+
+ Bahrain
+
+
+ Bangladesh
+
+
+ Barbados
+
+
+ Belarus
+
+
+ Belize
+
+
+ Benin
+
+
+ Bermuda
+
+
+ Bhutan
+
+
+ Botswana
+
+
+ Brazil
+
+
+ Brunei
+
+
+ Burkina Faso
+
+
+ Burma (Myanmar)
+
+
+ Burundi
+
+
+ Cambodia
+
+
+ Cameroon
+
+
+ Cape Verde
+
+
+ Central African Republic
+
+
+ Chad
+
+
+ Chile
+
+
+ Colombia
+
+
+ Comoros
+
+
+ Congo, Dem. Republic
+
+
+ Congo, Republic
+
+
+ Costa Rica
+
+
+ Croatia
+
+
+ Cuba
+
+
+ Cyprus
+
+
+ Djibouti
+
+
+ Dominica
+
+
+ Dominican Republic
+
+
+ East Timor
+
+
+ Ecuador
+
+
+ Egypt
+
+
+ El Salvador
+
+
+ Equatorial Guinea
+
+
+ Eritrea
+
+
+ Estonia
+
+
+ Ethiopia
+
+
+ Falkland Islands
+
+
+ Faroe Islands
+
+
+ Fiji
+
+
+ Gabon
+
+
+ Gambia
+
+
+ Georgia
+
+
+ Ghana
+
+
+ Grenada
+
+
+ Greenland
+
+
+ Gibraltar
+
+
+ Guadeloupe
+
+
+ Guam
+
+
+ Guatemala
+
+
+ Guernsey
+
+
+ Guinea
+
+
+ Guinea-Bissau
+
+
+ Guyana
+
+
+ Haiti
+
+
+ Heard Island and McDonald Islands
+
+
+ Vatican City State
+
+
+ Honduras
+
+
+ Iceland
+
+
+ India
+
+
+ Indonesia
+
+
+ Iran
+
+
+ Iraq
+
+
+ Man Island
+
+
+ Jamaica
+
+
+ Jersey
+
+
+ Jordan
+
+
+ Kazakhstan
+
+
+ Kenya
+
+
+ Kiribati
+
+
+ Korea, Dem. Republic of
+
+
+ Kuwait
+
+
+ Kyrgyzstan
+
+
+ Laos
+
+
+ Latvia
+
+
+ Lebanon
+
+
+ Lesotho
+
+
+ Liberia
+
+
+ Libya
+
+
+ Liechtenstein
+
+
+ Lithuania
+
+
+ Macau
+
+
+ Macedonia
+
+
+ Madagascar
+
+
+ Malawi
+
+
+ Malaysia
+
+
+ Maldives
+
+
+ Mali
+
+
+ Malta
+
+
+ Marshall Islands
+
+
+ Martinique
+
+
+ Mauritania
+
+
+ Hungary
+
+
+ Mayotte
+
+
+ Mexico
+
+
+ Micronesia
+
+
+ Moldova
+
+
+ Monaco
+
+
+ Mongolia
+
+
+ Montenegro
+
+
+ Montserrat
+
+
+ Morocco
+
+
+ Mozambique
+
+
+ Namibia
+
+
+ Nauru
+
+
+ Nepal
+
+
+ Netherlands Antilles
+
+
+ New Caledonia
+
+
+ Nicaragua
+
+
+ Niger
+
+
+ Niue
+
+
+ Norfolk Island
+
+
+ Northern Mariana Islands
+
+
+ Oman
+
+
+ Pakistan
+
+
+ Palau
+
+
+ Palestinian Territories
+
+
+ Panama
+
+
+ Papua New Guinea
+
+
+ Paraguay
+
+
+ Peru
+
+
+ Philippines
+
+
+ Pitcairn
+
+
+ Puerto Rico
+
+
+ Qatar
+
+
+ Reunion Island
+
+
+ Russian Federation
+
+
+ Rwanda
+
+
+ Saint Barthelemy
+
+
+ Saint Kitts and Nevis
+
+
+ Saint Lucia
+
+
+ Saint Martin
+
+
+ Saint Pierre and Miquelon
+
+
+ Saint Vincent and the Grenadines
+
+
+ Samoa
+
+
+ San Marino
+
+
+ São Tomé and Príncipe
+
+
+ Saudi Arabia
+
+
+ Senegal
+
+
+ Serbia
+
+
+ Seychelles
+
+
+ Sierra Leone
+
+
+ Slovenia
+
+
+ Solomon Islands
+
+
+ Somalia
+
+
+ South Georgia and the South Sandwich Islands
+
+
+ Sri Lanka
+
+
+ Sudan
+
+
+ Suriname
+
+
+ Svalbard and Jan Mayen
+
+
+ Swaziland
+
+
+ Syria
+
+
+ Taiwan
+
+
+ Tajikistan
+
+
+ Tanzania
+
+
+ Thailand
+
+
+ Tokelau
+
+
+ Tonga
+
+
+ Trinidad and Tobago
+
+
+ Tunisia
+
+
+ Turkey
+
+
+ Turkmenistan
+
+
+ Turks and Caicos Islands
+
+
+ Tuvalu
+
+
+ Uganda
+
+
+ Ukraine
+
+
+ United Arab Emirates
+
+
+ Uruguay
+
+
+ Uzbekistan
+
+
+ Vanuatu
+
+
+ Venezuela
+
+
+ Vietnam
+
+
+ Virgin Islands (British)
+
+
+ Virgin Islands (U.S.)
+
+
+ Wallis and Futuna
+
+
+ Western Sahara
+
+
+ Yemen
+
+
+ Zambia
+
+
+ Zimbabwe
+
+
+ Albania
+
+
+ Afghanistan
+
+
+ Antarctica
+
+
+ Bosnia and Herzegovina
+
+
+ Bouvet Island
+
+
+ British Indian Ocean Territory
+
+
+ Bulgaria
+
+
+ Cayman Islands
+
+
+ Christmas Island
+
+
+ Cocos (Keeling) Islands
+
+
+ Cook Islands
+
+
+ French Guiana
+
+
+ French Polynesia
+
+
+ French Southern Territories
+
+
+ Åland Islands
+
+
diff --git a/install-dev/langs/bn/data/gender.xml b/install-dev/langs/bn/data/gender.xml
new file mode 100644
index 000000000..5c3b92391
--- /dev/null
+++ b/install-dev/langs/bn/data/gender.xml
@@ -0,0 +1,6 @@
+
+
+
diff --git a/install-dev/langs/bn/data/group.xml b/install-dev/langs/bn/data/group.xml
new file mode 100644
index 000000000..e1bc26538
--- /dev/null
+++ b/install-dev/langs/bn/data/group.xml
@@ -0,0 +1,6 @@
+
+
+
diff --git a/install-dev/langs/bn/data/index.php b/install-dev/langs/bn/data/index.php
new file mode 100644
index 000000000..10edbfe91
--- /dev/null
+++ b/install-dev/langs/bn/data/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2013 PrestaShop SA
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/langs/bn/data/meta.xml b/install-dev/langs/bn/data/meta.xml
new file mode 100644
index 000000000..de0ac4c12
--- /dev/null
+++ b/install-dev/langs/bn/data/meta.xml
@@ -0,0 +1,159 @@
+
+
+ ৪০৪-ত্রুটি
+ এই পেইজ টি খুজে পাওয়া যায় নি
+ page-not-found
+
+ সেরা বিক্রি
+ আমাদের সেরা বিক্রি
+ best-sales
+
+ আমাদের সাথে যোগাযোগ করুন
+ আমাদের সাথে যোগাযোগ করতে যোগাযোগ ফর্ম ব্যবহার করুন
+ contact-us
+
+ PrestaShop দ্বারা চালিত
+ উতপাদক
+ উতপাদক তালিকা
+ manufacturers
+
+ নতুন পণ্য
+ আমাদের নতুন পণ্য
+ new-products
+
+ আপানর পাসওয়ার্ড ভুলে গেছেন?
+ আপনার নতুন পাসওয়ার্ড মেইল এ পেতে রেজিসট্রেসন মেইল ঠিকানা দিন
+ password-recovery
+
+ মূল্য কমানো
+ আমাদের বিশেষ পণ্য
+ prices-drop
+
+ সাইট ম্যাপ
+ ভুলে গেছেন? যা চান তা খুজুন
+ sitemap
+
+ সরবরাহকারী
+ সরবরাহকারির তালিকা
+ supplier
+
+ ঠিকানা
+ address
+
+ ঠিকানা
+ addresses
+
+ লগ ইন
+ login
+
+ কার্ট
+ cart
+
+ মূল্য ছার
+ discount
+
+ অর্ডার ইতিহাস
+ order-history
+
+ পরিচয়
+ identity
+
+ আমার আকাউনট
+ my-account
+
+ অর্ডার ফলো
+ order-follow
+
+ অর্ডার স্লিপ
+ order-slip
+
+ অর্ডার
+ order
+
+ খোজ
+ search
+
+ দোকান
+ stores
+
+ অর্ডার
+ quick-order
+
+ অতিত্থি অনুসরন
+ guest-tracking
+
+ অর্ডার নিশ্চিত করন
+ order-confirmation
+
+
diff --git a/install-dev/langs/bn/data/order_return_state.xml b/install-dev/langs/bn/data/order_return_state.xml
new file mode 100644
index 000000000..259ad4ebb
--- /dev/null
+++ b/install-dev/langs/bn/data/order_return_state.xml
@@ -0,0 +1,18 @@
+
+
+
+ নিশ্চিত করনের জন্য অপেক্ষমান
+
+
+ প্যাকিং এর জন্য অপেক্ষমাণ
+
+
+ প্যাকেজ রিসিভ করা হয়েছে
+
+
+ ফেরত বাতিল
+
+
+ ফেরত সম্পন্ন
+
+
diff --git a/install-dev/langs/bn/data/order_state.xml b/install-dev/langs/bn/data/order_state.xml
new file mode 100644
index 000000000..c189d6afe
--- /dev/null
+++ b/install-dev/langs/bn/data/order_state.xml
@@ -0,0 +1,51 @@
+
+
+
+ অপেক্ষমান চেক পেমেন্ট
+ cheque
+
+
+ পেমেন্ট গৃহীত
+ payment
+
+
+ প্রস্তুতি আগাচ্ছে
+ preparation
+
+
+ বিলি হয়েছে
+ shipped
+
+
+ পৌঁছানো হয়েছে
+
+
+ বাতিল
+ order_canceled
+
+
+ মূল্য ফেরত
+ refund
+
+
+ পরিশোধ ত্রুটি
+ payment_error
+
+
+ অন ব্যাক অর্ডার
+ outofstock
+
+
+ ব্যাংক অয়্যার পেমেন্ট এর জন্য অপেক্ষমাণ
+ bankwire
+
+
+ পে পল পেমেন্ট এর জন্য অপেক্ষমান
+
+
+ পেমেন্ট স্থানিয় ভাবে গৃহীত
+ payment
+
+
diff --git a/install-dev/langs/bn/data/profile.xml b/install-dev/langs/bn/data/profile.xml
new file mode 100644
index 000000000..c638f90dd
--- /dev/null
+++ b/install-dev/langs/bn/data/profile.xml
@@ -0,0 +1,6 @@
+
+
+
+ সুপার এডমিন
+
+
diff --git a/install-dev/langs/bn/data/quick_access.xml b/install-dev/langs/bn/data/quick_access.xml
new file mode 100644
index 000000000..8a1ea3cae
--- /dev/null
+++ b/install-dev/langs/bn/data/quick_access.xml
@@ -0,0 +1,8 @@
+
+
+
diff --git a/install-dev/langs/bn/data/risk.xml b/install-dev/langs/bn/data/risk.xml
new file mode 100644
index 000000000..bf1c5d57e
--- /dev/null
+++ b/install-dev/langs/bn/data/risk.xml
@@ -0,0 +1,7 @@
+
+
+
diff --git a/install-dev/langs/bn/data/stock_mvt_reason.xml b/install-dev/langs/bn/data/stock_mvt_reason.xml
new file mode 100644
index 000000000..f402e147f
--- /dev/null
+++ b/install-dev/langs/bn/data/stock_mvt_reason.xml
@@ -0,0 +1,27 @@
+
+
+
+ বৃদ্ধি
+
+
+ হ্রাস
+
+
+ ক্রেতা অর্ডার
+
+
+ পণ্য স্টক এর নিয়ম
+
+
+ পণ্য স্টক এর নিয়ম
+
+
+ অন্য গুদামে পাঠান
+
+
+ অন্য গুদাম ত্থেকে আনুন
+
+
+ সরবরাহ আদেশ
+
+
diff --git a/install-dev/langs/bn/data/supplier_order_state.xml b/install-dev/langs/bn/data/supplier_order_state.xml
new file mode 100644
index 000000000..4d2dca3bd
--- /dev/null
+++ b/install-dev/langs/bn/data/supplier_order_state.xml
@@ -0,0 +1,21 @@
+
+
+
+ তইরির উন্নতি
+
+
+ অর্ডার যাচাই হয়েছে
+
+
+ অপেক্ষমান রিসিপট
+
+
+ অর্ডার আংশিক রিসিভ হয়েছে
+
+
+ অর্ডার সম্পূর্ণ রিসিভ হয়েছে
+
+
+ অর্ডার অ্যাটকে আছে
+
+
\ No newline at end of file
diff --git a/install-dev/langs/bn/data/supply_order_state.xml b/install-dev/langs/bn/data/supply_order_state.xml
new file mode 100644
index 000000000..d5ef37dd2
--- /dev/null
+++ b/install-dev/langs/bn/data/supply_order_state.xml
@@ -0,0 +1,21 @@
+
+
+
+ ১-তইরি আগাচ্ছে
+
+
+ ২-অর্ডার যাচাই হয়েছে
+
+
+ ৩- রিসিপট অপেক্ষমান
+
+
+ ৪-অর্ডার আংশিক রিসিভ হয়েছে
+
+
+ ৫- অর্ডার সম্পূর্ণ রিসিভ হয়েছে
+
+
+ ৬- অর্ডার বাতিল
+
+
diff --git a/install-dev/langs/bn/data/tab.xml b/install-dev/langs/bn/data/tab.xml
new file mode 100644
index 000000000..4eaf19c75
--- /dev/null
+++ b/install-dev/langs/bn/data/tab.xml
@@ -0,0 +1,103 @@
+
+
+
diff --git a/install-dev/langs/bn/flag.jpg b/install-dev/langs/bn/flag.jpg
new file mode 100644
index 000000000..7faa049eb
Binary files /dev/null and b/install-dev/langs/bn/flag.jpg differ
diff --git a/install-dev/langs/bn/img/bn-default-category.jpg b/install-dev/langs/bn/img/bn-default-category.jpg
new file mode 100644
index 000000000..c28c90de1
Binary files /dev/null and b/install-dev/langs/bn/img/bn-default-category.jpg differ
diff --git a/install-dev/langs/bn/img/bn-default-home.jpg b/install-dev/langs/bn/img/bn-default-home.jpg
new file mode 100644
index 000000000..ae6658431
Binary files /dev/null and b/install-dev/langs/bn/img/bn-default-home.jpg differ
diff --git a/install-dev/langs/bn/img/bn-default-large.jpg b/install-dev/langs/bn/img/bn-default-large.jpg
new file mode 100644
index 000000000..83f20252e
Binary files /dev/null and b/install-dev/langs/bn/img/bn-default-large.jpg differ
diff --git a/install-dev/langs/bn/img/bn-default-large_scene.jpg b/install-dev/langs/bn/img/bn-default-large_scene.jpg
new file mode 100644
index 000000000..0c8b30dbe
Binary files /dev/null and b/install-dev/langs/bn/img/bn-default-large_scene.jpg differ
diff --git a/install-dev/langs/bn/img/bn-default-medium.jpg b/install-dev/langs/bn/img/bn-default-medium.jpg
new file mode 100644
index 000000000..13546aa40
Binary files /dev/null and b/install-dev/langs/bn/img/bn-default-medium.jpg differ
diff --git a/install-dev/langs/bn/img/bn-default-small.jpg b/install-dev/langs/bn/img/bn-default-small.jpg
new file mode 100644
index 000000000..8cb9417b6
Binary files /dev/null and b/install-dev/langs/bn/img/bn-default-small.jpg differ
diff --git a/install-dev/langs/bn/img/bn-default-thickbox.jpg b/install-dev/langs/bn/img/bn-default-thickbox.jpg
new file mode 100644
index 000000000..6bd5603f7
Binary files /dev/null and b/install-dev/langs/bn/img/bn-default-thickbox.jpg differ
diff --git a/install-dev/langs/bn/img/bn-default-thumb_scene.jpg b/install-dev/langs/bn/img/bn-default-thumb_scene.jpg
new file mode 100644
index 000000000..47d2def48
Binary files /dev/null and b/install-dev/langs/bn/img/bn-default-thumb_scene.jpg differ
diff --git a/install-dev/langs/bn/img/bn.jpg b/install-dev/langs/bn/img/bn.jpg
new file mode 100644
index 000000000..7d07b871d
Binary files /dev/null and b/install-dev/langs/bn/img/bn.jpg differ
diff --git a/install-dev/langs/bn/img/index.php b/install-dev/langs/bn/img/index.php
new file mode 100644
index 000000000..10edbfe91
--- /dev/null
+++ b/install-dev/langs/bn/img/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2013 PrestaShop SA
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/langs/bn/index.php b/install-dev/langs/bn/index.php
new file mode 100644
index 000000000..5e4749107
--- /dev/null
+++ b/install-dev/langs/bn/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2013 PrestaShop SA
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/langs/bn/install.php b/install-dev/langs/bn/install.php
new file mode 100644
index 000000000..a2fe3ecad
--- /dev/null
+++ b/install-dev/langs/bn/install.php
@@ -0,0 +1,205 @@
+ array(
+ 'phone' => '+1 (888) 947-6543',
+ 'documentation' => 'http://doc.prestashop.com/',
+ 'documentation_upgrade' => 'http://docs.prestashop.com/display/PS15/Updating+PrestaShop',
+ 'forum' => 'http://www.prestashop.com/forums/',
+ 'blog' => 'http://www.prestashop.com/blog/',
+ 'support' => 'https://www.prestashop.com/en/support',
+ ),
+ 'translations' => array(
+ 'menu_welcome' => 'আপনার ভাষা নির্বাচন করুন',
+ 'menu_license' => 'লাইসেন্স চুক্তি ',
+ 'menu_system' => 'সিস্টেম প্রয়োজনীয়তা',
+ 'menu_database' => 'সিস্টেম কনফিগারেসন',
+ 'menu_configure' => 'দোকান এর তথ্য ',
+ 'menu_process' => 'দোকান ইন্সটলেসন ',
+ 'Animals and Pets' => 'প্রাণী এবং গৃহপালিত',
+ 'Art and Culture' => 'শিল্প ও সংস্কৃতি',
+ 'Install theme' => 'থিম ইনস্টল হয়েছে',
+ 'An SQL error occured for entity %1$s : %2$s ' => 'এনটিটি %1$s : %2$s এর জন্য একটি SQL ত্রুটি ঘটেছে',
+ 'Cannot create image "%1$s" for entity "%2$s"' => 'এনটিটি "%2$s"এর জন্য চিত্র "%1$s" তৈরি করা যায় নি',
+ 'Cannot create image "%1$s" (bad permissions on folder "%2$s")' => 'চিত্র "%1$s" তৈরি করা যায় নি (ফোল্ডার "%2$s"এ অনুমতি জনিত সমস্যা)',
+ 'Cannot create image "%s"' => 'চিত্র "%s" তৈরি করা যায় নি ',
+ 'SQL error on query %s ' => 'কোয়েরি %s তে SQLত্রুটি',
+ '%s - Login information' => '%s - লগইন তথ্য ',
+ 'Field required' => 'ক্ষেত্রটি প্রয়োজন',
+ 'Invalid shop name' => 'দোকানের নাম ভুল',
+ 'The field %s is limited to %d characters' => 'ক্ষেত্র%s, %dটি বর্ণের ভিতর সিমাবদ্ধ',
+ 'Your firstname contains some invalid characters' => 'আপনার নামের ১ম অংশ কিছু ভুল অক্ষর বহন করছে',
+ 'Your lastname contains some invalid characters' => 'আপনার নামের শেষ অংশ কিছু ভুল অক্ষর বহন করছে ',
+ 'The password is incorrect (alphanumeric string with at least 8 characters)' => 'পাসওয়ার্ডটি ভুল(কমপক্ষে ৮ অক্ষরের সংখা-শব্দ এর মিলিত স্ট্রিং)',
+ 'Password and its confirmation are different' => 'পাসওয়ার্ড এবং তার নিশ্চয়তা ভিন্ন',
+ 'This e-mail address is invalid' => 'এই ইমেইল ঠিকানাটি ভুল',
+ 'Image folder %s is not writable' => 'চিত্রের ফোল্ডার%s অনুলিপি যোগ্য নয়',
+ 'An error occurred during logo copy.' => 'লোগো কপি করার সময় একটি ত্রুটি ঘটেছে',
+ 'An error occurred during logo upload.' => 'লোগো আপলোড করার সময় একটি ত্রুটি ঘটেছে',
+ 'Lingerie and Adult' => ' অন্তর্বাস ও পূর্ণবয়স্ক',
+ 'Babies' => 'শিশু',
+ 'Beauty and Personal Care' => 'সৌন্দর্য্য ও ব্যক্তিগত পরিচর্যা',
+ 'Cars' => 'গাড়ী',
+ 'Computer Hardware and Software' => 'কম্পিউটার হার্ডওয়্যার ও সফটওয়্যার',
+ 'Download' => 'ডাউনলোড',
+ 'Fashion and accessories' => 'ফ্যাশন ও আনুষাঙ্গিক',
+ 'Flowers, Gifts and Crafts' => 'ফুল, উপহার এবং হস্তশিল্প',
+ 'Food and beverage' => 'খাদ্য এবং পানীয়',
+ 'HiFi, Photo and Video' => 'HiFi, ফটো এবং ভিডিও',
+ 'Home and Garden' => 'বাড়ি এবং বাগান',
+ 'Home Appliances' => 'গৃহস্থালি সামগ্রী',
+ 'Jewelry' => 'গয়না',
+ 'Mobile and Telecom' => 'মোবাইল এবং টেলিকম',
+ 'Services' => 'সেবা ',
+ 'Shoes and accessories' => 'জুতো এবং আনুষাঙ্গিক',
+ 'Sports and Entertainment' => 'ক্রীড়া ও বিনোদন',
+ 'Travel' => 'পর্যটন',
+ 'Database is connected' => 'ডাটাবেস সংযুক্ত করা হয়েছে',
+ 'Database is created' => 'ডাটাবেজ তৈরি করা হয়েছে',
+ 'Cannot create the database automatically' => 'স্বয়ংক্রিয়ভাবে ডাটাবেস তৈরি করতে পারবেন না',
+ 'Create settings.inc file' => 'settings.inc ফাইল তৈরি হয়েছে',
+ 'Create database tables' => 'ডাটাবেস সারণী তৈরী হয়েছে',
+ 'Create default shop and languages' => 'ডিফল্ট দোকান এবং ভাষাসমূহ তৈর হয়েছে',
+ 'Populate database tables' => 'ডাটাবেস টেবিল তথ্যপূর্ণ হয়েছে',
+ 'Configure shop information' => 'দোকানের তথ্য কনফিগার হয়েছে',
+ 'Install modules' => 'মডিউল ইনস্টল হয়েছে',
+ 'Install modules Addons' => 'মডিউল অ্যাডঅনস ইনস্টল হয়েছে',
+ 'Install demonstration data' => 'ডেমনেসট্রেসন তথ্য ইনস্টল হয়েছে',
+ 'PHP parameters:' => 'পিএইচপি পরামিতি:',
+ 'PHP 5.1.2 or later is not enabled' => 'পিএইচপি 5.1.2 অথবা পরবর্তী সংস্করণ সক্রিয় করা নেই',
+ 'Cannot upload files' => 'ফাইল আপলোড করা যাচ্ছে না',
+ 'Cannot create new files and folders' => 'নতুন ফাইল এবং ফোল্ডার তৈরি করা যাচ্ছে না',
+ 'GD Library is not installed' => 'জিডি লাইব্রেরী ইনস্টল করা নেই ',
+ 'MySQL support is not activated' => 'মাইএসকিউএল সমর্থন সক্রিয় করা নেই',
+ 'Files' => 'ফাইল',
+ 'All files are not successfuly uploaded on your server' => 'সব ফাইল সফলতার সাথে আপনার সার্ভারে আপলোড করা যায় নি',
+ 'Recursive write permissions on files and folders:' => 'ফাইল এবং ফোল্ডার এর জন্য রিকারসিভ রাইট এর অনুমতি: ',
+ 'Cannot open external URLs' => 'বাহ্যিক URL-খোলা যাচ্ছে না',
+ 'PHP register global option is on' => 'পিএইচপি রেজিসটার বিশ্বব্যাপী বিকল্প সক্রিয় ',
+ 'GZIP compression is not activated' => 'Gzip কম্প্রেশন সক্রিয় করা নেই',
+ 'Mcrypt extension is not enabled' => 'Mcrypt এক্সটেনশন সক্রিয় করা নেই',
+ 'Mbstring extension is not enabled' => 'Mbstring এক্সটেনশন সক্রিয় করা নেই',
+ 'PHP magic quotes option is enabled' => 'PHP magic quotes অপশনটি সক্রিয় করা',
+ 'Dom extension is not loaded' => 'Dom এক্সটেনশন লোড করা হয় নি',
+ 'PDO MySQL extension is not loaded' => 'PDO MySQLএক্সটেনশন লোড করা হয় নি',
+ 'Server name is not valid' => 'সার্ভারের নাম সঠিক নয় ',
+ 'You must enter a database name' => 'আপনাকে একটি ডাটাবেসের নাম লিখতে হবে',
+ 'You must enter a database login' => 'আপনাকে একটি ডাটাবেস লগইন থেকে প্রবেশ করতে হবে',
+ 'Tables prefix is invalid' => 'টেবিল প্রিফিক্স ভুল',
+ 'Cannot convert database data to utf-8' => ' ডাটাবেসের তথ্য utf-8 এ রূপান্তর করতে পারবেন না',
+ 'At least one table with same prefix was already found, please change your prefix or drop your database' => 'একই প্রিফিক্স যুক্ত কমপক্ষে আরও একটি টেবিল পাওয়া গেছে,আপনার প্রিফিক্স বদলান অথবা ডাটাবেস ড্রপ করুন',
+ 'Database Server is not found. Please verify the login, password and server fields' => 'ডাটাবেস সার্ভার খুঁজে পাওয়া যায় নি।লগইন, পাসওয়ার্ড এবং সার্ভার ক্ষেত্র দয়া করে যাচাই করুন।',
+ 'Connection to MySQL server succeeded, but database "%s" not found' => 'MySQLসার্ভারে সংযোগ সফল হএচে,কিন্তু ডাটাবেস "%s" খুজে পাওয়া যায় নি',
+ 'Attempt to create the database automatically' => 'স্বয়ংক্রিয়ভাবে ডাটাবেস তৈরি করার চেষ্টা করুন',
+ '%s file is not writable (check permissions)' => '%sফাইল লিখনযোগ্য নয়(অনুমতি চেক করুন)',
+ '%s folder is not writable (check permissions)' => '%sফোল্ডার লিখনযোগ্য নয়(অনুমতি চেক করুন) ',
+ 'Cannot write settings file' => 'সেটিংস ফাইল রাইট করা যায় নি ',
+ 'Database structure file not found' => 'ডাটাবেজ কাঠামো ফাইল খুঁজে পাওয়া যায় নি',
+ 'Cannot create group shop' => 'গ্রুপ দোকান তৈরি করা যায় নি ',
+ 'Cannot create shop' => ' দোকান তৈরি করা যায় নি ',
+ 'Cannot create shop URL' => ' দোকানের URL তৈরি করা যায় নি ',
+ 'File "language.xml" not found for language iso "%s"' => '"language.xml"ফাইল টি language iso "%s" তে পাওয়া যায় নি',
+ 'File "language.xml" not valid for language iso "%s"' => '"language.xml" ফাইল টি language iso "%s এর জন্য সঠিক নয়',
+ 'Cannot install language "%s"' => ' "%s" ভাষা ইনস্টল করা যাচ্ছে না',
+ 'Cannot copy flag language "%s"' => '"%s" ফ্লাগ ভাষা কপি করা যাচ্ছে না ',
+ 'Cannot create admin account' => 'এডমিন অ্যাকাউন্ট তৈরি করা যায় নি ',
+ 'Cannot install module "%s"' => '"%s" মডিউল ইনস্টল করা যাচ্ছে না',
+ 'Fixtures class "%s" not found' => '"%s" Fixtures class পাওয়া যায় নি',
+ '"%s" must be an instane of "InstallXmlLoader"' => '"%s" কে অবশ্যই "InstallXmlLoader" এর একটি instaneহতে হবে',
+ 'Information about your Store' => 'আপনার দোকান সম্পর্কে তথ্য',
+ 'Shop name:' => 'দোকানের নাম:',
+ 'Main activity:' => 'মুখ্য কার্যকলাপ:',
+ 'Please choose your main activity' => 'আপনার প্রধান কার্যকলাপ বেছে নিন',
+ 'Other activity...' => 'অন্য কার্যকলাপ ...',
+ 'Help us learn more about your store so we can offer you optimal guidance and the best features for your business!' => 'আমরা যাতে আপনাকে আপনার ব্যবসার জন্য অনুকূল নির্দেশিকা এবং সর্বোত্তম বৈশিষ্ট্য অফার করতে পারি সেজন্য আমাদের আপনার দোকান সম্বন্ধে আরও জানতে সাহায্য করুন!',
+ 'Install demo products:' => 'ডেমো পণ্য ইনস্টল করুন:',
+ 'Yes' => 'হ্যাঁ',
+ 'No' => 'না ',
+ 'Demo products are a good way to learn how to use PrestaShop. You should install them if you are not familiar with it.' => 'ডেমো পণ্য PrestaShopএর ব্যবহার শিখার একটি ভালো উপায়।আপনি যদি এটার সাথে পরিচিত না হন, তাহলে তাদের ইনস্টল করা উচিত।',
+ 'Country:' => 'দেশ:',
+ 'Select your country' => 'আপনার দেশ নির্বাচন করুন',
+ 'Shop timezone:' => 'দোকানের সময় অঞ্চল(timezone):',
+ 'Select your timezone' => 'আপনার সময় অঞ্চল নির্বাচন করুন',
+ 'Shop logo:' => 'দোকান লোগো:',
+ 'Optional - You can add you logo at a later time.' => 'ঐচ্ছিক - পরবর্তী সময়ে লোগো যোগ করতে পারেন.',
+ 'Your Account' => 'আপনার অ্যাকাউন্ট',
+ 'First name:' => 'নামের ১ম অংশঃ',
+ 'Last name:' => 'নামের শেষ অংশঃ',
+ 'E-mail address:' => 'ইমেইল ঠিকানা:',
+ 'This email address will be your username to access your store\'s back office.' => 'এই ইমেইল ঠিকানা আপনার দোকান এর ব্যাক অফিস অ্যাক্সেস করতে আপনার ইউজারনেম হবে',
+ 'Shop password:' => 'দোকানের পাসওয়ার্ড:',
+ 'Must be letters and numbers with at least 8 characters' => 'কমপক্ষে ৮ অক্ষরের অক্ষর এবং সংখ্যায় হতে হবে',
+ 'Re-type to confirm:' => 'নিশ্চিত করার জন্য আবার টাইপ করুন:',
+ 'Sign-up to the newsletter' => 'নিউজলেটারে সাইন আপ করুন ',
+ 'PrestaShop can provide you with guidance on a regular basis by sending you tips on how to optimize the management of your store which will help you grow your business. If you do not wish to receive these tips, please uncheck this box.' => 'আপনার দোকান পরিচালনার অনুকূল টিপস প্রেরণ করে একটি নিয়মিত ভিত্তিতে নির্দেশিকা দিয়ে PrestaShop আপনার ব্যবসা বৃদ্ধি করতে সহায়তা করবে।আপনি এই টিপস পেতে না চাইলে এই বাক্সটি আনচেক করুন।',
+ 'Configure your database by filling out the following fields:' => 'নিম্নলিখিত ক্ষেত্রগুলি পূরণ করে আপনার ডাটাবেস কনফিগার করুন:',
+ 'To use PrestaShop, you must ডেটাবেস তৈরি করুন to collect all of your store’s data-related activities.' => 'PrestaShop ব্যবহার করতে আপনাকে অবশ্যই
ডাটাবেস তৈরি করুন এ আপনার দোকান এর তথ্য সংক্রান্ত কার্যক্রম পূরণ করতে হবে',
+ 'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'PrestaShop আপনার ডাটাবেসের সাথে সংযোগ করার জন্য নীচের ক্ষেত্রগুলি পূরণ করুন.',
+ 'Database server address:' => 'ডাটাবেস সার্ভারের ঠিকানা:',
+ 'The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".' => 'ডিফল্ট পোর্ট হল 3306।ভিন্ন পোর্ট ব্যবহার করতে হলে আপনার সার্ভারের ঠিকানা এবং শেষে পোর্ট সংখ্যা যোগ করুন।যেমন-":4242". ',
+ 'Database name:' => 'ডেটাবেস নাম:',
+ 'Database login:' => 'ডাটাবেস লগইন:',
+ 'Database password:' => 'ডাটাবেজ পাসওয়ার্ড:',
+ 'Database Engine:' => 'ডাটাবেস ইঞ্জিন:',
+ 'Tables prefix:' => 'টেবিল প্রিফিক্সঃ',
+ 'Drop existing tables (mode dev):' => 'বিদ্যমান টেবিল ড্রপ করুন(mode dev):',
+ 'Test your database connection now!' => 'এখন আপনার ডাটাবেস সংযোগ পরীক্ষা করুন!',
+ 'E-mail delivery set-up' => 'ই মেইল বিতরণের সেট আপ',
+ 'Configure SMTP manually (advanced users only)' => 'নিজে SMTP-কনফিগার করুন(দক্ষ ব্যবহারকারীদের জন্য শুধুমাত্র)',
+ 'By default, the PHP mail() function is used' => 'ডিফল্টরূপে পিএইচপি মেইল () ফাংশন ব্যবহার করা হয়েছে',
+ 'SMTP server address:' => 'SMTP সার্ভারের ঠিকানা:',
+ 'Encryption:' => 'এনক্রিপশন:',
+ 'None' => 'কোনোটা না',
+ 'Port:' => 'পোর্ট:',
+ 'Login:' => 'লগইন:',
+ 'Password:' => 'পাসওয়ার্ড:',
+ 'enter@your.email' => 'enter@your.email ',
+ 'Send me a test email!' => 'আমাকে একটা পরীক্ষামূলক ইমেল প্রেরণ করুন!',
+ 'Next' => 'পরবর্তী ',
+ 'Back' => 'পূর্ববর্তী',
+ 'If you need some assistance during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'ইনস্টলেশনের সময় যদি সহায়তার প্রয়োজন হয়, তাহলে আমাদের দলের %sএ কল করুন এবং আমাদের বিশেষজ্ঞরা সাহায্য করতে পারলে খুশি হবেন',
+ 'Official forum' => 'অফিসিয়াল ফোরাম',
+ 'Support' => 'সহায়তা',
+ 'Documentation' => 'নথিপত্র করন',
+ 'Contact us' => 'আমাদের সাথে যোগাযোগ করুন',
+ 'PrestaShop Installation Assistant' => 'PrestaShop ইনস্টলেশন সহকারী',
+ 'Forum' => 'ফোরাম',
+ 'Blog' => 'ব্লগ',
+ 'Contact us!' => 'আমাদের সাথে যোগাযোগ করুন',
+ 'Installation Assistant' => 'ইনস্টলেশন সহকারী',
+ 'To install PrestaShop, you need to have JavaScript enabled in your browser.' => 'PrestaShop ইনস্টল করার জন্য,আপনাকে জাভাস্ক্রিপ্ট আপনার ব্রাউজারে সক্রিয় করতে হবে',
+ 'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript' => 'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript',
+ 'License Agreements' => 'লাইসেন্স চুক্তি',
+ 'To enjoy the many features that are offered for free by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.' => 'PrestaShop দ্বারা বিনামূল্যে দেওয়া অনেক বৈশিষ্ট্য ভোগ করতে, নীচের লাইসেন্স শর্ত দয়া করে পড়ুন।PrestaShop কোর, OSL 3.0 এর অধীনে লাইসেন্স করা হয় এবং মডিউল, এবং থিমগুলি afl 3.0 অধীনে লাইসেন্স করা হয়',
+ 'I agree to the above terms and conditions.' => 'আমি উপরের শর্তাবলীর সাথে সম্মত ',
+ 'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'আমি আমার কনফিগারেশন সম্পর্কে বেনামী তথ্য পাঠিয়ে সমাধান উন্নতিতে অংশগ্রহণের জন্য সম্মত ',
+ 'Done!' => 'সম্পন্ন!',
+ 'An error occured during installation...' => 'একটি ত্রুটি ইনস্টলেশনের সময় ঘটেছে ...',
+ 'You can use the links on the left column to go back to the previous steps, or restart the installation process by
clicking here .' => 'আপনি বাম কলামের পিছনে ফেরার লিঙ্ক দিয়ে আগের ধাপে ফিরে যেতে পারেন অথবা ইনস্টলেশন প্রক্রিয়া পুনরায় আরম্ভ করুন-
clicking here . হতে',
+ 'Your installation is finished!' => 'আপনার ইনস্টলেশন সমাপ্ত!',
+ 'You have just finished installing your shop. Thank you for using PrestaShop!' => ' আপনার দোকান ইনস্টল সমাপ্ত হয়েছে. PrestaShop ব্যবহারের জন্য আপনাকে ধন্যবাদ!',
+ 'Please remember your login information:' => 'আপনার লগইন তথ্য দয়া করে মনে রাখবেন:',
+ 'E-mail:' => 'ই মেইল:',
+ 'Print my login information' => 'আপনার লগইন তথ্য মুদ্রণ করুন',
+ 'Display' => 'প্রদর্শন ',
+ 'For security purposes, you must delete the "install" folder.' => 'নিরাপত্তার জন্য "install" ফোল্ডার মুছে ফেলা আবশ্যক.',
+ 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation' => 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation ',
+ 'Back Office' => 'ব্যাক অফিস',
+ 'Manage your store using your Back Office. Manage your orders and customers, add modules, change themes, etc.' => 'আপনার ব্যাক অফিস ব্যবহার করে আপনার দোকান পরিচালনা করুন।আপনার অর্ডার এবং গ্রাহকদের, মডিউল, থিম পরিবর্তন , ইত্যাদি পরিচালনা করুন',
+ 'Manage your store' => 'আপনার দোকান পরিচালনা করুন',
+ 'Front Office' => 'ফ্রন্ট অফিস',
+ 'Discover your store as your future customers will see it!' => 'আপনার ভবিষ্যত গ্রাহক দেখতে পাবে আপনার যে দোকানটি তা আবিস্কার করুন!',
+ 'Discover your store' => 'আপনার দোকান উন্মোচন করুন',
+ 'We are currently checking PrestaShop compatibility with your system environment' => 'আমরা বর্তমানে আপনার সিস্টেম পরিবেশের সঙ্গে PrestaShopএর উপযুক্ততা যাচাই করছি',
+ 'If you have any questions, please visit our
documentation and
community forum .' => 'যদি আপনার কোন প্রশ্ন থাকে, তাহলে অনুগ্রহপূর্বক আমাদের
নথিপত্র এবং
কমুনিটি ফোরাম . পরিদর্শন করুন',
+ 'PrestaShop compatibility with your system environment has been verified!' => 'আপনার সিস্টেমে পরিবেশের সঙ্গে PrestaShop উপযুক্ততা যাচাই করা হয়েছে!',
+ 'Oops! Please correct the item(s) below, and then click "Refresh information" to test the compatibility of your new system.' => ' নীচের আইটেম (গুলি) দয়া করে সঠিক করুন তারপর আপনার নতুন সিস্টেম সামঞ্জস্যের পরীক্ষা করতে "Refresh information" ক্লিক করুন',
+ 'Refresh these settings' => 'এই সেটিংস রিফ্রেশ করুন',
+ 'PrestaShop requires at least 32M of memory to run, please check the memory_limit directive in php.ini or contact your host provider' => 'PrestaShop চালাতে অন্তত 32M মেমরি প্রয়োজন।php.ini তে আপনার মেমরি চেক করুন অথবা অথবা আপনার হোস্ট সরবরাহকারীর সাথে যোগাযোগ করুন।',
+ 'Welcome to the PrestaShop %s Installer.' => 'PrestaShop ইনস্টলার %s এ স্বাগতম',
+ 'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 150,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => 'PrestaShop ইনস্টলেশনের দ্রুত এবং সহজ।মাত্র কয়েক মুহূর্তের মধ্যে, আপনি আরও ১৫০০০০ ব্যাবসায়ি নিয়ে গঠিত একটি কমিউনিটির অংশ হয়ে যাবেন।আপনি প্রতিদিন সহজে পরিচালনা করতে পারবেন এমন একটি নিজস্ব অনন্য অনলাইন দোকান নির্মাণ করতে যাচ্ছেন।',
+ 'If you need help, do not hesitate to check
আমাদের নত্থি করন or to contact our support team: %2$s' => 'যদি আপনার সাহায্যের প্রয়োজন হলে,
আমাদের ম্যানুয়াল চেক করতে বিব্রত বোধ করবেন না অথবা আমাদের সহায়ক দলের সাথে যোগাযোগ করুন: %2$s ',
+ 'Continue the installation in:' => 'ইনস্টলেশন চালিয়ে যান:',
+ 'The language selection above only applies to the Installation Assistant. Once your store is installed, you can choose the language of your store from over %d translations, all for free!' => 'উপরোক্ত ভাষা নির্বাচন শুধুমাত্র ইনস্টলেশনের সহকারীর জন্য প্রযোজ্য।আপনার দোকান ইনস্টল করা হলে,আপনি উপর থেকে আপনার দোকানের ভাষা নির্বাচন করতে পারবেন একদম বিনামূল্যে!',
+ 'If you need help, do not hesitate to check
our documentation or to contact our support team: %2$s' => ' যদি আপনার কোনো সাহায্যের দরকার হয়,তবে আমাদের নত্থিপত্র
চেক করতে দ্বিধা করবেন না অথবা আমাদের সাপোর্ট টিম এর সাথে যোগাযোগ করুন: %2$s ',
+ ),
+);
\ No newline at end of file
diff --git a/install-dev/langs/bn/language.xml b/install-dev/langs/bn/language.xml
new file mode 100644
index 000000000..e7ab53813
--- /dev/null
+++ b/install-dev/langs/bn/language.xml
@@ -0,0 +1,8 @@
+
+
+ bn-bd
+ m/j/Y
+ m/j/Y H:i:s
+ false
+
diff --git a/install-dev/langs/bn/mail_identifiers.txt b/install-dev/langs/bn/mail_identifiers.txt
new file mode 100644
index 000000000..3f768acb3
--- /dev/null
+++ b/install-dev/langs/bn/mail_identifiers.txt
@@ -0,0 +1,10 @@
+Hi {firstname} {lastname},
+
+Here is your personal login information for {shop_name}:
+
+Password: {passwd}
+E-mail address: {email}
+
+{shop_name} - {shop_url}
+
+{shop_url} powered by PrestaShop™
\ No newline at end of file
diff --git a/install-dev/langs/br/install.php b/install-dev/langs/br/install.php
index ab4e5715b..a397797ce 100644
--- a/install-dev/langs/br/install.php
+++ b/install-dev/langs/br/install.php
@@ -2,8 +2,8 @@
return array(
'informations' => array(
'phone' => '+1 888.947.6543',
- 'support' => 'https://www.prestashop.com/pt/support',
- 'blog' => 'http://www.prestashop.com/blog/pt/'
+ 'support' => 'https://www.prestashop.com/pt/support',
+ 'blog' => 'http://www.prestashop.com/blog/pt/',
),
'translations' => array(
'menu_welcome' => 'Escolha seu idioma',
@@ -247,5 +247,7 @@ return array(
'To install PrestaShop, you need to have JavaScript enabled in your browser.' => 'Para instalar o PrestaShop, você precisa ter JavaScript ativado no seu navegador',
'To enjoy the many features that are offered for free by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.' => 'Para aproveitar os muitos recursos que são oferecidos grátis pelo PrestaShop, por favor, leia os termos de licença abaixo. O núcleo do PrestaShop é licenciado sob OSL 3.0, enquanto os módulos e temas são licenciados sob AFL 3.0.',
'For security purposes, you must delete the "install" folder.' => 'Por questões de segurança, você deve deletar a pasta "install"',
+ 'Files' => 'Arquivos',
+ 'All files are not successfuly uploaded on your server' => 'Todos os arquivos não foram carregados no seu servidor com sucesso',
),
-);
+);
\ No newline at end of file
diff --git a/install-dev/langs/de/install.php b/install-dev/langs/de/install.php
index b39302665..5b56f894d 100644
--- a/install-dev/langs/de/install.php
+++ b/install-dev/langs/de/install.php
@@ -234,5 +234,16 @@ return array(
'PrestaShop compatibility with your system environment has been verified!' => 'Die Kompatibilität von PrestaShop mit Ihrem System wurde überprüft!',
'PrestaShop requires at least 32M of memory to run, please check the memory_limit directive in php.ini or contact your host provider' => 'Damit PrestaShop einwandfrei funktionieren kann, werden mindestens 32M Speicher benötigt. Bitte überprüfen Sie die memory_limit directive in php.in oder kontaktieren Sie Ihrem Provider.',
'Your PHP sessions path is not writable - check with your hosting provider:' => 'Der Speicherungsordner ist nicht beschreibbar - bitte kontaktieren Sie Ihren Provider',
+ 'Database is created' => 'Datenbank erstellt',
+ 'Cannot create the database automatically' => 'Datenbank kann nicht automatisch erstellt werden',
+ 'Install modules Addons' => 'Module Addons installieren',
+ 'Files' => 'Dateien',
+ 'All files are not successfuly uploaded on your server' => 'Es wurden nicht alle Dateien erfolgreich auf Ihren Server hochgeladen',
+ 'Attempt to create the database automatically' => 'Versuchen, die Datenbank automatisch zu erstellen.',
+ 'Country:' => 'Land:',
+ 'Must be letters and numbers with at least 8 characters' => 'Zulässig sind Buchstaben und Nummern. Mindestens 8 Zeichen.',
+ 'To install PrestaShop, you need to have JavaScript enabled in your browser.' => 'JavaScript muss in Ihrem Browser aktiviert sein, um PrestaShop zu installieren.',
+ 'To enjoy the many features that are offered for free by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.' => 'Um all die Vorteile zu nutzen, die Ihnen Prestashop bietet, lesen sie bitte die folgenden Bedingungen. Der PrestaShop ist unter OSL 3.0 lizensiert, die Module und Themen unter AFL 3.0.',
+ 'For security purposes, you must delete the "install" folder.' => 'For security purposes, you must delete the "install" folder. - Aus Sicherheitsgründen sollten Sie das Verzeichnis “install” unbedingt löschen.',
),
);
\ No newline at end of file
diff --git a/install-dev/langs/es/install.php b/install-dev/langs/es/install.php
index cb7234192..2375e9b89 100644
--- a/install-dev/langs/es/install.php
+++ b/install-dev/langs/es/install.php
@@ -2,8 +2,8 @@
return array(
'informations' => array(
'phone' => '+34 917.872.909',
- 'support' => 'https://www.prestashop.com/es/support',
- 'blog' => 'http://www.prestashop.com/blog/es/'
+ 'support' => 'https://www.prestashop.com/es/support',
+ 'blog' => 'http://www.prestashop.com/blog/es/',
),
'translations' => array(
'menu_welcome' => 'Elegir el idioma',
@@ -246,5 +246,7 @@ return array(
'To enjoy the many features that are offered for free by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.' => 'Para disfrutar de las numerosas funcionalidades ofrecidas de forma gratuita por PrestaShop, por favor lea los términos de la licencia a continuación. Core PrestaShop está disponible bajo la licencia OSL 3.0, mientras que los módulos y los temas están licenciados bajo la AFL 3.0.',
'For security purposes, you must delete the "install" folder.' => 'Por razones de seguridad, debe eliminar la carpeta "install".',
'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation' => 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation',
+ 'Files' => 'Ficheros',
+ 'All files are not successfuly uploaded on your server' => 'Todos los ficheros no se han subido correctamente al servidor',
),
-);
+);
\ No newline at end of file
diff --git a/install-dev/langs/fr/install.php b/install-dev/langs/fr/install.php
index c4a31b4f5..068e83d6d 100644
--- a/install-dev/langs/fr/install.php
+++ b/install-dev/langs/fr/install.php
@@ -248,5 +248,7 @@ return array(
'Must be letters and numbers with at least 8 characters' => 'Lettres et chiffres avec au moins 8 caractères',
'To install PrestaShop, you need to have JavaScript enabled in your browser.' => 'Pour installer PrestaShop, vous devez avoir JavaScript activé dans votre navigateur',
'For security purposes, you must delete the "install" folder.' => 'Pour des raisons de sécurité, vous devez supprimer le dossier "install" manuellement.',
+ 'Files' => 'Fichiers',
+ 'All files are not successfuly uploaded on your server' => 'Tous les fichiers n\'ont pas été correctement téléchargés sur votre serveur',
),
);
\ No newline at end of file
diff --git a/install-dev/langs/id/data/carrier.xml b/install-dev/langs/id/data/carrier.xml
new file mode 100644
index 000000000..d1ebb0c7e
--- /dev/null
+++ b/install-dev/langs/id/data/carrier.xml
@@ -0,0 +1,6 @@
+
+
+
+ Ambil di toko
+
+
diff --git a/install-dev/langs/id/data/category.xml b/install-dev/langs/id/data/category.xml
new file mode 100644
index 000000000..d619f5a04
--- /dev/null
+++ b/install-dev/langs/id/data/category.xml
@@ -0,0 +1,19 @@
+
+
+
+ Root
+ root
+
+
+ Beranda
+ beranda
+
+
diff --git a/install-dev/langs/id/data/cms.xml b/install-dev/langs/id/data/cms.xml
new file mode 100644
index 000000000..490e8515d
--- /dev/null
+++ b/install-dev/langs/id/data/cms.xml
@@ -0,0 +1,42 @@
+
+
+
+ Pengiriman barang
+ Tata cara pengiriman barang
+ pengiriman barang
+ <h2>Pengiriman barang</h2><h3>Your pack shipment</h3><p>Packages are generally dispatched within 2 days after receipt of payment and are shipped via UPS with tracking and drop-off without signature. If you prefer delivery by UPS Extra with required signature, an additional cost will be applied, so please contact us before choosing this method. Whichever shipment choice you make, we will provide you with a link to track your package online.</p><p>Shipping fees include handling and packing fees as well as postage costs. Handling fees are fixed, whereas transport fees vary according to total weight of the shipment. We advise you to group your items in one order. We cannot group two distinct orders placed separately, and shipping fees will apply to each of them. Your package will be dispatched at your own risk, but special care is taken to protect fragile objects.<br /><br />Boxes are amply sized and your items are well-protected.</p>
+ pengiriman-barang
+
+
+ Kebijakan privasi dan hukum
+ Kebijakan privasi dan hukum
+ notice, legal, credits
+ <h2>Kebijakan privasi dan hukum</h2><p>Tentang kebijakan privasi dan hukum bagi pelanggan</p><p>Website ini dibuat menggunakan <a href="http://www.prestashop.com">PrestaShop</a>™ open-source software.</p>
+ kebijakan-privasi-dan-hukum
+
+
+ Syarat pemakaian
+ Syarat pemakaian
+ conditions, terms, use, sell
+ <h2>Syarat dan ketentuan pemakaian website</h2><p>Tentang syarat dan ketentuan pemakaian website (penggunaan cookies, penggunaan data customer, dsb)</p>
+
+ syarat-pemakaian
+
+
+ Tentang kami
+ Lebih lanjut mengenai kami
+ about us, informations
+ <h2>Tentang kami</h2>
+<p>Informasi tentang toko Anda</p>
+
+ tentang-kami
+
+
+ Pembayaran
+ Pembayaran
+ secure payment, ssl, visa, mastercard, paypal
+ <h2>Pembayaran</h2>
+<p>Detail tentang pembayaran</p>
+ pembayaran
+
+
diff --git a/install-dev/langs/id/data/cms_category.xml b/install-dev/langs/id/data/cms_category.xml
new file mode 100644
index 000000000..e4766e093
--- /dev/null
+++ b/install-dev/langs/id/data/cms_category.xml
@@ -0,0 +1,11 @@
+
+
+
+ Beranda
+ beranda
+
+
diff --git a/install-dev/langs/id/data/configuration.xml b/install-dev/langs/id/data/configuration.xml
new file mode 100644
index 000000000..eb0121de4
--- /dev/null
+++ b/install-dev/langs/id/data/configuration.xml
@@ -0,0 +1,21 @@
+
+
+
+ IN
+
+
+ DE
+
+
+ a|the|of|on|in|and|to
+
+
+ 0
+
+
+ Halo,
+
+Salam kami,
+Customer service
+
+
diff --git a/install-dev/langs/id/data/contact.xml b/install-dev/langs/id/data/contact.xml
new file mode 100644
index 000000000..beded785c
--- /dev/null
+++ b/install-dev/langs/id/data/contact.xml
@@ -0,0 +1,9 @@
+
+
+
+ Jika terdapat masalah teknis di website kami
+
+
+ Untuk pertanyaan seputar produk dan pembelian
+
+
diff --git a/install-dev/langs/id/data/country.xml b/install-dev/langs/id/data/country.xml
new file mode 100644
index 000000000..d57ea1e36
--- /dev/null
+++ b/install-dev/langs/id/data/country.xml
@@ -0,0 +1,735 @@
+
+
+
+ Germany
+
+
+ Austria
+
+
+ Belgium
+
+
+ Canada
+
+
+ China
+
+
+ Spain
+
+
+ Finland
+
+
+ France
+
+
+ Greece
+
+
+ Italy
+
+
+ Japan
+
+
+ Luxemburg
+
+
+ Netherlands
+
+
+ Poland
+
+
+ Portugal
+
+
+ Czech Republic
+
+
+ United Kingdom
+
+
+ Sweden
+
+
+ Switzerland
+
+
+ Denmark
+
+
+ United States
+
+
+ HongKong
+
+
+ Norway
+
+
+ Australia
+
+
+ Singapore
+
+
+ Ireland
+
+
+ New Zealand
+
+
+ South Korea
+
+
+ Israel
+
+
+ South Africa
+
+
+ Nigeria
+
+
+ Ivory Coast
+
+
+ Togo
+
+
+ Bolivia
+
+
+ Mauritius
+
+
+ Romania
+
+
+ Slovakia
+
+
+ Algeria
+
+
+ American Samoa
+
+
+ Andorra
+
+
+ Angola
+
+
+ Anguilla
+
+
+ Antigua and Barbuda
+
+
+ Argentina
+
+
+ Armenia
+
+
+ Aruba
+
+
+ Azerbaijan
+
+
+ Bahamas
+
+
+ Bahrain
+
+
+ Bangladesh
+
+
+ Barbados
+
+
+ Belarus
+
+
+ Belize
+
+
+ Benin
+
+
+ Bermuda
+
+
+ Bhutan
+
+
+ Botswana
+
+
+ Brazil
+
+
+ Brunei
+
+
+ Burkina Faso
+
+
+ Burma (Myanmar)
+
+
+ Burundi
+
+
+ Cambodia
+
+
+ Cameroon
+
+
+ Cape Verde
+
+
+ Central African Republic
+
+
+ Chad
+
+
+ Chile
+
+
+ Colombia
+
+
+ Comoros
+
+
+ Congo, Dem. Republic
+
+
+ Congo, Republic
+
+
+ Costa Rica
+
+
+ Croatia
+
+
+ Cuba
+
+
+ Cyprus
+
+
+ Djibouti
+
+
+ Dominica
+
+
+ Dominican Republic
+
+
+ East Timor
+
+
+ Ecuador
+
+
+ Egypt
+
+
+ El Salvador
+
+
+ Equatorial Guinea
+
+
+ Eritrea
+
+
+ Estonia
+
+
+ Ethiopia
+
+
+ Falkland Islands
+
+
+ Faroe Islands
+
+
+ Fiji
+
+
+ Gabon
+
+
+ Gambia
+
+
+ Georgia
+
+
+ Ghana
+
+
+ Grenada
+
+
+ Greenland
+
+
+ Gibraltar
+
+
+ Guadeloupe
+
+
+ Guam
+
+
+ Guatemala
+
+
+ Guernsey
+
+
+ Guinea
+
+
+ Guinea-Bissau
+
+
+ Guyana
+
+
+ Haiti
+
+
+ Heard Island and McDonald Islands
+
+
+ Vatican City State
+
+
+ Honduras
+
+
+ Iceland
+
+
+ India
+
+
+ Indonesia
+
+
+ Iran
+
+
+ Iraq
+
+
+ Man Island
+
+
+ Jamaica
+
+
+ Jersey
+
+
+ Jordan
+
+
+ Kazakhstan
+
+
+ Kenya
+
+
+ Kiribati
+
+
+ Korea, Dem. Republic of
+
+
+ Kuwait
+
+
+ Kyrgyzstan
+
+
+ Laos
+
+
+ Latvia
+
+
+ Lebanon
+
+
+ Lesotho
+
+
+ Liberia
+
+
+ Libya
+
+
+ Liechtenstein
+
+
+ Lithuania
+
+
+ Macau
+
+
+ Macedonia
+
+
+ Madagascar
+
+
+ Malawi
+
+
+ Malaysia
+
+
+ Maldives
+
+
+ Mali
+
+
+ Malta
+
+
+ Marshall Islands
+
+
+ Martinique
+
+
+ Mauritania
+
+
+ Hungary
+
+
+ Mayotte
+
+
+ Mexico
+
+
+ Micronesia
+
+
+ Moldova
+
+
+ Monaco
+
+
+ Mongolia
+
+
+ Montenegro
+
+
+ Montserrat
+
+
+ Morocco
+
+
+ Mozambique
+
+
+ Namibia
+
+
+ Nauru
+
+
+ Nepal
+
+
+ Netherlands Antilles
+
+
+ New Caledonia
+
+
+ Nicaragua
+
+
+ Niger
+
+
+ Niue
+
+
+ Norfolk Island
+
+
+ Northern Mariana Islands
+
+
+ Oman
+
+
+ Pakistan
+
+
+ Palau
+
+
+ Palestinian Territories
+
+
+ Panama
+
+
+ Papua New Guinea
+
+
+ Paraguay
+
+
+ Peru
+
+
+ Philippines
+
+
+ Pitcairn
+
+
+ Puerto Rico
+
+
+ Qatar
+
+
+ Reunion Island
+
+
+ Russian Federation
+
+
+ Rwanda
+
+
+ Saint Barthelemy
+
+
+ Saint Kitts and Nevis
+
+
+ Saint Lucia
+
+
+ Saint Martin
+
+
+ Saint Pierre and Miquelon
+
+
+ Saint Vincent and the Grenadines
+
+
+ Samoa
+
+
+ San Marino
+
+
+ São Tomé and Príncipe
+
+
+ Saudi Arabia
+
+
+ Senegal
+
+
+ Serbia
+
+
+ Seychelles
+
+
+ Sierra Leone
+
+
+ Slovenia
+
+
+ Solomon Islands
+
+
+ Somalia
+
+
+ South Georgia and the South Sandwich Islands
+
+
+ Sri Lanka
+
+
+ Sudan
+
+
+ Suriname
+
+
+ Svalbard and Jan Mayen
+
+
+ Swaziland
+
+
+ Syria
+
+
+ Taiwan
+
+
+ Tajikistan
+
+
+ Tanzania
+
+
+ Thailand
+
+
+ Tokelau
+
+
+ Tonga
+
+
+ Trinidad and Tobago
+
+
+ Tunisia
+
+
+ Turkey
+
+
+ Turkmenistan
+
+
+ Turks and Caicos Islands
+
+
+ Tuvalu
+
+
+ Uganda
+
+
+ Ukraine
+
+
+ United Arab Emirates
+
+
+ Uruguay
+
+
+ Uzbekistan
+
+
+ Vanuatu
+
+
+ Venezuela
+
+
+ Vietnam
+
+
+ Virgin Islands (British)
+
+
+ Virgin Islands (U.S.)
+
+
+ Wallis and Futuna
+
+
+ Western Sahara
+
+
+ Yemen
+
+
+ Zambia
+
+
+ Zimbabwe
+
+
+ Albania
+
+
+ Afghanistan
+
+
+ Antarctica
+
+
+ Bosnia and Herzegovina
+
+
+ Bouvet Island
+
+
+ British Indian Ocean Territory
+
+
+ Bulgaria
+
+
+ Cayman Islands
+
+
+ Christmas Island
+
+
+ Cocos (Keeling) Islands
+
+
+ Cook Islands
+
+
+ French Guiana
+
+
+ French Polynesia
+
+
+ French Southern Territories
+
+
+ Åland Islands
+
+
diff --git a/install-dev/langs/id/data/gender.xml b/install-dev/langs/id/data/gender.xml
new file mode 100644
index 000000000..539f01c64
--- /dev/null
+++ b/install-dev/langs/id/data/gender.xml
@@ -0,0 +1,6 @@
+
+
+
diff --git a/install-dev/langs/id/data/group.xml b/install-dev/langs/id/data/group.xml
new file mode 100644
index 000000000..13c5d0bbe
--- /dev/null
+++ b/install-dev/langs/id/data/group.xml
@@ -0,0 +1,6 @@
+
+
+
diff --git a/install-dev/langs/id/data/index.php b/install-dev/langs/id/data/index.php
new file mode 100644
index 000000000..10edbfe91
--- /dev/null
+++ b/install-dev/langs/id/data/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2013 PrestaShop SA
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/langs/id/data/meta.xml b/install-dev/langs/id/data/meta.xml
new file mode 100644
index 000000000..ca55aa033
--- /dev/null
+++ b/install-dev/langs/id/data/meta.xml
@@ -0,0 +1,159 @@
+
+
+ Eror 404
+ Halaman tidak ditemukan
+ error, 404, not found
+ halaman-tidak-ditemukan
+
+ Terlaris
+ Produk terlaris
+ best sales
+ terlaris
+
+ Hubungi kami
+ Gunakan form ini untuk menghubungi kami
+ contact, form, e-mail
+ hubungi-kami
+
+ didukung oleh PrestaShop
+ shop, prestashop
+ Merk
+ Daftar merk
+ manufacturer
+ merk
+
+ Produk terbaru
+ Produk terbaru
+ new, products
+ produk-terbaru
+
+ Lupa password
+ Isi alamat e-mail dengan alamat e-mail yang Anda gunakan sewaktu mendaftar yang akan digunakan untuk mengirim password baru
+ forgot, password, e-mail, new, reset
+ lupa-password
+
+ Turun harga
+ Daftar produk diskon
+ special, prices drop
+ turun-harga
+
+ Sitemap
+ Tersesat ? Temukan yang anda cari
+ sitemap
+ sitemap
+
+ Supplier
+ Daftar supplier
+ supplier
+ supplier
+
+ Alamat
+ alamat
+
+ Daftar Alamat
+ daftar-alamat
+
+ Login
+ login
+
+ Keranjang belanja
+ keranjang-belanja
+
+ Diskon
+ diskon
+
+ Riwayat pembelian
+ riwayat-pembelian
+
+ Identitas
+ identitas
+
+ Akun saya
+ akun-saya
+
+ Pantau order
+ pantau-order
+
+ Slip order
+ slip-order
+
+ Order
+ order
+
+ Cari
+ cari
+
+ Toko
+ toko
+
+ Order
+ quick-order
+
+ Guest tracking
+ guest-tracking
+
+ Konfirmasi pembelian
+ konfirmasi-pembelian
+
+
diff --git a/install-dev/langs/id/data/order_return_state.xml b/install-dev/langs/id/data/order_return_state.xml
new file mode 100644
index 000000000..a6c67e83d
--- /dev/null
+++ b/install-dev/langs/id/data/order_return_state.xml
@@ -0,0 +1,18 @@
+
+
+
+ Menunggu konfirmasi
+
+
+ Menunggu paket
+
+
+ Paket diterima
+
+
+ Retur ditolak
+
+
+ Retur berhasil
+
+
diff --git a/install-dev/langs/id/data/order_state.xml b/install-dev/langs/id/data/order_state.xml
new file mode 100644
index 000000000..59cde53ff
--- /dev/null
+++ b/install-dev/langs/id/data/order_state.xml
@@ -0,0 +1,51 @@
+
+
+
+ Menunggu cek pembayaran
+ cheque
+
+
+ Pembayaran diterima
+ payment
+
+
+ Barang tengah disiapkan
+ preparation
+
+
+ Proses pengiriman
+ shipped
+
+
+ Barang telah diterima
+
+
+ Dibatalkan
+ order_canceled
+
+
+ Refund
+ refund
+
+
+ Pembayaran eror
+ payment_error
+
+
+ Sedang dipesan
+ outofstock
+
+
+ Menunggu pembayaran via transfer bank
+ bankwire
+
+
+ Menunggu pembayaran melalui PayPal
+
+
+ Pembayaran diterima
+ payment
+
+
diff --git a/install-dev/langs/id/data/profile.xml b/install-dev/langs/id/data/profile.xml
new file mode 100644
index 000000000..b388d5f2b
--- /dev/null
+++ b/install-dev/langs/id/data/profile.xml
@@ -0,0 +1,6 @@
+
+
+
+ SuperAdmin
+
+
diff --git a/install-dev/langs/id/data/quick_access.xml b/install-dev/langs/id/data/quick_access.xml
new file mode 100644
index 000000000..7fc7ada78
--- /dev/null
+++ b/install-dev/langs/id/data/quick_access.xml
@@ -0,0 +1,8 @@
+
+
+
diff --git a/install-dev/langs/id/data/risk.xml b/install-dev/langs/id/data/risk.xml
new file mode 100644
index 000000000..b1c2a985d
--- /dev/null
+++ b/install-dev/langs/id/data/risk.xml
@@ -0,0 +1,7 @@
+
+
+
diff --git a/install-dev/langs/id/data/stock_mvt_reason.xml b/install-dev/langs/id/data/stock_mvt_reason.xml
new file mode 100644
index 000000000..11225c1bb
--- /dev/null
+++ b/install-dev/langs/id/data/stock_mvt_reason.xml
@@ -0,0 +1,27 @@
+
+
+
+ Tambah
+
+
+ Kurangi
+
+
+ Order dari pelanggan
+
+
+ Aturan mengenai stok barang
+
+
+ Aturan mengenai stok barang
+
+
+ Transfer ke gudang lain
+
+
+ Transfer dari gudang lain
+
+
+ Supply Order
+
+
diff --git a/install-dev/langs/id/data/supplier_order_state.xml b/install-dev/langs/id/data/supplier_order_state.xml
new file mode 100644
index 000000000..7d42ca73a
--- /dev/null
+++ b/install-dev/langs/id/data/supplier_order_state.xml
@@ -0,0 +1,21 @@
+
+
+
+ sedang dibuat
+
+
+ Order berhasil divalidasi
+
+
+ Menunggu barang
+
+
+ Barang diterima terpisah
+
+
+ Barang berhasil diterima
+
+
+ barang diproses
+
+
\ No newline at end of file
diff --git a/install-dev/langs/id/data/supply_order_state.xml b/install-dev/langs/id/data/supply_order_state.xml
new file mode 100644
index 000000000..46d6b3339
--- /dev/null
+++ b/install-dev/langs/id/data/supply_order_state.xml
@@ -0,0 +1,21 @@
+
+
+
+ 1 - Persiapan
+
+
+ 2 - Order berhasil divalidasi
+
+
+ 3 - Menunggu barang
+
+
+ 4 - Order diterima terpisah
+
+
+ 5 - Order berhasil diterima
+
+
+ 6 - Pembelian dibatalkan
+
+
diff --git a/install-dev/langs/id/data/tab.xml b/install-dev/langs/id/data/tab.xml
new file mode 100644
index 000000000..e6d9c8f35
--- /dev/null
+++ b/install-dev/langs/id/data/tab.xml
@@ -0,0 +1,105 @@
+
+
+
diff --git a/install-dev/langs/id/flag.jpg b/install-dev/langs/id/flag.jpg
new file mode 100644
index 000000000..1a2b0db48
Binary files /dev/null and b/install-dev/langs/id/flag.jpg differ
diff --git a/install-dev/langs/id/img/id-default-category.jpg b/install-dev/langs/id/img/id-default-category.jpg
new file mode 100644
index 000000000..c28c90de1
Binary files /dev/null and b/install-dev/langs/id/img/id-default-category.jpg differ
diff --git a/install-dev/langs/id/img/id-default-home.jpg b/install-dev/langs/id/img/id-default-home.jpg
new file mode 100644
index 000000000..ae6658431
Binary files /dev/null and b/install-dev/langs/id/img/id-default-home.jpg differ
diff --git a/install-dev/langs/id/img/id-default-large.jpg b/install-dev/langs/id/img/id-default-large.jpg
new file mode 100644
index 000000000..83f20252e
Binary files /dev/null and b/install-dev/langs/id/img/id-default-large.jpg differ
diff --git a/install-dev/langs/id/img/id-default-large_scene.jpg b/install-dev/langs/id/img/id-default-large_scene.jpg
new file mode 100644
index 000000000..0c8b30dbe
Binary files /dev/null and b/install-dev/langs/id/img/id-default-large_scene.jpg differ
diff --git a/install-dev/langs/id/img/id-default-medium.jpg b/install-dev/langs/id/img/id-default-medium.jpg
new file mode 100644
index 000000000..13546aa40
Binary files /dev/null and b/install-dev/langs/id/img/id-default-medium.jpg differ
diff --git a/install-dev/langs/id/img/id-default-small.jpg b/install-dev/langs/id/img/id-default-small.jpg
new file mode 100644
index 000000000..8cb9417b6
Binary files /dev/null and b/install-dev/langs/id/img/id-default-small.jpg differ
diff --git a/install-dev/langs/id/img/id-default-thickbox.jpg b/install-dev/langs/id/img/id-default-thickbox.jpg
new file mode 100644
index 000000000..6bd5603f7
Binary files /dev/null and b/install-dev/langs/id/img/id-default-thickbox.jpg differ
diff --git a/install-dev/langs/id/img/id-default-thumb_scene.jpg b/install-dev/langs/id/img/id-default-thumb_scene.jpg
new file mode 100644
index 000000000..47d2def48
Binary files /dev/null and b/install-dev/langs/id/img/id-default-thumb_scene.jpg differ
diff --git a/install-dev/langs/id/img/id.jpg b/install-dev/langs/id/img/id.jpg
new file mode 100644
index 000000000..7d07b871d
Binary files /dev/null and b/install-dev/langs/id/img/id.jpg differ
diff --git a/install-dev/langs/id/img/index.php b/install-dev/langs/id/img/index.php
new file mode 100644
index 000000000..10edbfe91
--- /dev/null
+++ b/install-dev/langs/id/img/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2013 PrestaShop SA
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/langs/id/index.php b/install-dev/langs/id/index.php
new file mode 100644
index 000000000..5e4749107
--- /dev/null
+++ b/install-dev/langs/id/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2013 PrestaShop SA
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/langs/id/install.php b/install-dev/langs/id/install.php
new file mode 100644
index 000000000..180621db6
--- /dev/null
+++ b/install-dev/langs/id/install.php
@@ -0,0 +1,259 @@
+ array(
+ 'phone' => '+1 (888) 947-6543',
+ 'documentation' => 'http://doc.prestashop.com/',
+ 'documentation_upgrade' => 'http://docs.prestashop.com/display/PS15/Updating+PrestaShop',
+ 'forum' => 'http://www.prestashop.com/forums/viewcategory/85/',
+ 'blog' => 'http://www.prestashop.com/blog/',
+ 'support' => 'http://support.prestashop.com/en/',
+ ),
+ 'translations' => array(
+ 'menu_welcome' => 'Pilih bahasa',
+ 'menu_license' => 'Perjanjian lisensi',
+ 'menu_system' => 'Kompabilitas sistem',
+ 'menu_database' => 'Konfigurasi sistem',
+ 'menu_configure' => 'Informasi toko',
+ 'menu_process' => 'Instalasi toko',
+ 'Choose the installer language:' => 'Pilih bahasa :',
+ 'Field required' => 'Harus diisi',
+ 'Invalid shop name' => 'Nama toko tidak valid',
+ 'Your firstname contains some invalid characters' => 'Nama depan Anda berisi karakter yang tidak diperbolehkan',
+ 'Your lastname contains some invalid characters' => 'Nama belakang Anda berisi karakter yang tidak diperbolehkan',
+ 'Must be alphanumeric string with at least 8 characters' => 'Harus alfanumerik minimal 8 karakter',
+ 'The password is incorrect (alphanumeric string with at least 8 characters)' => 'Password tidak benar (alfanumerik minimal 8 karakter)',
+ 'Password and its confirmation are different' => 'Password dan konfirmasi password tidak sama',
+ 'This e-mail address is invalid' => 'Alamat e-mail salah',
+ 'The uploaded file exceeds the upload_max_filesize directive in php.ini' => 'File yang diupload melebihi seting upload_max_filesize yang ada di php.ini',
+ 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form' => 'File yang diupload melebihi direktif MAX_FILE_SIZE yang diset pada form HTML',
+ 'The uploaded file was only partially uploaded' => 'File yang diupload tidak utuh/terpotong',
+ 'No file was uploaded' => 'Tidak ada file yang diupload',
+ 'Missing a temporary folder' => 'Folder temporer tidak ditemukan',
+ 'Failed to write file to disk' => 'Gagal menulis ke disk',
+ 'File upload stopped by extension' => 'Upload file terhenti karena ekstensi',
+ 'No error code available' => 'Tidak ada kode eror yang sesuai',
+ 'This is not a valid image file' => 'Bukan file gambar yang valid',
+ 'Image type is not supported' => 'File image tidak didukung',
+ 'Image folder %s is not writable' => 'Folder image % tidak dapat ditulisi',
+ 'Cannot upload the file' => 'Tidak dapat mengupload file',
+ 'Lingerie and Adult' => 'Lingerie dan perlengkapan dewasa',
+ 'Animals and Pets' => 'Binatang dan perliharaan',
+ 'Art and Culture' => 'Seni',
+ 'Babies' => 'Bayi',
+ 'Beauty and Personal Care' => 'Kecantikan',
+ 'Cars' => 'Kendaraan bermotor',
+ 'Computer Hardware and Software' => 'Komputer hardware dan software ',
+ 'Download' => 'Download',
+ 'Fashion and accessories' => 'Pakaian dan aksesoris',
+ 'Flowers, Gifts and Crafts' => 'Bunga, kado dan kerajinan',
+ 'Food and beverage' => 'Makanan dan minuman',
+ 'HiFi, Photo and Video' => 'Audio, foto dan vídeo',
+ 'Home and Garden' => 'Bunga dan tanaman',
+ 'Home Appliances' => 'Perlengkapan rumah tangga',
+ 'Jewelry' => 'Perhiasan',
+ 'Mobile and Telecom' => 'Telekomunikasi',
+ 'Services' => 'Jasa',
+ 'Shoes and accessories' => 'Sepatu dan aksesoris',
+ 'Sports and Entertainment' => 'Olahraga dan hiburan',
+ 'Travel' => 'Travel',
+ 'Database is connected' => 'Berhasil terhubung ke database',
+ 'A test e-mail has been sent to %s' => 'Tes email berhasil dikirim ke %s',
+ 'An error occurred while sending email, please verify your parameters' => 'Eror ketika mengirim email, cek ulang konfigurasi email Anda',
+ 'Create settings.inc file' => 'Membuat file settings.inc',
+ 'Create database tables' => 'Membuat tabel database',
+ 'Create default shop and languages' => 'Membuat toko dan bahasa',
+ 'Populate database tables' => 'Mengisi tabel database',
+ 'Configure shop information' => 'Konfigurasi toko',
+ 'Install modules' => 'Install modul',
+ 'Install demonstration data' => 'Install data untuk demo',
+ 'Install theme' => 'Install theme',
+ 'Send information e-mail' => 'Kirim informasi e-mail',
+ 'PHP parameters:' => 'Parameter PHP :',
+ 'Is PHP 5.1.2 or later installed ?' => 'Apakah PHP 5.1.2 atau lebih baru terinstall ?',
+ 'Can upload files ?' => 'Dapat mengupload file ?',
+ 'Can create new files and folders ?' => 'Dapat membuat file dan folder ?',
+ 'Is GD Library installed ?' => 'Apakah library GD terinstall ?',
+ 'Is MySQL support is on ?' => 'Apakah mendukung MySQL ?',
+ 'Recursive write permissions on files and folders:' => 'Hak akses rekursif untuk file dan folder:',
+ 'Can open external URLs ?' => 'Dapat membuka URL eksternal ?',
+ 'Is PHP register global option off (recommended) ?' => 'Opsi PHP register global dinon-aktifkan (disarankan) ?',
+ 'Is GZIP compression activated (recommended) ?' => 'Kompresi GZIP aktif (disarankan) ?',
+ 'Is Mcrypt extension available (recommended) ?' => 'Ekstensi Mcrypt tersedia (disarankan) ?',
+ 'Is PHP magic quotes option deactivated (recommended) ?' => ' Opsi PHP magic_quotes dinon-aktifkan (disarankan) ?',
+ 'Is Dom extension loaded ?' => 'Apakah ekstensi DOM terpasang ?',
+ 'Is PDO MySQL extension loaded ?' => 'Apakah PDO MySQL terpasang ?',
+ 'Shop settings and merchant account information' => 'Seting toko dan akun',
+ 'Shop name:' => 'Nama toko :',
+ 'Main activity:' => 'Kegiatan :',
+ 'Please choose your main activity' => 'Harap pilih kegiatan utama toko ini',
+ 'Other activity...' => 'Kegiatan lainnya...',
+ 'This information is not required, it will only be used for statistical purposes. This information does not change anything in your store.' => 'Informasi ini tidak harus diisi, hanya untuk keperluan statistik dan tidak ada pengaruh apapun ke toko Anda.',
+ 'Install demo products:' => 'Install produk demo :',
+ 'Yes' => 'Ya',
+ 'No' => 'Tidak',
+ 'Demo products are a good way to learn how to use PrestaShop. You should install them if you are not familiar with it.' => 'Demo produk diperlukan jika Anda ingin belajar cara menggunakan PrestaShop. Disarankan untuk diinstall jika Anda masih belum terbiasa dengan Prestashop.',
+ 'Default country:' => 'Negara :',
+ 'Select your country' => 'Pilih negara Anda',
+ 'Shop timezone:' => 'Zona waktu :',
+ 'Select your timezone' => 'Pilih zona waktu',
+ 'Shop logo:' => 'Logo',
+ 'Recommended dimensions:' => 'Dimensi yang direkomendasikan :',
+ 'First name:' => 'Nama depan :',
+ 'Last name:' => 'Nama belakang :',
+ 'E-mail address:' => 'Alamat e-mail :',
+ 'Shop password:' => 'Password toko :',
+ 'Re-type to confirm:' => 'Tulis ulang password untuk konfirmasi :',
+ 'Receive this information by e-mail' => 'Kirim informasi ini melalui e-mail',
+ 'Warning: You will receive this information only if your e-mail configuration is correct.' => 'Perhatian: Anda akan menerima informasi ini jika konfigurasi e-mail Anda benar.',
+ 'Configure your database by filling out the following fields:' => 'Konfigurasi database Anda dengan mengisi field berikut ini :',
+ 'You have to create a database, help available in
our online documentation .' => 'Anda harus membuat database, panduan tersedia di
dokumentasi online Prestashop .',
+ 'Database server address:' => 'Alamat server database :',
+ 'If you want to use a different port, add :XX after your server address where XX is your port number.' => 'Jika Anda ingin menggunakan port yang berbeda, tambahkan :XX setelah alamat server dimana XX adalah nomor port yang Anda gunakan.',
+ 'Database name:' => 'Nama database :',
+ 'Database login:' => 'User database :',
+ 'Database password:' => 'Password database :',
+ 'Database Engine:' => 'Engine database :',
+ 'Tables prefix:' => 'Prefix nama tabel :',
+ 'Drop existing tables (mode dev):' => 'Hapus tabel yang ada (dev mode) :',
+ 'Verify now!' => 'Cek sekarang !',
+ 'E-mail delivery set-up' => 'Setup e-mail',
+ 'Configure SMTP manually (advanced users only)' => 'Konfigurasikan SMTP server secara manual (untuk pengguna ahli)',
+ 'By default, the PHP mail() function is used' => 'Secara default, fungsi PHP mail() yang digunakan',
+ 'SMTP server address:' => 'Alamat server SMTP',
+ 'Encryption:' => 'Enkripsi :',
+ 'None' => '-',
+ 'Port:' => 'Port :',
+ 'Login:' => 'Login :',
+ 'Password:' => 'Password :',
+ 'enter@your.email' => 'alamat@email.anda',
+ 'Send me a test email!' => 'Kirim tes email !',
+ 'Next' => 'Lanjutkan',
+ 'Back' => 'Kembali',
+ 'Official forum' => 'Forum resmi',
+ 'Support' => 'Support',
+ 'Documentation' => 'Dokumentasi',
+ 'Contact us' => 'Hubungi kami',
+ 'Forum' => 'Forum',
+ 'Blog' => 'Blog',
+ 'Done!' => 'Selesai !',
+ 'An error occured during installation...' => 'Eror ketika proses instalasi... ',
+ 'You can use the links on the left column to go back to the previous steps, or restart the installation process by
clicking here .' => 'Anda dapat menggunakan tautan yang ada di kolom sebelah kiri untuk kembali ke langkah sebelumnya the, atau mengulang proses instalasi dengan
klik tautan ini .',
+ 'Your installation is finished!' => 'Proses instalasi selesai !',
+ 'You have just finished installing your shop. Thank you for using PrestaShop!' => 'Proses instalasi berhasil dan selesai. Terima kasih telah menggunakan PrestaShop !',
+ 'Please remember your login information:' => 'Harap ingat informasi login Anda berikut ini :',
+ 'WARNING: For security purposes, you must delete the "install" folder.' => 'PERHATIAN: Untuk keamanan, Anda harus menghapus folder "install".',
+ 'Back Office' => 'Back Office',
+ 'Manage your store using your Back Office. Manage your orders and customers, add modules, change themes, etc.' => 'Kelola toko Anda melalui backoffice, dimana Anda dapat mengatur order, pelanggan, memasang modul, merubah theme dan banyak lagi.., ',
+ 'Manage your store' => 'Kelola toko Anda',
+ 'Front Office' => 'Front Office',
+ 'Discover your store as your future customers will see it!' => 'Jelajahi toko Anda sebagaimana pelanggan mengunjungi website Anda !',
+ 'Discover your store' => 'Kunjungi website Anda',
+ 'Required set-up. Please verify the following checklist items are true.' => 'Harus diseting! Harap pastikan daftar ceklist berikut ini valid.',
+ 'Your configuration is valid, click next to continue!' => 'Konfigurasi Anda sudah benar, silahkan klik tombol lanjutkan !',
+ 'Your configuration is invalid. Please fix the issues below:' => 'Konfigurasi tidak benar. Harap perbaiki permasalahan berikut ini:',
+ 'Optional set-up' => 'Seting opsional',
+ 'Refresh these settings' => 'Refresh setting',
+ 'Welcome to the PrestaShop %s Installer.' => 'Selamat datang di instalasi Prestashop %s',
+ 'The installation process should take only few minutes!' => 'Proses instalasi hanya memerlukan waktu beberapa menit saja!',
+ 'If you need help, do not hesitate to check
our documentation or to contact our support team: %2$s' => 'Jika memerlukan bantuan, jangan ragu untuk membaca
dokumentasi atau hubungi tim kami di : %2$s',
+ 'Did you know?' => 'Tahukah Anda ?',
+ 'PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop dan komunitasnya menawarkan lebih dari %d bahasa secara gratis, tersedia langsung dalam back office Anda pada menu Lokalisasi',
+ 'License Agreements' => 'Perjanjian lisensi',
+ 'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'PrestaShop core dirilis dibawah OSL 3.0 sementara modul PrestaShop dan themes dirilis dibawah AFL 3.0.',
+ 'I agree to the above terms and conditions.' => 'Saya setuju dengan syarat dan ketentuan diatas.',
+ 'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'Saya setuju untuk berpartisipasi mengembangkan Prestashop dengan mengirimkan informasi konfigurasi saya secara anonim.',
+ 'If you have any questions, please visit our
documentation and
community forum .' => 'Jika Anda memiliki pertanyaan, silahkan kunjungi
halaman dokumentasi dan
forum .',
+ 'Test message from PrestaShop' => 'Tes pesan dari PrestaShop',
+ 'This is a test message, your server is now available to send email' => 'Tes pesan, server Anda dapat digunakan untuk mengirimkan email.',
+ '%s - Login information' => '%s - Informasi login',
+ 'An SQL error occured for entity
%1$s :
%2$s ' => 'SQL error untuk objek
%1$s :
%2$s ',
+ 'Cannot create image "%1$s" for entity "%2$s"' => 'Tidak dapat membuat image "%1$s" untuk objek "%2$s"',
+ 'Cannot create image "%1$s" (bad permissions on folder "%2$s")' => 'Tidak dapat membuat image "%1$s" (masalah hak akses di "%2$s")',
+ 'Cannot create image "%s"' => 'Tidak dapat membuat image "%s"',
+ 'SQL error on query
%s ' => 'SQL error pada query
%s ',
+ 'Server name is not valid' => 'Nama server tidak valid',
+ 'You must enter a database name' => 'Nama database harus diisi',
+ 'You must enter a database login' => 'Login database harus diisi',
+ 'Tables prefix is invalid' => 'Prefix tabel tidak valid',
+ 'Wrong engine chosen for MySQL' => 'Pilihan database engine untuk MySQL tidak valid',
+ 'Cannot convert database data to utf-8' => 'Tidak dapat melakukan konversi data ke utf-8',
+ 'At least one table with same prefix was already found, please change your prefix or drop your database' => 'Tabel dengan prefix yang sama ditemukan, harap ganti prefix Anda atau hapus terlebih dahulu databasenya',
+ 'Database Server is not found. Please verify the login, password and server fields' => 'Server database tidak ditemukan. Harap cek informasi login, password dan server',
+ 'Connection to MySQL server succeeded, but database "%s" not found' => 'Koneksi ke server MySQL berhasil, tapi database "%s" tidak ditemukan',
+ 'Engine innoDB is not supported by your MySQL server, please use MyISAM' => 'Engine innoDB tidak didukung oleh server MySQL Anda, harap gunakan MyISAM',
+ '%s file is not writable (check permissions)' => 'File %s tidak dapat ditulisi (cek masalah hak akses)',
+ '%s folder is not writable (check permissions)' => 'Folder %s tidak dapat ditulisi (cek masalah hak akses)',
+ 'Cannot write settings file' => 'Tidak dapat menulis file setting',
+ 'Database structure file not found' => 'Struktur database tidak ditemukan',
+ 'Cannot create group shop' => 'Tidak dapat membuat grup toko',
+ 'Cannot create shop' => 'Tidak dapat membuat toko',
+ 'Cannot create shop URL' => 'Tidak dapat membuat URL untuk toko Anda',
+ 'File "language.xml" not found for language iso "%s"' => 'File "language.xml" tidak ditemukan untuk kode iso bahasa "%s"',
+ 'File "language.xml" not valid for language iso "%s"' => 'File "language.xml" tidak ditemukan untuk kode iso bahasa "%s"',
+ 'Cannot install language "%s"' => 'Tidak dapat meng-install bahasa "%s"',
+ 'Cannot create admin account' => 'Tidak dapat membuat akun admin',
+ 'Cannot install module "%s"' => 'Tidak dapat menginstall modul "%s"',
+ 'Fixtures class "%s" not found' => 'Class "%s" tidak ditemukan',
+ '"%s" must be an instane of "InstallXmlLoader"' => '"%s" harus instance dari "InstallXmlLoader"',
+ 'Display' => 'Display',
+ '
Warning: You cannot use anymore this tool to upgrade your store. You already have
PrestaShop version %1$s installed .
If you want to upgrade to the latest version please read our documentation:
%2$s ' => '
Perhatian: Anda tidak dapat menggunakan tool ini untuk melakukan upgrade Prestashop Anda. Anda menggunakan
PrestaShop versi %1$s .
Jika ingin melakukan upgrade, silahkan baca panduannya di:
%2$s ',
+ 'PrestaShop Wizard Installer' => 'Instalasi PrestaShop',
+ 'Information about your Store' => 'Informasi tentang toko Anda',
+ 'Help us learn more about your store so we can offer you optimal guidance and the best features for your business!' => 'Bantu kami mengenal toko Anda sehingga kami dapat menawarkan bantuan yang optimal dan fitur-fitur terbaik untuk bisnis Anda!',
+ 'Optional - You can add you logo at a later time.' => 'Opsional – Anda dapat menambahkan logo nanti.',
+ 'Your Account' => 'Akun Anda',
+ 'This email address will be your username to access your store\'s back office.' => 'Alamat email ini akan menjadi username Anda untuk mengakses backoffice.',
+ 'PrestaShop can provide you with guidance on a regular basis by sending you tips on how to optimize the management of your store which will help you grow your business. If you do not wish to receive these tips, please uncheck this box.' => 'PrestaShop menawarkan artikel dan tips yang dikirim secara teratur yang berisi tentang optimasi atau bagaimana mengatur toko Anda sehingga bisnis Anda berkembang lebih baik lagi. Jika tidak ingin menerima tips ini, silahkan uncheck kotak dibawah ini.',
+ 'To use PrestaShop, you must
create a database to collect all of your store’s data-related activities.' => 'Untuk menggunakan PrestaShop, Anda harus
membuat database untuk menyimpan data.',
+ 'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Harap lengkapi field dibawah ini agar Prestashop dapat terhubung ke database Anda..',
+ 'The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".' => 'Port default adalah 3306. Untuk menggunakan port yang berbeda, tambahkan nomor port diakhir nama server, misalnya ":4242".',
+ 'Test your database connection now!' => 'Tes koneksi ke database sekarang!',
+ 'PrestaShop Installation Assistant' => 'Instalasi Prestashop',
+ 'Installation Assistant' => 'Instalasi Prestashop',
+ 'To enjoy the many features that are offered by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.' => 'Untuk menikmati fitur-fitur yang ditawarkan PrestaShop, harap baca lisensi dibawah. PrestaShop core dilisensikan menggunakan OSL 3.0, sementara modul dan theme dilisensikan menggunakan AFL 3.0.',
+ 'Print my login information' => 'Cetak informasi login saya',
+ 'We are currently checking PrestaShop compatibility with your system environment' => 'Sedang melakukan cek kompabilitas sistem Anda dengan Prestashop.',
+ 'PrestaShop compatibility with your system environment has been verified!' => 'Kompabilitas Prestashop dengan sistem Anda berhasil diverifikasi!',
+ 'Oops! Please correct the item(s) below, and then click "Refresh information" to test the compatibility of your new system.' => 'Oops! Harap perbaiki item-item dibawah terlebih dahulu, lalu klik tombol "Refresh" untuk tes ulang kompabilitas sistem Anda.',
+ 'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 130,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => 'Proses instalasi PrestaShop cepat dan mudah. Dalam beberapa saat lagi, Anda akan menjadi bagian dari komunitas aktif yang terdiri dari 130.000 toko online. Andapun akan membuat toko online unik untuk Anda sendiri yang dapat dikelola dengan mudah.',
+ 'Continue the installation in:' => 'Lanjutkan instalasi dalam bahasa:',
+ 'The language selection above only applies to the Installation Assistant. Once your store is installed, you can choose the language of your store from over %d translations, all for free!' => 'Pilihan bahasa diatas hanya berlaku ketika proses instalasi. Setelah terinstall, Anda dapat memilih bahasa untuk toko Anda dari lebih %d bahasa yang tersedia secara gratis!',
+ 'The field %s is limited to %d characters' => 'Field %s dibayasi hanya %d karakter',
+ 'An error occurred during logo copy.' => 'Eror ketika menyalin logo',
+ 'An error occurred during logo upload.' => 'Eror ketika upload logo',
+ 'PHP 5.1.2 or later is not enabled' => 'PHP 5.1.2 atau terbaru tidak aktif',
+ 'Cannot upload files' => 'Tidak dapat mengupload file',
+ 'Cannot create new files and folders' => 'Tidak dapat membuat file dan folder baru',
+ 'GD Library is not installed' => 'GD Library tidak tersedia',
+ 'MySQL support is not activated' => 'Dukungan MySQL tidak diaktifkan',
+ 'Cannot open external URLs' => 'Tidak dapat membuka URL lain, akses diblok.',
+ 'PHP register global option is on' => 'Opsi PHP register global aktif',
+ 'GZIP compression is not activated' => 'Kompresi GZIP tidak aktif',
+ 'Mcrypt extension is not enabled' => 'Ekstensi Mcrypt tidak aktif',
+ 'Mbstring extension is not enabled' => 'Ekstensi Mbstring tidak aktif',
+ 'PHP magic quotes option is enabled' => 'Opsi PHP magic quotes aktif',
+ 'Dom extension is not loaded' => 'Extensi Dom tidak aktif',
+ 'PDO MySQL extension is not loaded' => 'Extensi PDO MySQL tidak aktif',
+ 'Cannot copy flag language "%s"' => 'Tidak dapat menyalin icon bendera untuk bahasa "%s" ',
+ 'Sign-up to the newsletter' => 'Berlangganan newsletter',
+ 'If you need some assistance during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'Jika memerlukan bantuan selama proses instalasi, hubungi tim kami di %s dan satu dari tim ahli kami dengan senang hati akan membantu Anda.',
+ 'Contact us!' => 'Hubungi kami!',
+ 'E-mail:' => 'E-mail:',
+ 'PrestaShop requires at least 32M of memory to run, please check the memory_limit directive in php.ini or contact your host provider' => 'PrestaShop membutuhkan memori sedikitnya 32M, harap cek direktif memory_limit di php.ini atau hubungi tempat hosting Anda',
+ 'Your PHP sessions path is not writable - check with your hosting provider:' => 'PHP sessions path tidak dapat ditulisi - cek ke tempat hosting Anda',
+ 'Database is created' => 'Database berhasil dibuat',
+ 'Cannot create the database automatically' => 'Tidak dapat membuat database secara otomatis',
+ 'Install modules Addons' => 'Install modul Addons',
+ 'Attempt to create the database automatically' => 'Mencoba membuat database secara otomatis',
+ 'Country:' => 'Negara :',
+ 'Must be letters and numbers with at least 8 characters' => 'Harus huruf atau angka minimum 8 karakter',
+ 'To install PrestaShop, you need to have JavaScript enabled in your browser.' => 'Untuk proses instalasi Prestashop, Javascript di browser Anda harus aktif.',
+ 'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript' => 'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript',
+ 'To enjoy the many features that are offered for free by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.' => 'Untuk menikmati fitur gratis lainnya di Prestashop, harap baca aturan lisensi dibawah. Prestashop core dilisensikan dibawah OSL 3.0, sementara modul dan theme dilisensikan dibawah AFL 3.0.',
+ 'For security purposes, you must delete the "install" folder.' => 'Untuk alasan keamanan, folder "install" sebaiknya dihapus.',
+ 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation' => 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation',
+ 'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 150,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => 'Proses instalasi PrestaShop cepat dan mudah. Dalam beberapa saat lagi, Anda akan menjadi bagian dari komunitas aktif yang terdiri dari 130.000 toko online. Andapun akan membuat toko online unik untuk Anda sendiri yang dapat dikelola dengan mudah.',
+ 'Files' => 'File',
+ 'All files are not successfuly uploaded on your server' => 'Tidak semua file berhasil diunggah ke server',
+ ),
+);
\ No newline at end of file
diff --git a/install-dev/langs/id/language.xml b/install-dev/langs/id/language.xml
new file mode 100644
index 000000000..74c6246b8
--- /dev/null
+++ b/install-dev/langs/id/language.xml
@@ -0,0 +1,8 @@
+
+
+ id
+ d/m/Y
+ d/m/Y H:i:s
+ false
+
\ No newline at end of file
diff --git a/install-dev/langs/id/mail_identifiers.txt b/install-dev/langs/id/mail_identifiers.txt
new file mode 100644
index 000000000..87c673ef7
--- /dev/null
+++ b/install-dev/langs/id/mail_identifiers.txt
@@ -0,0 +1,10 @@
+Halo {firstname} {lastname},
+
+Berikut adalah informasi login Anda ke {shop_name}:
+
+Password: {passwd}
+E-mail : {email}
+
+{shop_name} - {shop_url}
+
+{shop_url} didukung oleh PrestaShop™
\ No newline at end of file
diff --git a/install-dev/langs/ru/install.php b/install-dev/langs/ru/install.php
index cfa04da4a..395fe5f71 100644
--- a/install-dev/langs/ru/install.php
+++ b/install-dev/langs/ru/install.php
@@ -2,8 +2,8 @@
return array(
'informations' => array(
'phone' => '+33 (0)1.40.18.30.04',
- 'support' => 'https://www.prestashop.com/ru/support',
- 'blog' => 'http://www.prestashop.com/blog/ru/'
+ 'support' => 'https://www.prestashop.com/ru/support',
+ 'blog' => 'http://www.prestashop.com/blog/ru/',
),
'translations' => array(
'An SQL error occured for entity
%1$s :
%2$s ' => 'В SQL произошла ошибка для значения
%1$s :
%2$s ',
@@ -242,5 +242,7 @@ return array(
'To enjoy the many features that are offered for free by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.' => 'Чтобы пользоваться всем функционалом PrestaShop, прочтите лицензионное соглашение. Ядро PrestaShop разработано на OSL 3.0, модули и темы - на AFL 3.0.',
'For security purposes, you must delete the "install" folder.' => 'В целях безопасности, удалите папку "install\'.',
'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation' => 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation',
+ 'Files' => 'Файлы',
+ 'All files are not successfuly uploaded on your server' => 'Все файлы успешно загружены на ваш сервер',
),
-);
+);
\ No newline at end of file
diff --git a/localization/bo.xml b/localization/bo.xml
index 7e4812f5c..f7e53312b 100644
--- a/localization/bo.xml
+++ b/localization/bo.xml
@@ -7,9 +7,9 @@
-
+
diff --git a/localization/cn.xml b/localization/cn.xml
index bf0af22e4..f0e9ea833 100644
--- a/localization/cn.xml
+++ b/localization/cn.xml
@@ -9,19 +9,24 @@
-
+
+
+
+
-
@@ -67,4 +72,4 @@
-
+
+
+
-
-
+
diff --git a/localization/gr.xml b/localization/gr.xml
index 3126c71c1..474ffc12e 100644
--- a/localization/gr.xml
+++ b/localization/gr.xml
@@ -8,8 +8,8 @@
-
+
-
+
-
-
-
-
-
-
-
+
-
+
-
+
+
+
+
+
+
+
diff --git a/modules/blocklayered/blocklayered.js b/modules/blocklayered/blocklayered.js
index 5eaffb4a2..0edae4fd8 100644
--- a/modules/blocklayered/blocklayered.js
+++ b/modules/blocklayered/blocklayered.js
@@ -230,11 +230,11 @@ function initLayered()
function paginationButton() {
$('#pagination a').not(':hidden').each(function () {
- if ($(this).attr('href').search('&p=') == -1) {
+ if ($(this).attr('href').search(/&|\?p=/) == -1) {
var page = 1;
}
else {
- var page = $(this).attr('href').replace(/^.*&p=(\d+).*$/, '$1');
+ var page = $(this).attr('href').replace(/^.*[&|\?]p=(\d+).*$/, '$1');
}
var location = window.location.href.replace(/#.*$/, '');
$(this).attr('href', location+current_friendly_url.replace(/\/page-(\d+)/, '')+'/page-'+page);
diff --git a/modules/loyalty/LoyaltyModule.php b/modules/loyalty/LoyaltyModule.php
index 5d8ef5c9a..273ba096b 100644
--- a/modules/loyalty/LoyaltyModule.php
+++ b/modules/loyalty/LoyaltyModule.php
@@ -85,7 +85,8 @@ class LoyaltyModule extends ObjectModel
$total = 0;
if (Validate::isLoadedObject($cart))
{
- $context = Context::getContext();
+ $currentContext = Context::getContext();
+ $context = clone $currentContext;
$context->cart = $cart;
$context->customer = new Customer($context->cart->id_customer);
$context->language = new Language($context->cart->id_lang);
diff --git a/modules/productcomments/productcomments.tpl b/modules/productcomments/productcomments.tpl
index 972096456..0c5c3aecb 100644
--- a/modules/productcomments/productcomments.tpl
+++ b/modules/productcomments/productcomments.tpl
@@ -27,6 +27,11 @@ var productcomments_controller_url = '{$productcomments_controller_url}';
var confirm_report_message = "{l s='Are you sure you want report this comment?' mod='productcomments'}";
var secure_key = "{$secure_key}";
var productcomments_url_rewrite = '{$productcomments_url_rewriting_activated}';
+var productcomment_added = '{l s='Your comment has been added!' mod='productcomments'}';
+var productcomment_added_moderation = '{l s='Your comment has been added and will be available once approved by a moderator' mod='productcomments'}';
+var productcomment_title = '{l s='New comment' mod='productcomments'}';
+var productcomment_ok = '{l s='OK' mod='productcomments'}';
+var moderation_active = {$moderation_active};
@@ -71,11 +76,13 @@ var productcomments_url_rewrite = '{$productcomments_url_rewriting_activated}';
{/if}
{/foreach}
+ {if (!$too_early AND ($logged OR $allow_guests))}
+ {/if}
{else}
- {if ($too_early == false AND ($logged OR $allow_guests))}
+ {if (!$too_early AND ($logged OR $allow_guests))}
diff --git a/themes/default/modules/productcomments/productcomments.tpl b/themes/default/modules/productcomments/productcomments.tpl
index 3cb407777..bbd737670 100644
--- a/themes/default/modules/productcomments/productcomments.tpl
+++ b/themes/default/modules/productcomments/productcomments.tpl
@@ -76,11 +76,13 @@ var moderation_active = {$moderation_active};
{/if}
{/foreach}
+ {if (!$too_early AND ($logged OR $allow_guests))}
+ {/if}
{else}
- {if ($too_early == false AND ($logged OR $allow_guests))}
+ {if (!$too_early AND ($logged OR $allow_guests))}
@@ -141,7 +143,7 @@ var moderation_active = {$moderation_active};
{/if}
{l s='Upload'}
