dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix null values ...

Browse Source
This commit is contained in:
rMalie
2011-12-22 23:20:30 +00:00
parent ab9fa84606
commit e2bc19d873
41 changed files with 178 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Configuration.php
+2 -2
View File
@@ -53,8 +53,8 @@ class ConfigurationCore extends ObjectModel
'multilang' => true, 'multilang' => true,
'fields' => array( 'fields' => array(
'name' => array('type' => self::TYPE_STRING, 'validate' => 'isConfigName', 'required' => true, 'size' => 32), 'name' => array('type' => self::TYPE_STRING, 'validate' => 'isConfigName', 'required' => true, 'size' => 32),
'id_group_shop' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), 'id_group_shop' => array('type' => self::TYPE_NOTHING, 'validate' => 'isUnsignedId'),
'id_shop' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), 'id_shop' => array('type' => self::TYPE_NOTHING, 'validate' => 'isUnsignedId'),
'value' => array('type' => self::TYPE_STRING), 'value' => array('type' => self::TYPE_STRING),
'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
classes/ObjectModel.php
+4
View File
@@ -36,6 +36,7 @@ abstract class ObjectModelCore
const TYPE_FLOAT = 4; const TYPE_FLOAT = 4;
const TYPE_DATE = 5; const TYPE_DATE = 5;
const TYPE_HTML = 6; const TYPE_HTML = 6;
const TYPE_NOTHING = 7;
/** /**
* List of association types * List of association types
@@ -338,6 +339,9 @@ abstract class ObjectModelCore
return '\''.pSQL($value, true).'\''; return '\''.pSQL($value, true).'\'';
return pSQL($value, true); return pSQL($value, true);
case self::TYPE_NOTHING :
return $value;
case self::TYPE_STRING : case self::TYPE_STRING :
default : default :
if ($with_quotes) if ($with_quotes)
install-new/classes/xmlLoader.php
+7 -1
View File
@@ -393,12 +393,14 @@ class InstallXmlLoader
} }
else if ($classname) else if ($classname)
{ {
$xml = $this->loadEntity($entity);
// Create entity with ObjectModel class // Create entity with ObjectModel class
$object = new $classname(); $object = new $classname();
$object->hydrate($data); $object->hydrate($data);
if ($data_lang) if ($data_lang)
$object->hydrate($data_lang); $object->hydrate($data_lang);
$object->add(); $object->add(true, (isset($xml->fields['null'])) ? true : false);
$entity_id = $object->id; $entity_id = $object->id;
} }
else else
@@ -669,6 +671,7 @@ class InstallXmlLoader
'sql' => '', 'sql' => '',
'ordersql' => '', 'ordersql' => '',
'image' => '', 'image' => '',
'null' => '',
), ),
'fields' => array(), 'fields' => array(),
); );
@@ -695,6 +698,9 @@ class InstallXmlLoader
if ($xml->fields['ordersql']) if ($xml->fields['ordersql'])
$info['config']['ordersql'] = (string)$xml->fields['ordersql']; $info['config']['ordersql'] = (string)$xml->fields['ordersql'];
if ($xml->fields['null'])
$info['config']['null'] = (string)$xml->fields['null'];
if ($xml->fields['image']) if ($xml->fields['image'])
$info['config']['image'] = (string)$xml->fields['image']; $info['config']['image'] = (string)$xml->fields['image'];
install-new/data/xml/access.xml
+8 -8
View File
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_access> <entity_access>
<fields primary="id_profile, id_tab" sql="a.id_profile = 1">
<field name="id_profile" relation="profile"/>
<field name="id_tab" relation="tab"/>
<field name="view"/>
<field name="add"/>
<field name="edit"/>
<field name="delete"/>
</fields>
<entities> <entities>
<access id="access_1_1" id_profile="SuperAdmin" id_tab="Catalog" view="1" add="1" edit="1" delete="1"/> <access id="access_1_1" id_profile="SuperAdmin" id_tab="Catalog" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_2" id_profile="SuperAdmin" id_tab="Customers" view="1" add="1" edit="1" delete="1"/> <access id="access_1_2" id_profile="SuperAdmin" id_tab="Customers" view="1" add="1" edit="1" delete="1"/>
@@ -109,4 +101,12 @@
<access id="access_1_109" id_profile="SuperAdmin" id_tab="Catalog_price_rules" view="1" add="1" edit="1" delete="1"/> <access id="access_1_109" id_profile="SuperAdmin" id_tab="Catalog_price_rules" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_110" id_profile="SuperAdmin" id_tab="Outstanding" view="1" add="1" edit="1" delete="1"/> <access id="access_1_110" id_profile="SuperAdmin" id_tab="Outstanding" view="1" add="1" edit="1" delete="1"/>
</entities> </entities>
<fields primary="id_profile, id_tab" sql="a.id_profile = 1">
<field name="id_profile" relation="profile"/>
<field name="id_tab" relation="tab"/>
<field name="view"/>
<field name="add"/>
<field name="edit"/>
<field name="delete"/>
</fields>
</entity_access> </entity_access>
install-new/data/xml/address_format.xml
+4 -4
View File
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_address_format> <entity_address_format>
<fields primary="id_country" class="AddressFormat">
<field name="id_country" relation="country"/>
<field name="format"/>
</fields>
<entities> <entities>
<address_format id="address_format_1" id_country="DE"> <address_format id="address_format_1" id_country="DE">
<format>firstname lastname <format>firstname lastname
@@ -2444,4 +2440,8 @@ Country:name
phone</format> phone</format>
</address_format> </address_format>
</entities> </entities>
<fields primary="id_country" class="AddressFormat">
<field name="id_country" relation="country"/>
<field name="format"/>
</fields>
</entity_address_format> </entity_address_format>
install-new/data/xml/carrier.xml
+6 -6
View File
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_carrier> <entity_carrier>
<entities>
<carrier id="carrier_1" id_reference="1" id_tax_rules_group="0" active="1" shipping_handling="0" range_behavior="0" is_free="0" shipping_external="0" need_range="0" shipping_method="0" max_width="0" max_height="0" max_depth="0" max_weight="0" grade="0">
<name>0</name>
<url/>
</carrier>
</entities>
<fields id="name" class="Carrier" sql="a.id_carrier = 1"> <fields id="name" class="Carrier" sql="a.id_carrier = 1">
<field name="id_reference"/> <field name="id_reference"/>
<field name="id_tax_rules_group"/> <field name="id_tax_rules_group"/>
@@ -18,10 +24,4 @@
<field name="max_weight"/> <field name="max_weight"/>
<field name="grade"/> <field name="grade"/>
</fields> </fields>
<entities>
<carrier id="carrier_1" id_reference="1" id_tax_rules_group="0" active="1" shipping_handling="0" range_behavior="0" is_free="0" shipping_external="0" need_range="0" shipping_method="0" max_width="0" max_height="0" max_depth="0" max_weight="0" grade="0">
<name>0</name>
<url/>
</carrier>
</entities>
</entity_carrier> </entity_carrier>
install-new/data/xml/carrier_group.xml
+1 -1
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_carrier_group> <entity_carrier_group>
<entities/>
<fields primary="id_carrier, id_group" sql="a.id_carrier = 1"> <fields primary="id_carrier, id_group" sql="a.id_carrier = 1">
<field name="id_carrier" relation="carrier"/> <field name="id_carrier" relation="carrier"/>
<field name="id_group" relation="group"/> <field name="id_group" relation="group"/>
</fields> </fields>
<entities/>
</entity_carrier_group> </entity_carrier_group>
install-new/data/xml/carrier_zone.xml
+3 -3
View File
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_carrier_zone> <entity_carrier_zone>
<entities>
<carrier_zone id="carrier_zone_1_1" id_carrier="carrier_1" id_zone="Europe"/>
</entities>
<fields primary="id_carrier, id_zone" sql="a.id_carrier = 1"> <fields primary="id_carrier, id_zone" sql="a.id_carrier = 1">
<field name="id_carrier" relation="carrier"/> <field name="id_carrier" relation="carrier"/>
<field name="id_zone" relation="zone"/> <field name="id_zone" relation="zone"/>
</fields> </fields>
<entities>
<carrier_zone id="carrier_zone_1_1" id_carrier="carrier_1" id_zone="Europe"/>
</entities>
</entity_carrier_zone> </entity_carrier_zone>
install-new/data/xml/category.xml
+3 -3
View File
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_category> <entity_category>
<entities>
<category id="Home" id_parent="" active="1"/>
</entities>
<fields id="name" class="Category" sql="a.id_category = 1"> <fields id="name" class="Category" sql="a.id_category = 1">
<field name="id_parent" relation="category"/> <field name="id_parent" relation="category"/>
<field name="active"/> <field name="active"/>
</fields> </fields>
<entities>
<category id="Home" id_parent="" active="1"/>
</entities>
</entity_category> </entity_category>
install-new/data/xml/category_group.xml
+4 -4
View File
@@ -1,12 +1,12 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<entity_category_group> <entity_category_group>
<fields primary="id_category, id_group" sql="a.id_category = 1">
<field name="id_category" relation="category"/>
<field name="id_group" relation="group"/>
</fields>
<entities> <entities>
<category_group id="category_group_1_1" id_category="Home" id_group="Unidentified"/> <category_group id="category_group_1_1" id_category="Home" id_group="Unidentified"/>
<category_group id="category_group_1_2" id_category="Home" id_group="Guest"/> <category_group id="category_group_1_2" id_category="Home" id_group="Guest"/>
<category_group id="category_group_1_3" id_category="Home" id_group="Default"/> <category_group id="category_group_1_3" id_category="Home" id_group="Default"/>
</entities> </entities>
<fields primary="id_category, id_group" sql="a.id_category = 1">
<field name="id_category" relation="category"/>
<field name="id_group" relation="group"/>
</fields>
</entity_category_group> </entity_category_group>
install-new/data/xml/cms.xml
+4 -4
View File
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_cms> <entity_cms>
<fields id="meta_title" class="CMS">
<field name="id_cms_category" relation="cms_category"/>
<field name="active"/>
</fields>
<entities> <entities>
<cms id="Delivery" id_cms_category="Home" active="1"/> <cms id="Delivery" id_cms_category="Home" active="1"/>
<cms id="Legal_Notice" id_cms_category="Home" active="1"/> <cms id="Legal_Notice" id_cms_category="Home" active="1"/>
@@ -11,4 +7,8 @@
<cms id="About_us" id_cms_category="Home" active="1"/> <cms id="About_us" id_cms_category="Home" active="1"/>
<cms id="Secure_payment" id_cms_category="Home" active="1"/> <cms id="Secure_payment" id_cms_category="Home" active="1"/>
</entities> </entities>
<fields id="meta_title" class="CMS">
<field name="id_cms_category" relation="cms_category"/>
<field name="active"/>
</fields>
</entity_cms> </entity_cms>
install-new/data/xml/cms_category.xml
+3 -3
View File
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_cms_category> <entity_cms_category>
<entities>
<cms_category id="Home" id_parent="" active="1"/>
</entities>
<fields id="name" class="CMSCategory"> <fields id="name" class="CMSCategory">
<field name="id_parent" relation="cms_category"/> <field name="id_parent" relation="cms_category"/>
<field name="active"/> <field name="active"/>
</fields> </fields>
<entities>
<cms_category id="Home" id_parent="" active="1"/>
</entities>
</entity_cms_category> </entity_cms_category>
install-new/data/xml/configuration.xml
+4 -4
View File
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_configuration> <entity_configuration>
<fields id="name" class="Configuration">
<field name="name"/>
<field name="value"/>
</fields>
<entities> <entities>
<configuration id="PS_LANG_DEFAULT" name="PS_LANG_DEFAULT"> <configuration id="PS_LANG_DEFAULT" name="PS_LANG_DEFAULT">
<value>2</value> <value>2</value>
@@ -852,4 +848,8 @@
<value>0</value> <value>0</value>
</configuration> </configuration>
</entities> </entities>
<fields id="name" class="Configuration" null="1">
<field name="name"/>
<field name="value"/>
</fields>
</entity_configuration> </entity_configuration>
install-new/data/xml/contact.xml
+3 -3
View File
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_contact> <entity_contact>
<fields id="name" class="Contact">
<field name="customer_service"/>
</fields>
<entities> <entities>
<contact id="Webmaster" customer_service="1"/> <contact id="Webmaster" customer_service="1"/>
<contact id="Customer_service" customer_service="1"/> <contact id="Customer_service" customer_service="1"/>
</entities> </entities>
<fields id="name" class="Contact">
<field name="customer_service"/>
</fields>
</entity_contact> </entity_contact>
install-new/data/xml/country.xml
+11 -11
View File
@@ -1,16 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_country> <entity_country>
<fields id="iso_code" class="Country">
<field name="id_zone" relation="zone"/>
<field name="iso_code"/>
<field name="call_prefix"/>
<field name="active"/>
<field name="contains_states"/>
<field name="need_identification_number"/>
<field name="need_zip_code"/>
<field name="zip_code_format"/>
<field name="display_tax_label"/>
</fields>
<entities> <entities>
<country id="DE" id_zone="Europe" iso_code="DE" call_prefix="49" active="1" contains_states="0" need_identification_number="0" need_zip_code="1" zip_code_format="NNNNN" display_tax_label="1"/> <country id="DE" id_zone="Europe" iso_code="DE" call_prefix="49" active="1" contains_states="0" need_identification_number="0" need_zip_code="1" zip_code_format="NNNNN" display_tax_label="1"/>
<country id="AT" id_zone="Europe" iso_code="AT" call_prefix="43" active="1" contains_states="0" need_identification_number="0" need_zip_code="1" zip_code_format="NNNN" display_tax_label="1"/> <country id="AT" id_zone="Europe" iso_code="AT" call_prefix="43" active="1" contains_states="0" need_identification_number="0" need_zip_code="1" zip_code_format="NNNN" display_tax_label="1"/>
@@ -257,4 +246,15 @@
<country id="TF" id_zone="Oceania" iso_code="TF" call_prefix="0" active="1" contains_states="0" need_identification_number="0" need_zip_code="1" zip_code_format="" display_tax_label="1"/> <country id="TF" id_zone="Oceania" iso_code="TF" call_prefix="0" active="1" contains_states="0" need_identification_number="0" need_zip_code="1" zip_code_format="" display_tax_label="1"/>
<country id="AX" id_zone="Europe_out_E_U" iso_code="AX" call_prefix="0" active="1" contains_states="0" need_identification_number="0" need_zip_code="1" zip_code_format="NNNNN" display_tax_label="1"/> <country id="AX" id_zone="Europe_out_E_U" iso_code="AX" call_prefix="0" active="1" contains_states="0" need_identification_number="0" need_zip_code="1" zip_code_format="NNNNN" display_tax_label="1"/>
</entities> </entities>
<fields id="iso_code" class="Country">
<field name="id_zone" relation="zone"/>
<field name="iso_code"/>
<field name="call_prefix"/>
<field name="active"/>
<field name="contains_states"/>
<field name="need_identification_number"/>
<field name="need_zip_code"/>
<field name="zip_code_format"/>
<field name="display_tax_label"/>
</fields>
</entity_country> </entity_country>
install-new/data/xml/delivery.xml
+1 -1
View File
@@ -1,5 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<entity_delivery> <entity_delivery>
<entities/>
<fields class="Delivery" sql="a.id_carrier = 1"> <fields class="Delivery" sql="a.id_carrier = 1">
<field name="id_shop"/> <field name="id_shop"/>
<field name="id_group_shop"/> <field name="id_group_shop"/>
@@ -9,5 +10,4 @@
<field name="id_zone" relation="zone"/> <field name="id_zone" relation="zone"/>
<field name="price"/> <field name="price"/>
</fields> </fields>
<entities/>
</entity_delivery> </entity_delivery>
install-new/data/xml/gender.xml
+3 -3
View File
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_gender> <entity_gender>
<fields id="name" class="Gender" image="genders">
<field name="type"/>
</fields>
<entities> <entities>
<gender id="Mr" type="0"/> <gender id="Mr" type="0"/>
<gender id="Ms" type="1"/> <gender id="Ms" type="1"/>
<gender id="Miss" type="1"/> <gender id="Miss" type="1"/>
</entities> </entities>
<fields id="name" class="Gender" image="genders">
<field name="type"/>
</fields>
</entity_gender> </entity_gender>
install-new/data/xml/group.xml
+5 -5
View File
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_group> <entity_group>
<fields id="name" class="Group">
<field name="reduction"/>
<field name="price_display_method"/>
<field name="show_prices"/>
</fields>
<entities> <entities>
<group id="Unidentified" reduction="0.00" price_display_method="0" show_prices="1"/> <group id="Unidentified" reduction="0.00" price_display_method="0" show_prices="1"/>
<group id="Guest" reduction="0.00" price_display_method="0" show_prices="1"/> <group id="Guest" reduction="0.00" price_display_method="0" show_prices="1"/>
<group id="Default" reduction="0.00" price_display_method="0" show_prices="1"/> <group id="Default" reduction="0.00" price_display_method="0" show_prices="1"/>
</entities> </entities>
<fields id="name" class="Group">
<field name="reduction"/>
<field name="price_display_method"/>
<field name="show_prices"/>
</fields>
</entity_group> </entity_group>
install-new/data/xml/hook.xml
+7 -7
View File
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_hook> <entity_hook>
<fields id="name" class="Hook">
<field name="name"/>
<field name="title"/>
<field name="description"/>
<field name="live_edit"/>
<field name="is_native"/>
</fields>
<entities> <entities>
<hook id="displayPayment" live_edit="1" is_native="0"> <hook id="displayPayment" live_edit="1" is_native="0">
<name>displayPayment</name> <name>displayPayment</name>
@@ -439,4 +432,11 @@
<description>Display extra informations inside the "my account" block</description> <description>Display extra informations inside the "my account" block</description>
</hook> </hook>
</entities> </entities>
<fields id="name" class="Hook">
<field name="name"/>
<field name="title"/>
<field name="description"/>
<field name="live_edit"/>
<field name="is_native"/>
</fields>
</entity_hook> </entity_hook>
install-new/data/xml/hook_alias.xml
+4 -4
View File
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_hook_alias> <entity_hook_alias>
<fields id="alias">
<field name="alias"/>
<field name="name"/>
</fields>
<entities> <entities>
<hook_alias id="payment"> <hook_alias id="payment">
<alias>payment</alias> <alias>payment</alias>
@@ -346,4 +342,8 @@
<name>actionTaxManager</name> <name>actionTaxManager</name>
</hook_alias> </hook_alias>
</entities> </entities>
<fields id="alias">
<field name="alias"/>
<field name="name"/>
</fields>
</entity_hook_alias> </entity_hook_alias>
install-new/data/xml/image_type.xml
+10 -10
View File
@@ -1,5 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_image_type> <entity_image_type>
<entities>
<image_type id="small" id_theme="default" name="small" width="45" height="45" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
<image_type id="medium" id_theme="default" name="medium" width="58" height="58" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="1"/>
<image_type id="large" id_theme="default" name="large" width="264" height="264" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
<image_type id="thickbox" id_theme="default" name="thickbox" width="600" height="600" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
<image_type id="category" id_theme="default" name="category" width="500" height="150" products="0" categories="1" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
<image_type id="home" id_theme="default" name="home" width="124" height="124" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
<image_type id="large_scene" id_theme="default" name="large_scene" width="556" height="200" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
<image_type id="thumb_scene" id_theme="default" name="thumb_scene" width="161" height="58" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
</entities>
<fields id="name" class="ImageType"> <fields id="name" class="ImageType">
<field name="id_theme" relation="theme"/> <field name="id_theme" relation="theme"/>
<field name="name"/> <field name="name"/>
@@ -12,14 +22,4 @@
<field name="scenes"/> <field name="scenes"/>
<field name="stores"/> <field name="stores"/>
</fields> </fields>
<entities>
<image_type id="small" id_theme="default" name="small" width="45" height="45" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
<image_type id="medium" id_theme="default" name="medium" width="58" height="58" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="1"/>
<image_type id="large" id_theme="default" name="large" width="264" height="264" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
<image_type id="thickbox" id_theme="default" name="thickbox" width="600" height="600" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
<image_type id="category" id_theme="default" name="category" width="500" height="150" products="0" categories="1" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
<image_type id="home" id_theme="default" name="home" width="124" height="124" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
<image_type id="large_scene" id_theme="default" name="large_scene" width="556" height="200" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
<image_type id="thumb_scene" id_theme="default" name="thumb_scene" width="161" height="58" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
</entities>
</entity_image_type> </entity_image_type>
install-new/data/xml/meta.xml
+3 -3
View File
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_meta> <entity_meta>
<fields id="page" class="Meta">
<field name="page"/>
</fields>
<entities> <entities>
<meta id="404"> <meta id="404">
<page>404</page> <page>404</page>
@@ -80,4 +77,7 @@
<page>guest-tracking</page> <page>guest-tracking</page>
</meta> </meta>
</entities> </entities>
<fields id="page" class="Meta">
<field name="page"/>
</fields>
</entity_meta> </entity_meta>
install-new/data/xml/operating_system.xml
+3 -3
View File
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_operating_system> <entity_operating_system>
<fields id="name">
<field name="name"/>
</fields>
<entities> <entities>
<operating_system id="Windows_XP"> <operating_system id="Windows_XP">
<name>Windows XP</name> <name>Windows XP</name>
@@ -17,4 +14,7 @@
<name>Linux</name> <name>Linux</name>
</operating_system> </operating_system>
</entities> </entities>
<fields id="name">
<field name="name"/>
</fields>
</entity_operating_system> </entity_operating_system>
install-new/data/xml/order_return_state.xml
+3 -3
View File
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_order_return_state> <entity_order_return_state>
<fields id="name" class="OrderReturnState">
<field name="color"/>
</fields>
<entities> <entities>
<order_return_state id="Waiting_for_confirmation" color="RoyalBlue"/> <order_return_state id="Waiting_for_confirmation" color="RoyalBlue"/>
<order_return_state id="Waiting_for_package" color="BlueViolet"/> <order_return_state id="Waiting_for_package" color="BlueViolet"/>
@@ -10,4 +7,7 @@
<order_return_state id="Return_denied" color="Crimson"/> <order_return_state id="Return_denied" color="Crimson"/>
<order_return_state id="Return_completed" color="#108510"/> <order_return_state id="Return_completed" color="#108510"/>
</entities> </entities>
<fields id="name" class="OrderReturnState">
<field name="color"/>
</fields>
</entity_order_return_state> </entity_order_return_state>
install-new/data/xml/order_state.xml
+11 -11
View File
@@ -1,16 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_order_state> <entity_order_state>
<fields id="name" class="OrderState" image="os">
<field name="invoice"/>
<field name="send_email"/>
<field name="color"/>
<field name="unremovable"/>
<field name="hidden"/>
<field name="logable"/>
<field name="delivery"/>
<field name="shipped"/>
<field name="paid"/>
</fields>
<entities> <entities>
<order_state id="Awaiting_cheque_payment" invoice="0" send_email="1" color="RoyalBlue" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/> <order_state id="Awaiting_cheque_payment" invoice="0" send_email="1" color="RoyalBlue" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
<order_state id="Payment_accepted" invoice="1" send_email="1" color="LimeGreen" unremovable="1" hidden="0" logable="1" delivery="0" shipped="0" paid="1"/> <order_state id="Payment_accepted" invoice="1" send_email="1" color="LimeGreen" unremovable="1" hidden="0" logable="1" delivery="0" shipped="0" paid="1"/>
@@ -25,4 +14,15 @@
<order_state id="Awaiting_PayPal_payment" invoice="0" send_email="0" color="RoyalBlue" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/> <order_state id="Awaiting_PayPal_payment" invoice="0" send_email="0" color="RoyalBlue" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
<order_state id="Payment_remotely_accepted" invoice="1" send_email="0" color="LimeGreen" unremovable="1" hidden="0" logable="1" delivery="0" shipped="0" paid="1"/> <order_state id="Payment_remotely_accepted" invoice="1" send_email="0" color="LimeGreen" unremovable="1" hidden="0" logable="1" delivery="0" shipped="0" paid="1"/>
</entities> </entities>
<fields id="name" class="OrderState" image="os">
<field name="invoice"/>
<field name="send_email"/>
<field name="color"/>
<field name="unremovable"/>
<field name="hidden"/>
<field name="logable"/>
<field name="delivery"/>
<field name="shipped"/>
<field name="paid"/>
</fields>
</entity_order_state> </entity_order_state>
install-new/data/xml/profile.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_profile> <entity_profile>
<fields id="name" class="Profile" sql="a.id_profile = 1"/>
<entities> <entities>
<profile id="SuperAdmin"/> <profile id="SuperAdmin"/>
</entities> </entities>
<fields id="name" class="Profile" sql="a.id_profile = 1"/>
</entity_profile> </entity_profile>
install-new/data/xml/quick_access.xml
+4 -4
View File
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_quick_access> <entity_quick_access>
<fields id="name" class="QuickAccess">
<field name="new_window"/>
<field name="link"/>
</fields>
<entities> <entities>
<quick_access id="Home" new_window="0"> <quick_access id="Home" new_window="0">
<link>index.php</link> <link>index.php</link>
@@ -21,4 +17,8 @@
<link>index.php?controller=AdminCartRules&amp;addcart_rule</link> <link>index.php?controller=AdminCartRules&amp;addcart_rule</link>
</quick_access> </quick_access>
</entities> </entities>
<fields id="name" class="QuickAccess">
<field name="new_window"/>
<field name="link"/>
</fields>
</entity_quick_access> </entity_quick_access>
install-new/data/xml/risk.xml
+4 -4
View File
@@ -1,13 +1,13 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<entity_risk> <entity_risk>
<fields id="name" class="Risk">
<field name="percent"/>
<field name="color"/>
</fields>
<entities> <entities>
<risk id="None" percent="0" color="LimeGreen"/> <risk id="None" percent="0" color="LimeGreen"/>
<risk id="Low" percent="35" color="DarkOrange"/> <risk id="Low" percent="35" color="DarkOrange"/>
<risk id="Middle" percent="75" color="Crimson"/> <risk id="Middle" percent="75" color="Crimson"/>
<risk id="Hight" percent="100" color="#ec2e15"/> <risk id="Hight" percent="100" color="#ec2e15"/>
</entities> </entities>
<fields id="name" class="Risk">
<field name="percent"/>
<field name="color"/>
</fields>
</entity_risk> </entity_risk>
install-new/data/xml/search_engine.xml
+4 -4
View File
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_search_engine> <entity_search_engine>
<fields id="server" class="SearchEngine">
<field name="server"/>
<field name="getvar"/>
</fields>
<entities> <entities>
<search_engine id="google" getvar="q"> <search_engine id="google" getvar="q">
<server>google</server> <server>google</server>
@@ -120,4 +116,8 @@
<server>rambler</server> <server>rambler</server>
</search_engine> </search_engine>
</entities> </entities>
<fields id="server" class="SearchEngine">
<field name="server"/>
<field name="getvar"/>
</fields>
</entity_search_engine> </entity_search_engine>
install-new/data/xml/state.xml
+8 -8
View File
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_state> <entity_state>
<fields id="iso_code" class="State">
<field name="id_country" relation="country"/>
<field name="id_zone" relation="zone"/>
<field name="name"/>
<field name="iso_code"/>
<field name="tax_behavior"/>
<field name="active"/>
</fields>
<entities> <entities>
<state id="AL" id_country="US" id_zone="North_America" iso_code="AL" tax_behavior="0" active="1"> <state id="AL" id_country="US" id_zone="North_America" iso_code="AL" tax_behavior="0" active="1">
<name>Alabama</name> <name>Alabama</name>
@@ -946,4 +938,12 @@
<name>Yamanashi</name> <name>Yamanashi</name>
</state> </state>
</entities> </entities>
<fields id="iso_code" class="State">
<field name="id_country" relation="country"/>
<field name="id_zone" relation="zone"/>
<field name="name"/>
<field name="iso_code"/>
<field name="tax_behavior"/>
<field name="active"/>
</fields>
</entity_state> </entity_state>
install-new/data/xml/stock_mvt_reason.xml
+3 -3
View File
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_stock_mvt_reason> <entity_stock_mvt_reason>
<fields id="name" class="StockMvtReason">
<field name="sign"/>
</fields>
<entities> <entities>
<stock_mvt_reason id="Increase" sign="1"/> <stock_mvt_reason id="Increase" sign="1"/>
<stock_mvt_reason id="Decrease" sign="-1"/> <stock_mvt_reason id="Decrease" sign="-1"/>
@@ -13,4 +10,7 @@
<stock_mvt_reason id="Transfer_from_another_warehouse" sign="1"/> <stock_mvt_reason id="Transfer_from_another_warehouse" sign="1"/>
<stock_mvt_reason id="Supply_Order" sign="1"/> <stock_mvt_reason id="Supply_Order" sign="1"/>
</entities> </entities>
<fields id="name" class="StockMvtReason">
<field name="sign"/>
</fields>
</entity_stock_mvt_reason> </entity_stock_mvt_reason>
install-new/data/xml/subdomain.xml
+3 -3
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_subdomain> <entity_subdomain>
<fields id="name" class="SubDomain">
<field name="name"/>
</fields>
<entities> <entities>
<subdomain id="www" name="www"/> <subdomain id="www" name="www"/>
</entities> </entities>
<fields id="name" class="SubDomain">
<field name="name"/>
</fields>
</entity_subdomain> </entity_subdomain>
install-new/data/xml/supply_order_state.xml
+8 -8
View File
@@ -1,13 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<entity_supply_order_state> <entity_supply_order_state>
<fields class="SupplyOrderState">
<field name="delivery_note"/>
<field name="editable"/>
<field name="receipt_state"/>
<field name="pending_receipt"/>
<field name="enclosed"/>
<field name="color"/>
</fields>
<entities> <entities>
<supply_order_state id="supply_order_state_1" delivery_note="0" editable="1" receipt_state="0" pending_receipt="0" enclosed="0" color="#faab00"/> <supply_order_state id="supply_order_state_1" delivery_note="0" editable="1" receipt_state="0" pending_receipt="0" enclosed="0" color="#faab00"/>
<supply_order_state id="supply_order_state_2" delivery_note="1" editable="0" receipt_state="0" pending_receipt="0" enclosed="0" color="#273cff"/> <supply_order_state id="supply_order_state_2" delivery_note="1" editable="0" receipt_state="0" pending_receipt="0" enclosed="0" color="#273cff"/>
@@ -16,4 +8,12 @@
<supply_order_state id="supply_order_state_5" delivery_note="0" editable="0" receipt_state="1" pending_receipt="0" enclosed="1" color="#00d60c"/> <supply_order_state id="supply_order_state_5" delivery_note="0" editable="0" receipt_state="1" pending_receipt="0" enclosed="1" color="#00d60c"/>
<supply_order_state id="supply_order_state_6" delivery_note="0" editable="0" receipt_state="0" pending_receipt="0" enclosed="1" color="#666666"/> <supply_order_state id="supply_order_state_6" delivery_note="0" editable="0" receipt_state="0" pending_receipt="0" enclosed="1" color="#666666"/>
</entities> </entities>
<fields class="SupplyOrderState">
<field name="delivery_note"/>
<field name="editable"/>
<field name="receipt_state"/>
<field name="pending_receipt"/>
<field name="enclosed"/>
<field name="color"/>
</fields>
</entity_supply_order_state> </entity_supply_order_state>
install-new/data/xml/tab.xml
+5 -5
View File
@@ -1,10 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_tab> <entity_tab>
<fields id="name" class="Tab" ordersql="a.id_parent, a.position" image="t">
<field name="id_parent" relation="tab"/>
<field name="class_name"/>
<field name="active"/>
</fields>
<entities> <entities>
<tab id="Home" id_parent="-1" active="1"> <tab id="Home" id_parent="-1" active="1">
<class_name>AdminHome</class_name> <class_name>AdminHome</class_name>
@@ -304,4 +299,9 @@
<class_name>AdminAccountingExport</class_name> <class_name>AdminAccountingExport</class_name>
</tab> </tab>
</entities> </entities>
<fields id="name" class="Tab" ordersql="a.id_parent, a.position" image="t">
<field name="id_parent" relation="tab"/>
<field name="class_name"/>
<field name="active"/>
</fields>
</entity_tab> </entity_tab>
install-new/data/xml/theme.xml
+3 -3
View File
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_theme> <entity_theme>
<fields id="name" class="Theme">
<field name="name"/>
</fields>
<entities> <entities>
<theme id="default"> <theme id="default">
<name>default</name> <name>default</name>
</theme> </theme>
</entities> </entities>
<fields id="name" class="Theme">
<field name="name"/>
</fields>
</entity_theme> </entity_theme>
install-new/data/xml/timezone.xml
+3 -3
View File
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_timezone> <entity_timezone>
<fields id="name">
<field name="name"/>
</fields>
<entities> <entities>
<timezone id="Africa_Abidjan" name="Africa/Abidjan"/> <timezone id="Africa_Abidjan" name="Africa/Abidjan"/>
<timezone id="Africa_Accra" name="Africa/Accra"/> <timezone id="Africa_Accra" name="Africa/Accra"/>
@@ -565,4 +562,7 @@
<timezone id="WET" name="WET"/> <timezone id="WET" name="WET"/>
<timezone id="Zulu" name="Zulu"/> <timezone id="Zulu" name="Zulu"/>
</entities> </entities>
<fields id="name">
<field name="name"/>
</fields>
</entity_timezone> </entity_timezone>
install-new/data/xml/warehouse.xml
+1 -1
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_warehouse> <entity_warehouse>
<entities/>
<fields id="name" class="Warehouse"> <fields id="name" class="Warehouse">
<field name="id_currency"/> <field name="id_currency"/>
<field name="id_address" relation="address"/> <field name="id_address" relation="address"/>
@@ -8,5 +9,4 @@
<field name="name"/> <field name="name"/>
<field name="management_type"/> <field name="management_type"/>
</fields> </fields>
<entities/>
</entity_warehouse> </entity_warehouse>
install-new/data/xml/web_browser.xml
+3 -3
View File
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_web_browser> <entity_web_browser>
<fields id="name">
<field name="name"/>
</fields>
<entities> <entities>
<web_browser id="Safari"> <web_browser id="Safari">
<name>Safari</name> <name>Safari</name>
@@ -29,4 +26,7 @@
<name>Google Chrome</name> <name>Google Chrome</name>
</web_browser> </web_browser>
</entities> </entities>
<fields id="name">
<field name="name"/>
</fields>
</entity_web_browser> </entity_web_browser>
install-new/data/xml/zone.xml
+4 -4
View File
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity_zone> <entity_zone>
<fields id="name" class="Zone">
<field name="name"/>
<field name="active"/>
</fields>
<entities> <entities>
<zone id="Europe" active="1"> <zone id="Europe" active="1">
<name>Europe</name> <name>Europe</name>
@@ -30,4 +26,8 @@
<name>Centrale America/Antilla</name> <name>Centrale America/Antilla</name>
</zone> </zone>
</entities> </entities>
<fields id="name" class="Zone">
<field name="name"/>
<field name="active"/>
</fields>
</entity_zone> </entity_zone>
install-new/dev/index.php
+4
View File
@@ -54,6 +54,7 @@ class SynchronizeController extends InstallControllerHttp
$sqls = isset($_POST['sql']) ? (array)$_POST['sql'] : array(); $sqls = isset($_POST['sql']) ? (array)$_POST['sql'] : array();
$orders = isset($_POST['order']) ? (array)$_POST['order'] : array(); $orders = isset($_POST['order']) ? (array)$_POST['order'] : array();
$images = isset($_POST['image']) ? (array)$_POST['image'] : array(); $images = isset($_POST['image']) ? (array)$_POST['image'] : array();
$nulls = isset($_POST['null']) ? (array)$_POST['null'] : array();
$entities = array(); $entities = array();
foreach ($tables as $table) foreach ($tables as $table)
@@ -77,6 +78,9 @@ class SynchronizeController extends InstallControllerHttp
if (isset($images[$table]) && $images[$table]) if (isset($images[$table]) && $images[$table])
$config['image'] = $images[$table]; $config['image'] = $images[$table];
if (isset($nulls[$table]) && $nulls[$table])
$config['null'] = $nulls[$table];
$fields = array(); $fields = array();
if (isset($columns[$table])) if (isset($columns[$table]))
{ {
install-new/dev/index.phtml
+3
View File
@@ -202,6 +202,9 @@
Ordre SQL Ordre SQL
<input type="text" name="order[<?php echo $entity ?>]" value="<?php echo (isset($entity_info['config']['ordersql'])) ? $entity_info['config']['ordersql'] : '' ?>" /> <input type="text" name="order[<?php echo $entity ?>]" value="<?php echo (isset($entity_info['config']['ordersql'])) ? $entity_info['config']['ordersql'] : '' ?>" />
</label> </label>
<label>
Valeurs NULL <input type="checkbox" name="null[<?php echo $entity ?>]" value="1" <?php if (isset($entity_info['config']['null']) && $entity_info['config']['null']): ?>checked="checked"<?php endif; ?> />
</label>
</div> </div>
</li> </li>
<?php foreach ($this->loader->getColumns($entity) as $column => $is_text): ?> <?php foreach ($this->loader->getColumns($entity) as $column => $is_text): ?>