Index: in-auction/install/install_schema.sql =================================================================== --- in-auction/install/install_schema.sql (revision 13954) +++ in-auction/install/install_schema.sql (working copy) @@ -250,7 +250,7 @@ ListingType tinyint(1) NOT NULL DEFAULT '1', ContinueUntilQty int(11) NOT NULL DEFAULT '0', LastProcessed int(11) DEFAULT NULL, - `Status` tinyint(1) NOT NULL DEFAULT '1', + `Status` tinyint(1) NOT NULL DEFAULT '0', PRIMARY KEY (ScheduleId), KEY LastProcessed (LastProcessed) ); Index: in-auction/install/upgrades.sql =================================================================== --- in-auction/install/upgrades.sql (revision 13954) +++ in-auction/install/upgrades.sql (working copy) @@ -62,4 +62,7 @@ # ===== v 5.1.0-RC1 ===== -# ===== v 5.1.0 ===== \ No newline at end of file +# ===== v 5.1.0 ===== + +# ===== v 5.1.1-B1 ===== +ALTER TABLE eBaySchedules CHANGE `Status` `Status` tinyint(1) NOT NULL DEFAULT '0'; Index: in-auction/units/listing/listing_config.php =================================================================== --- in-auction/units/listing/listing_config.php (revision 13954) +++ in-auction/units/listing/listing_config.php (working copy) @@ -245,7 +245,7 @@ ), 'VirtualFields' => Array( - 'ProductsProductId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'ProductsProductId' => Array ('type' => 'int', 'default' => 0), 'ListingTitle' => Array ('type' => 'string', 'default' => null), 'SKU' => Array ('type' => 'string', 'default' => ''), 'ListingDuration' => Array ( Index: in-auction/units/sections/ebay_eh.php =================================================================== --- in-auction/units/sections/ebay_eh.php (revision 13954) +++ in-auction/units/sections/ebay_eh.php (working copy) @@ -96,8 +96,6 @@ $this->Application->setUnitOption($event->MasterEvent->Prefix, 'ItemSQLs', $a_ItemSQLs); - - $a_base_fields = $this->Application->getUnitOption('l-ebay', 'Fields'); $a_fields_to_join = Array( @@ -120,6 +118,8 @@ foreach ($a_fields_to_join AS $field) { $a_virtual_fields['Last'.$field] = $a_base_fields[$field]; + // not_null should not be set for virtual fields + unset($a_virtual_fields['Last'.$field]['not_null']); $a_calculated_fields['']['Last'.$field] = 'ebl.'.$field; $a_calculated_fields['showall']['Last'.$field] = 'ebl.'.$field; } Index: in-bulletin/install/install_schema.sql =================================================================== --- in-bulletin/install/install_schema.sql (revision 13954) +++ in-bulletin/install/install_schema.sql (working copy) @@ -34,8 +34,8 @@ EditorsPick tinyint(4) NOT NULL DEFAULT '0', `Status` tinyint(4) unsigned NOT NULL DEFAULT '2', Priority int(11) NOT NULL DEFAULT '0', - OwnerId int(11) NOT NULL DEFAULT '-1', - ModifiedById int(11) NOT NULL DEFAULT '0', + OwnerId int(11) DEFAULT NULL, + ModifiedById int(11) DEFAULT NULL, ResourceId int(11) DEFAULT NULL, TopicType int(11) NOT NULL DEFAULT '1', CreatedOn int(11) DEFAULT NULL, @@ -167,7 +167,7 @@ CommentId int(11) NOT NULL AUTO_INCREMENT, PollId int(11) NOT NULL DEFAULT '0', AnswerId int(11) DEFAULT NULL, - CreatedById int(11) NOT NULL DEFAULT '-2', + CreatedById int(11) DEFAULT NULL, GuestName varchar(255) NOT NULL DEFAULT '', GuestEmail varchar(255) NOT NULL DEFAULT '', CommentBody text, Index: in-bulletin/install/upgrades.sql =================================================================== --- in-bulletin/install/upgrades.sql (revision 13954) +++ in-bulletin/install/upgrades.sql (working copy) @@ -199,4 +199,13 @@ # ===== v 5.1.0-RC1 ===== -# ===== v 5.1.0 ===== \ No newline at end of file +# ===== v 5.1.0 ===== + +# ===== v 5.1.1-B1 ===== +ALTER TABLE PollsComments CHANGE CreatedById CreatedById INT(11) NULL DEFAULT NULL; + +ALTER TABLE Topic + CHANGE OwnerId OwnerId INT( 11 ) NULL DEFAULT NULL , + CHANGE ModifiedById ModifiedById INT( 11 ) NULL DEFAULT NULL; + +UPDATE Topic SET ModifiedById = NULL WHERE ModifiedById = 0; \ No newline at end of file Index: in-bulletin/units/poll_comments/poll_comments_config.php =================================================================== --- in-bulletin/units/poll_comments/poll_comments_config.php (revision 13954) +++ in-bulletin/units/poll_comments/poll_comments_config.php (working copy) @@ -64,7 +64,7 @@ 'options' => Array(USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', - 'required' => 1, 'not_null' => 1, 'default' => USER_GUEST), + 'required' => 1, 'default' => NULL), 'GuestName' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), 'GuestEmail' => Array('type' => 'string', 'max_len' => 255, 'formatter'=>'kFormatter', 'regexp'=>'/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', 'sample_value' => 'email@domain.com', 'not_null' => '1', 'default' => '', 'error_msgs' => Array('invalid_format'=>'!la_invalid_email!', 'unique'=>'!lu_email_already_exist!'),'required' => 0 ), 'CommentBody' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL, 'required' => 1), Index: in-bulletin/units/posts/posts_config.php =================================================================== --- in-bulletin/units/posts/posts_config.php (revision 13954) +++ in-bulletin/units/posts/posts_config.php (working copy) @@ -99,7 +99,7 @@ 'DisableBBCodes' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => 0), 'DisableSmileys' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => 0), 'ShowSignatures' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'default' => 1), - + 'UserName' => Array ('type' => 'string', 'default' => ''), // for avatar image 'AltName' => Array('type' => 'string', 'default' => ''), 'SameImages' => Array('type' => 'string', 'default' => ''), Index: in-bulletin/units/private_messages/private_messages_config.php =================================================================== --- in-bulletin/units/private_messages/private_messages_config.php (revision 13954) +++ in-bulletin/units/private_messages/private_messages_config.php (working copy) @@ -96,7 +96,9 @@ 'VirtualFields' => Array ( 'FromName' => Array ('type' => 'string', 'default' => ''), + 'FromFullName' => Array ('type' => 'string', 'default' => ''), 'ToName' => Array ('type' => 'string', 'default' => ''), + 'ToFullName' => Array ('type' => 'string', 'default' => ''), 'Subject' => Array ('type' => 'string', 'default' => ''), 'Body' => Array ('type' => 'string', 'required' => 1, 'default' => ''), 'Options' => Array ('type' => 'string', 'default' => 0), Index: in-bulletin/units/topics/topics_config.php =================================================================== --- in-bulletin/units/topics/topics_config.php (revision 13954) +++ in-bulletin/units/topics/topics_config.php (working copy) @@ -243,7 +243,7 @@ ), 'FilterMenu' => Array ( - 'Groups' => Array ( + 'Groups' => Array ( Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER), Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER), Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER), @@ -390,7 +390,7 @@ 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), - 'required' => 1, 'not_null' => 1, 'default' => USER_ROOT, + 'required' => 1, 'default' => NULL, ), 'ModifiedById' => Array ( 'type' => 'int', @@ -401,7 +401,7 @@ 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), - 'required' => 1, 'not_null' => 1, 'default' => USER_ROOT, + 'required' => 1, 'default' => NULL, ), 'ResourceId' => Array ('type' => 'int', 'default' => null), 'TopicType' => Array ( @@ -462,8 +462,11 @@ 'options' => Array (), 'default' => 0, ), - 'Filename' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'Filename' => Array ('type' => 'string', 'default' => ''), + 'CategoryFilename' => Array ('type' => 'string', 'default' => ''), + 'PrimaryCat' => Array ('type' => 'int', 'default' => 0), 'CachedNavbar' => Array ('type' => 'string', 'default' => ''), + 'ParentPath' => Array ('type' => 'string', 'default' => ''), 'LastPoster' => Array ('type' => 'string', 'default' => ''), 'LastPosterId' => Array ('type' => 'int', 'default' => USER_GUEST), Index: in-commerce/install/install_schema.sql =================================================================== --- in-commerce/install/install_schema.sql (revision 13954) +++ in-commerce/install/install_schema.sql (working copy) @@ -171,7 +171,7 @@ ReturnTotal decimal(20,4) NOT NULL DEFAULT '0.0000', CostTotal decimal(20,4) NOT NULL DEFAULT '0.0000', OriginalAmount decimal(20,4) NOT NULL DEFAULT '0.0000', - ShippingOption tinyint(4) DEFAULT NULL, + ShippingOption tinyint(4) NOT NULL DEFAULT '0', ShippingInfo text, CouponId int(11) DEFAULT NULL, CouponDiscount decimal(20,4) NOT NULL DEFAULT '0.0000', @@ -301,11 +301,11 @@ Modified int(10) unsigned DEFAULT NULL, Expire int(10) unsigned DEFAULT NULL, Hits double NOT NULL DEFAULT '0', - CachedRating varchar(10) NOT NULL default '0', + CachedRating varchar(10) NOT NULL DEFAULT '0', CachedVotesQty int(11) NOT NULL DEFAULT '0', CachedReviewsQty int(11) NOT NULL DEFAULT '0', - CreatedById int(11) NOT NULL DEFAULT '0', - ModifiedById int(11) NOT NULL DEFAULT '0', + CreatedById int(11) DEFAULT NULL, + ModifiedById int(11) DEFAULT NULL, Priority int(11) NOT NULL DEFAULT '0', `Status` tinyint(4) NOT NULL DEFAULT '2', EditorsPick tinyint(4) NOT NULL DEFAULT '0', @@ -444,7 +444,7 @@ IsPrimary tinyint(4) NOT NULL DEFAULT '0', Priority smallint(6) NOT NULL DEFAULT '0', AddedOn int(11) DEFAULT NULL, - AddedById int(11) NOT NULL DEFAULT '0', + AddedById int(11) DEFAULT NULL, MIMEType varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (FileId), KEY ProductId (ProductId), Index: in-commerce/install/upgrades.sql =================================================================== --- in-commerce/install/upgrades.sql (revision 13954) +++ in-commerce/install/upgrades.sql (working copy) @@ -180,3 +180,15 @@ # ===== v 5.1.0 ===== ALTER TABLE Products CHANGE CachedRating CachedRating varchar(10) NOT NULL default '0'; + +# ===== v 5.1.1-B1 ===== +ALTER TABLE Orders CHANGE ShippingOption ShippingOption TINYINT(4) NOT NULL DEFAULT '0'; + +ALTER TABLE ProductFiles CHANGE AddedById AddedById INT(11) NULL DEFAULT NULL; +UPDATE ProductFiles SET AddedById = NULL WHERE AddedById = 0; + +ALTER TABLE Products + CHANGE CreatedById CreatedById INT(11) NULL DEFAULT NULL , + CHANGE ModifiedById ModifiedById INT(11) NULL DEFAULT NULL; +UPDATE Products SET CreatedById = NULL WHERE CreatedById = 0; +UPDATE Products SET ModifiedById = NULL WHERE ModifiedById = 0; Index: in-commerce/units/addresses/addresses_config.php =================================================================== --- in-commerce/units/addresses/addresses_config.php (revision 13954) +++ in-commerce/units/addresses/addresses_config.php (working copy) @@ -110,7 +110,7 @@ ), 'VirtualFields' => Array( - 'ShortAddress' => Array('type'=>'string'), + 'ShortAddress' => Array('type'=>'string', 'default' => ''), ), 'Grids' => Array(), Index: in-commerce/units/affiliate_payments/affiliate_payments_config.php =================================================================== --- in-commerce/units/affiliate_payments/affiliate_payments_config.php (revision 13954) +++ in-commerce/units/affiliate_payments/affiliate_payments_config.php (working copy) @@ -118,8 +118,8 @@ ), 'VirtualFields' => Array( - 'Username' => Array('type' => 'string'), - 'PortalUserId' => Array('type' => 'int'), + 'Username' => Array('type' => 'string', 'default' => ''), + 'PortalUserId' => Array('type' => 'int', 'default' => 0), ), 'Grids' => Array( Index: in-commerce/units/affiliate_plans_items/affiliate_plans_items_config.php =================================================================== --- in-commerce/units/affiliate_plans_items/affiliate_plans_items_config.php (revision 13954) +++ in-commerce/units/affiliate_plans_items/affiliate_plans_items_config.php (working copy) @@ -85,12 +85,19 @@ ), 'VirtualFields' => Array( - 'ProductId' => Array(), - 'ItemName' => Array(), - 'SKU' => Array(), - 'Weight' => Array('type'=>'float', 'min_value_exc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f'), - 'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'BackOrderDate' => Array('formatter' => 'kDateFormatter', 'default' => NULL), + 'ProductId' => Array('type' => 'int', 'default' => 0), + 'ItemName' => Array('type' => 'string', 'default' => ''), + 'SKU' => Array('type' => 'string', 'default' => ''), + 'Weight' => Array('type'=>'float', 'min_value_exc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => 0), + 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'BackOrderDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), + 'Status' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1, + 'default' => 2, + ), + 'CategoryId' => Array ('type' => 'int', 'default' => 0), ), 'Grids' => Array( Index: in-commerce/units/affiliates/affiliates_config.php =================================================================== --- in-commerce/units/affiliates/affiliates_config.php (revision 13954) +++ in-commerce/units/affiliates/affiliates_config.php (working copy) @@ -182,6 +182,7 @@ 'VirtualFields' => Array( 'UserName' => Array('type'=>'string', 'default' => ''), 'PlanName' => Array('type'=>'string', 'default' => ''), + 'UserId' => Array('type'=>'int', 'default' => 0), ), 'Grids' => Array( Index: in-commerce/units/coupon_items/coupon_items_config.php =================================================================== --- in-commerce/units/coupon_items/coupon_items_config.php (revision 13954) +++ in-commerce/units/coupon_items/coupon_items_config.php (working copy) @@ -82,18 +82,25 @@ 'Fields' => Array ( 'CouponItemId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ), - 'CouponId' => Array('type' => 'int', 'default' => 0, ), - 'ItemResourceId' => Array('type' => 'int', 'default' => 0, ), + 'CouponId' => Array('type' => 'int', 'default' => null, ), + 'ItemResourceId' => Array('type' => 'int', 'default' => null, ), 'ItemType' => Array('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_Product', 2 => 'la_Category', 0 => 'la_WholeOrder' ), 'default' => 1, ), ), 'VirtualFields' => Array( - 'ProductId' => Array(), - 'ItemName' => Array(), - 'SKU' => Array(), - 'Weight' => Array('type'=>'float', 'min_value_exc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f'), - 'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'BackOrderDate' => Array('formatter' => 'kDateFormatter', 'default' => NULL), + 'ProductId' => Array('type' => 'int', 'default' => 0), + 'ItemName' => Array('type' => 'string', 'default' => ''), + 'SKU' => Array('type' => 'string', 'default' => ''), + 'Weight' => Array('type'=>'float', 'min_value_exc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => 0), + 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'BackOrderDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), + 'Status' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1, + 'default' => 2, + ), + 'CategoryId' => Array ('type' => 'int', 'default' => 0), ), 'Grids' => Array( Index: in-commerce/units/discount_items/discount_items_config.php =================================================================== --- in-commerce/units/discount_items/discount_items_config.php (revision 13954) +++ in-commerce/units/discount_items/discount_items_config.php (working copy) @@ -82,18 +82,25 @@ 'Fields' => Array ( 'DiscountItemId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ), - 'DiscountId' => Array('type' => 'int', 'default' => 0, ), - 'ItemResourceId' => Array('type' => 'int', 'default' => 0, ), + 'DiscountId' => Array('type' => 'int', 'default' => null, ), + 'ItemResourceId' => Array('type' => 'int', 'default' => null, ), 'ItemType' => Array('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_Product', 2 => 'la_Category', 0 => 'la_WholeOrder' ), 'default' => 1, ), ), 'VirtualFields' => Array( - 'ProductId' => Array(), - 'ItemName' => Array(), - 'SKU' => Array(), - 'Weight' => Array('type'=>'float', 'min_value_exc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f'), - 'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'BackOrderDate' => Array('formatter' => 'kDateFormatter', 'default' => NULL), + 'ProductId' => Array('type' => 'int', 'default' => 0), + 'ItemName' => Array('type' => 'string', 'default' => ''), + 'SKU' => Array('type' => 'string', 'default' => ''), + 'Weight' => Array('type'=>'float', 'min_value_exc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => 0), + 'CreatedOn' => Array('type' => 'int','formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'BackOrderDate' => Array('type' => 'int','formatter' => 'kDateFormatter', 'default' => NULL), + 'Status' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1, + 'default' => 2, + ), + 'CategoryId' => Array ('type' => 'int', 'default' => 0), ), 'Grids' => Array( Index: in-commerce/units/files/files_config.php =================================================================== --- in-commerce/units/files/files_config.php (revision 13954) +++ in-commerce/units/files/files_config.php (working copy) @@ -110,7 +110,7 @@ ), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'AddedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'AddedById' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'AddedById' => Array ('type' => 'int', 'default' => NULL), 'MIMEType' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), ), Index: in-commerce/units/gateways/gateways_config.php =================================================================== --- in-commerce/units/gateways/gateways_config.php (revision 13954) +++ in-commerce/units/gateways/gateways_config.php (working copy) @@ -58,15 +58,15 @@ 'Fields' => Array ( 'GWConfigFieldId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ), - 'SystemFieldName' => Array('type' => 'string', 'not_null' => 1, 'default' => 0, ), - 'FieldName' => Array('type' => 'string', 'required' => true, 'max_len' => 100, 'not_null' => 1, 'default' => 0, ), - 'ElementType' => Array('type' => 'string', 'not_null' => 1, 'default' => 0, ), + 'SystemFieldName' => Array('type' => 'string', 'not_null' => 1, 'default' => '', ), + 'FieldName' => Array('type' => 'string', 'required' => true, 'max_len' => 100, 'not_null' => 1, 'default' => '', ), + 'ElementType' => Array('type' => 'string', 'not_null' => 1, 'default' => 'text', ), 'ValueList' => Array('type' => 'string', 'default' => NULL), 'GatewayId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ), ), 'VirtualFields' => Array ( - 'Value' => Array(), + 'Value' => Array('type' => 'string', 'default' => ''), ), 'Grids' => Array( Index: in-commerce/units/order_items/order_items_config.php =================================================================== --- in-commerce/units/order_items/order_items_config.php (revision 13954) +++ in-commerce/units/order_items/order_items_config.php (working copy) @@ -123,10 +123,10 @@ 'QuantityAvailable' => Array('type'=>'int','default'=>0), 'DiscountType' => Array('type'=>'string','default'=>''), 'DiscountId' => Array('type'=>'int','default'=>0), - 'Name' => Array('formatter' => 'kMultiLanguage'), + 'Name' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => ''), 'ItemDiscount' => Array('type'=>'double','formatter'=>'kFormatter','format'=>'%01.2f','default'=>'0.00'), 'SKU' => Array('type' => 'string', 'default' => ''), - 'MinQtyFreeShipping'=> Array('type' => 'int', 'not_null' => 1, 'default' => 0,), + 'MinQtyFreeShipping'=> Array('type' => 'int', 'default' => 0,), ), 'Grids' => Array ( Index: in-commerce/units/orders/orders_config.php =================================================================== --- in-commerce/units/orders/orders_config.php (revision 13954) +++ in-commerce/units/orders/orders_config.php (working copy) @@ -226,7 +226,7 @@ ), ), - 'TableName' => TABLE_PREFIX . 'Orders', + 'TableName' => TABLE_PREFIX . 'Orders', 'CalculatedFields' => Array ( '' => Array ( @@ -399,7 +399,7 @@ 'ReturnTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), 'CostTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), 'OriginalAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), - 'ShippingOption' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (0 => 'la_ship_all_together', 1 => 'la_ship_backorder_separately', 2 => 'la_ship_backorders_upon_avail'), 'default' =>0), + 'ShippingOption' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (0 => 'la_ship_all_together', 1 => 'la_ship_backorder_separately', 2 => 'la_ship_backorders_upon_avail'), 'not_null' => 1, 'default' =>0), 'ShippingGroupOption' => Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (0 => 'la_auto_group_shipments', 1 => 'la_manual_group_shipments'), 'default' =>0), 'GiftCertificateId' => Array ('type' => 'int', 'default' => null), 'GiftCertificateDiscount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00',), @@ -436,11 +436,15 @@ 'VirtualFields' => Array ( 'CustomerName' => Array ('type' => 'string', 'default' => '', 'filter_type' => 'like'), - 'TotalAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), - 'AmountWithoutVAT' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), - 'SubtotalWithDiscount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), - 'SubtotalWithoutDiscount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), + 'TotalAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'), + 'AmountWithoutVAT' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'), + 'SubtotalWithDiscount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'), + 'SubtotalWithoutDiscount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'), 'OrderNumber' => Array ('type' => 'string', 'default' => '', 'filter_type' => 'like'), + 'CouponCode' => Array ('type' => 'string', 'default' => ''), + 'CouponName' => Array ('type' => 'string', 'default' => ''), + 'GiftCertificateCode' => Array ('type' => 'string', 'default' => ''), + 'GiftCertificateRecipient' => Array ('type' => 'string', 'default' => ''), // for ResetToUser 'UserTo' => Array ('type' => 'string', 'default' => ''), @@ -456,16 +460,11 @@ 'UserCountry' => Array ('type' => 'string', 'default' => ''), // for Search - 'Username' => Array ('type' => 'string', 'filter_type' => 'like'), - 'OrderSearchId' => Array ('type' => 'int', 'filter_type' => 'equals', 'filter_field' => 'OrderId'), - 'FromDateTime' => Array ('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_from', 'filter_field' => 'OrderDate' ), - 'ToDateTime' => Array ('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_to', 'filter_field' => 'OrderDate', 'empty_time' => adodb_mktime(23,59,59) ), - 'FromAmount' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'filter_type' => 'range_from', 'filter_field' => 'TotalAmount'), - 'ToAmount' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'filter_type' => 'range_to', 'filter_field' => 'TotalAmount'), - 'HasBackOrders' => Array ('default' =>false), - 'PaymentCVV2' => Array ('type' => 'string', 'default' =>false), - 'AffiliateUser' => Array ('type' => 'string', 'filter_type' => 'like'), - 'AffiliatePortalUserId' => Array ('type' => 'int'), + 'Username' => Array ('type' => 'string', 'filter_type' => 'like', 'default' => ''), + 'HasBackOrders' => Array ('type' => 'int', 'default' => 0), + 'PaymentCVV2' => Array ('type' => 'string', 'default' => ''), + 'AffiliateUser' => Array ('type' => 'string', 'filter_type' => 'like', 'default' => ''), + 'AffiliatePortalUserId' => Array ('type' => 'int', 'default' => 0), // export related fields: begin 'ExportFormat' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'CSV', /*2 => 'XML'*/), 'default' => 1), @@ -478,18 +477,18 @@ 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), - 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, + 'use_phrases' => 1, 'default' => 1, ), - 'ExportColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()), - 'AvailableColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()), - 'ExportPresets' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()), + 'ExportColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''), + 'AvailableColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''), + 'ExportPresets' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''), 'ExportSavePreset' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), - 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, + 'use_phrases' => 1, 'default' => 0, ), - 'ExportPresetName' => Array ('type' => 'string'), + 'ExportPresetName' => Array ('type' => 'string', 'default' => ''), // export related fields: end ), 'Grids' => Array ( Index: in-commerce/units/payment_type/payment_type_config.php =================================================================== --- in-commerce/units/payment_type/payment_type_config.php (revision 13954) +++ in-commerce/units/payment_type/payment_type_config.php (working copy) @@ -97,7 +97,7 @@ 'Sorting' => Array ('Name' => 'asc'), ) ), - + 'Fields' => Array ( 'PaymentTypeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), 'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' =>true, 'max_len' => 100), @@ -106,15 +106,15 @@ 'AdminComments' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), 'Status' => Array ( 'type' => 'int', - 'formatter' => 'kOptionsFormatter', - 'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1, - 'not_null' => 1, 'default' => 0, + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, ), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'IsPrimary' => Array ( 'type' => 'int', - 'formatter' => 'kOptionsFormatter', - 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, ), 'BuiltIn' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_BuiltIn', 0 => 'la_UserDefined' ), 'default' => 0, 'not_null' => 1 ), @@ -128,18 +128,18 @@ ), 'PlacedOrdersEdit' => Array ( 'type' => 'int', - 'formatter' => 'kOptionsFormatter', - 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, ), 'ProcessingFee' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => 1, 'default' => '0.00'), 'PortalGroups' => Array ('type' => 'string', 'default' => null), ), - /* + 'VirtualFields' => Array ( - 'Qty' => 1, + 'Gateway' => Array ('type' => 'string', 'default' => ''), ), - */ + 'Grids' => Array ( 'Default' => Array ( 'Icons' => Array ( Index: in-commerce/units/pricing/pricing_config.php =================================================================== --- in-commerce/units/pricing/pricing_config.php (revision 13954) +++ in-commerce/units/pricing/pricing_config.php (working copy) @@ -81,8 +81,8 @@ 'Fields' => Array ( 'PriceId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), 'ProductId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'MinQty' => Array ('type' => 'int', 'default' => 0), - 'MaxQty' => Array ('type' => 'int', 'default' => 0), + 'MinQty' => Array ('type' => 'int', 'default' => null), + 'MaxQty' => Array ('type' => 'int', 'default' => null), 'Cost' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0), 'Price' => Array ('type' => 'float', 'not_null' => 1, 'formatter' => 'kFormatter', 'min_value_inc' => 0, 'format' => '%.2f', 'default' => 0), 'Negotiated' => Array ( @@ -91,7 +91,7 @@ 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, 'default' => NULL, ), - 'Points' => Array ('type' => 'int', 'default' => 0), + 'Points' => Array ('type' => 'int', 'default' => null), 'AccessDuration'=> Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), 'AccessUnit' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (1 => 'la_opt_sec', 2 => 'la_opt_min', 3 => 'la_opt_hour', 4 => 'la_opt_day', 5 => 'la_opt_week', 6 => 'la_opt_month', 7 => 'la_opt_year'), 'not_null' => 1, 'default' => 0,), 'Description' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL), Index: in-commerce/units/product_option_combinations/product_option_combinations_config.php =================================================================== --- in-commerce/units/product_option_combinations/product_option_combinations_config.php (revision 13954) +++ in-commerce/units/product_option_combinations/product_option_combinations_config.php (working copy) @@ -69,8 +69,8 @@ 'Weight' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'default' => 0, ), 'Availability' => Array ( 'type' => 'int', - 'formatter' => 'kOptionsFormatter', - 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, ), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ), @@ -91,7 +91,8 @@ ), ), 'VirtualFields' => Array ( - 'FinalPrice' => Array ('formatter' => 'kCombPriceFormatter', 'format' => '%.2f'), + 'FinalPrice' => Array ('type' => 'float', 'formatter' => 'kCombPriceFormatter', 'format' => '%.2f', 'default' => NULL), + 'BasePrice' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => NULL), ), 'Grids' => Array ( 'Default' => Array ( Index: in-commerce/units/products/products_config.php =================================================================== --- in-commerce/units/products/products_config.php (revision 13954) +++ in-commerce/units/products/products_config.php (working copy) @@ -360,7 +360,7 @@ ), 'TableName' => TABLE_PREFIX . 'Products', - + 'CalculatedFields' => Array ( '' => Array ( 'AltName' => 'img.AltName', @@ -492,9 +492,9 @@ 'Expire' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' =>null), 'Type' => Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' =>Array (1=> 'la_product_tangible', 2=> 'la_product_subscription', 4=> 'la_product_downloadable', 3=> 'la_product_service'/*, 6=> 'la_gift_certificate', 5=> 'la_product_package'*/), 'not_null' => 1, 'default' => 1 ), 'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'ModifiedById' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'CreatedById' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'ResourceId' => Array ('type' => 'int', 'default' => 0), + 'ModifiedById' => Array ('type' => 'int', 'default' => NULL), + 'CreatedById' => Array ('type' => 'int', 'default' => NULL), + 'ResourceId' => Array ('type' => 'int', 'default' => null), 'CachedReviewsQty' => Array ('type' => 'int', 'formatter' => 'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0), 'InventoryStatus' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_Disabled', 1 => 'la_by_product', 2 => 'la_by_options'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'QtyInStock' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), @@ -539,13 +539,15 @@ ), 'VirtualFields' => Array ( - 'Qty' => 1, + 'Qty' => Array ('type' => 'int', 'formatter' => 'kFormatter', 'regexp' => '/^[\d]+$/', 'default' => 0), 'Price' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => NULL), 'Cost' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => NULL), - 'IsHot' => Array ('type' => 'int'), - 'IsNew' => Array ('type' => 'int'), - 'IsPop' => Array ('type' => 'int'), - 'Manufacturer' => Array (), + 'CategoryFilename' => Array ('type' => 'string', 'default' => ''), + 'PrimaryCat' => Array ('type' => 'int', 'default' => 0), + 'IsHot' => Array ('type' => 'int', 'default' => 0), + 'IsNew' => Array ('type' => 'int', 'default' => 0), + 'IsPop' => Array ('type' => 'int', 'default' => 0), + 'Manufacturer' => Array ('type' => 'string', 'default' => ''), // export related fields: begin 'CategoryId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => 0), @@ -559,24 +561,24 @@ 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), - 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, + 'use_phrases' => 1, 'default' => 1, ), - 'ExportColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()), - 'AvailableColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()), + 'ExportColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''), + 'AvailableColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''), 'CategoryFormat' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_MixedCategoryPath', 2 => 'la_SeparatedCategoryPath'), 'use_phrases' => 1, 'default' => 1), 'CategorySeparator' => Array ('type' => 'string', 'default' => ':'), 'IsBaseCategory' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), - 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, + 'use_phrases' => 1, 'default' => 0, ), // export related fields: end // import related fields: begin 'FieldTitles' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Automatic', 2 => 'la_Manual'), 'use_phrases' => 1, 'default' => 1), 'ImportSource' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Upload', 2 => 'la_Local'), 'use_phrases' => 1, 'default' => 2), - 'ImportFilename' => Array ('type' => 'string', 'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => EXPORT_BASE_PATH . '/'), + 'ImportFilename' => Array ('type' => 'string', 'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => EXPORT_BASE_PATH . '/', 'default' => ''), 'ImportLocalFilename' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'default' => ''), 'CheckDuplicatesMethod' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_IDField', 2 => 'la_OtherFields'), 'use_phrases' => 1, 'default' => 1), 'ReplaceDuplicates' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'default' => 0), @@ -588,13 +590,13 @@ 'FullImage' => Array ('type' => 'string', 'default' => ''), 'ImageAlt' => Array ('type' => 'string', 'default' => ''), - 'Filename' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), + 'Filename' => Array ('type' => 'string', 'default' => ''), 'CachedNavbar' => Array ('type' => 'string', 'default' => ''), 'ParentPath' => Array ('type' => 'string', 'default' => ''), - 'FileSize' => Array ('type' => 'int', 'formatter' => 'kFilesizeFormatter', 'not_null' => 1, 'default' => 0), - 'FilePath' => Array (), - 'FileVersion' => Array (), + 'FileSize' => Array ('type' => 'int', 'formatter' => 'kFilesizeFormatter', 'default' => 0), + 'FilePath' => Array ('type' => 'string', 'default' => ''), + 'FileVersion' => Array ('type' => 'string', 'default' => ''), // for primary image 'AltName' => Array ('type' => 'string', 'default' => ''), Index: in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php =================================================================== --- in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php (revision 13954) +++ in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php (working copy) @@ -76,7 +76,7 @@ 'Sorting' => Array ('Name' => 'asc'), ) ), - + 'Fields' => Array ( 'EngineId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), @@ -97,82 +97,96 @@ ), 'VirtualFields' => Array ( - 'AccountLogin' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), - 'AccountPassword' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'AccountLogin' => Array ('type' => 'string', 'default' => ''), + 'AccountPassword' => Array ('type' => 'string', 'default' => ''), 'UPSEnabled' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled'), + 'default' => 0 ), - 'UPSAccount' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'UPSAccount' => Array ('type' => 'string', 'default' => ''), 'UPSInvoiced' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'), + 'default' => 0 ), 'FDXEnabled' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled'), + 'default' => 0 ), - 'FDXAccount' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'FDXAccount' => Array ('type' => 'string', 'default' => ''), 'FDXInvoiced' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'), + 'default' => 0 ), 'DHLEnabled' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled'), + 'default' => 0 ), - 'DHLAccount' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'DHLAccount' => Array ('type' => 'string', 'default' => ''), 'DHLInvoiced' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'), + 'default' => 0 ), 'USPEnabled' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled'), + 'default' => 0 ), - 'USPAccount' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'USPAccount' => Array ('type' => 'string', 'default' => ''), 'USPInvoiced' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'), + 'default' => 0 ), 'ARBEnabled' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled'), + 'default' => 0 ), - 'ARBAccount' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'ARBAccount' => Array ('type' => 'string', 'default' => ''), 'ARBInvoiced' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'), + 'default' => 0 ), '1DYEnabled' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled'), + 'default' => 0 ), '2DYEnabled' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled'), + 'default' => 0 ), '3DYEnabled' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled'), + 'default' => 0 ), 'GNDEnabled' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled'), + 'default' => 0 ), 'ShipMethod' => Array ( 'type' => 'string', @@ -181,6 +195,7 @@ 'DRP' => 'Drop-Off At Carrier Location', 'PCK' => 'Schedule A Special Pickup', 'SCD' => 'Regularly Scheduled Pickup'), + 'default' => null ), ), 'Grids' => Array ( Index: in-link/install/install_schema.sql =================================================================== --- in-link/install/install_schema.sql (revision 13954) +++ in-link/install/install_schema.sql (working copy) @@ -1,45 +1,45 @@ CREATE TABLE Link ( - LinkId int(11) NOT NULL auto_increment, - Name varchar(255) NOT NULL default '', - l1_Name varchar(255) NOT NULL default '', - l2_Name varchar(255) NOT NULL default '', - l3_Name varchar(255) NOT NULL default '', - l4_Name varchar(255) NOT NULL default '', - l5_Name varchar(255) NOT NULL default '', - AutomaticFilename tinyint(3) unsigned NOT NULL default '1', + LinkId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) NOT NULL DEFAULT '', + l1_Name varchar(255) NOT NULL DEFAULT '', + l2_Name varchar(255) NOT NULL DEFAULT '', + l3_Name varchar(255) NOT NULL DEFAULT '', + l4_Name varchar(255) NOT NULL DEFAULT '', + l5_Name varchar(255) NOT NULL DEFAULT '', + AutomaticFilename tinyint(3) unsigned NOT NULL DEFAULT '1', Description text, l1_Description text, l2_Description text, l3_Description text, l4_Description text, l5_Description text, - MetaKeywords varchar(255) default NULL, + MetaKeywords varchar(255) DEFAULT NULL, MetaDescription text, - Url varchar(255) NOT NULL default '', - CreatedOn int(10) unsigned default NULL, - Modified int(10) unsigned default NULL, - Expire int(10) unsigned default NULL, - Hits double(20,6) NOT NULL default '0.000000', - CachedRating varchar(10) NOT NULL default '0', - CachedVotesQty int(11) NOT NULL default '0', - CachedReviewsQty int(11) NOT NULL default '0', - CreatedById int(11) NOT NULL default '-1', - ModifiedById int(11) NOT NULL default '-1', - Priority int(11) NOT NULL default '0', - `Status` tinyint(4) NOT NULL default '2', - EditorsPick tinyint(4) NOT NULL default '0', - ResourceId int(11) default NULL, - HotItem tinyint(4) NOT NULL default '2', - PopItem tinyint(4) NOT NULL default '2', - NewItem tinyint(4) NOT NULL default '2', - OrgId int(11) default NULL, - CustomTemplate varchar(255) NOT NULL default '', - ReciprocalLinkFound tinyint(3) unsigned NOT NULL default '0', - PRIMARY KEY (LinkId), + Url varchar(255) NOT NULL DEFAULT '', + CreatedOn int(10) unsigned DEFAULT NULL, + Modified int(10) unsigned DEFAULT NULL, + Expire int(10) unsigned DEFAULT NULL, + Hits double(20,6) NOT NULL DEFAULT '0.000000', + CachedRating varchar(10) NOT NULL DEFAULT '0', + CachedVotesQty int(11) NOT NULL DEFAULT '0', + CachedReviewsQty int(11) NOT NULL DEFAULT '0', + CreatedById int(11) DEFAULT NULL, + ModifiedById int(11) DEFAULT NULL, + Priority int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '2', + EditorsPick tinyint(4) NOT NULL DEFAULT '0', + ResourceId int(11) DEFAULT NULL, + HotItem tinyint(4) NOT NULL DEFAULT '2', + PopItem tinyint(4) NOT NULL DEFAULT '2', + NewItem tinyint(4) NOT NULL DEFAULT '2', + OrgId int(11) DEFAULT NULL, + CustomTemplate varchar(255) NOT NULL DEFAULT '', + ReciprocalLinkFound tinyint(3) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (LinkId), UNIQUE KEY ResourceId (ResourceId), - KEY sorting (Priority,Name), + KEY sorting (Priority,`Name`), KEY Hits (Hits), - KEY Name (Name), + KEY `Name` (`Name`), KEY l1_Name (l1_Name), KEY l2_Name (l2_Name), KEY l3_Name (l3_Name), Index: in-link/install/upgrades.sql =================================================================== --- in-link/install/upgrades.sql (revision 13954) +++ in-link/install/upgrades.sql (working copy) @@ -101,4 +101,9 @@ # ===== v 5.1.0-RC1 ===== -# ===== v 5.1.0 ===== \ No newline at end of file +# ===== v 5.1.0 ===== + +# ===== v 5.1.1-B1 ===== +ALTER TABLE Link + CHANGE CreatedById CreatedById INT(11) NULL DEFAULT NULL , + CHANGE ModifiedById ModifiedById INT(11) NULL DEFAULT NULL; \ No newline at end of file Index: in-link/units/link_validation/link_validation_config.php =================================================================== --- in-link/units/link_validation/link_validation_config.php (revision 13954) +++ in-link/units/link_validation/link_validation_config.php (working copy) @@ -117,15 +117,15 @@ ), 'VirtualFields' => Array ( - 'ForeignLinkId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'LinkName' => Array('type' => 'string', /*'formatter' => 'kMultiLanguage',*/ 'not_null' => 1, 'max_len' => 255, 'default' => ''), - 'LinkUrl' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'ForeignLinkId' => Array ('type' => 'int', 'default' => 0), + 'LinkName' => Array('type' => 'string', /*'formatter' => 'kMultiLanguage',*/ 'max_len' => 255, 'default' => ''), + 'LinkUrl' => Array ('type' => 'string', 'default' => ''), 'LinkCreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'LinkStatus' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), + 'LinkStatus' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1, 'default' => 2), 'LinkValidationStatus' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_Text_Not_Validated', 1 => 'la_Text_Valid', 2 => 'la_Text_Invalid'), 'use_phrases' => 1, - 'not_null' => 1, 'default' => 0 + 'default' => 0 ), // for category path drawing Index: in-link/units/links/links_config.php =================================================================== --- in-link/units/links/links_config.php (revision 13954) +++ in-link/units/links/links_config.php (working copy) @@ -377,7 +377,7 @@ ), 'FilterMenu' => Array ( - 'Groups' => Array ( + 'Groups' => Array ( Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER), Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER), Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER), @@ -463,8 +463,8 @@ 'CachedRating' => Array ('type' => 'string', 'not_null' => 1, 'formatter' => 'kFormatter', 'default' => 0), 'CachedVotesQty' => Array ('type' => 'int', 'formatter' => 'kFormatter', 'not_null' => 1, 'default' => 0), 'CachedReviewsQty' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'CreatedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1, 'default' => USER_ROOT), - 'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1, 'default' => USER_ROOT), + 'CreatedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'default' => NULL), + 'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'default' => NULL), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Status' => Array ( 'type' => 'int', @@ -513,24 +513,24 @@ 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), - 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, + 'use_phrases' => 1, 'default' => 1, ), - 'ExportColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()), - 'AvailableColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()), + 'ExportColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''), + 'AvailableColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''), 'CategoryFormat' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_MixedCategoryPath', 2 => 'la_SeparatedCategoryPath'), 'use_phrases' => 1, 'default' => 1), 'CategorySeparator' => Array ('type' => 'string', 'error_field' => 'CategoryFormat', 'default' => ':'), 'IsBaseCategory' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), - 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, + 'use_phrases' => 1, 'default' => 0, ), // export related fields: end // import related fields: begin 'FieldTitles' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Automatic', 2 => 'la_Manual'), 'use_phrases' => 1, 'default' => 1), 'ImportSource' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Upload', 2 => 'la_Local'), 'use_phrases' => 1, 'default' => 2), - 'ImportFilename' => Array ('type' => 'string', 'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => EXPORT_BASE_PATH . '/'), + 'ImportFilename' => Array ('type' => 'string', 'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => EXPORT_BASE_PATH . '/', 'default' => ''), 'ImportLocalFilename' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'default' => ''), 'CheckDuplicatesMethod' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_IDField', 2 => 'la_OtherFields'), 'use_phrases' => 1, 'default' => 1), 'ReplaceDuplicates' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'default' => 0), @@ -542,7 +542,9 @@ 'FullImage' => Array ('type' => 'string', 'default' => ''), 'ImageAlt' => Array ('type' => 'string', 'default' => ''), - 'Filename' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'Filename' => Array ('type' => 'string', 'default' => ''), + 'CategoryFilename' => Array ('type' => 'string', 'default' => ''), + 'PrimaryCat' => Array ('type' => 'int', 'default' => 0), 'CachedNavbar' => Array ('type' => 'string', 'default' => ''), 'ParentPath' => Array ('type' => 'string', 'default' => ''), Index: in-link/units/listings/listings_config.php =================================================================== --- in-link/units/listings/listings_config.php (revision 13954) +++ in-link/units/listings/listings_config.php (working copy) @@ -143,8 +143,8 @@ ), 'VirtualFields' => Array ( - 'LinkName' => Array ('type' => 'string'), - 'LinkOwner' => Array ('type' => 'string'), + 'LinkName' => Array ('type' => 'string', 'default' => ''), + 'LinkOwner' => Array ('type' => 'string', 'default' => ''), ), 'Grids' => Array ( Index: in-news/install/install_schema.sql =================================================================== --- in-news/install/install_schema.sql (revision 13954) +++ in-news/install/install_schema.sql (working copy) @@ -28,7 +28,7 @@ Hits double(20,6) NOT NULL DEFAULT '0.000000', CachedRating varchar(10) DEFAULT '0', CachedVotesQty int(11) NOT NULL DEFAULT '0', - CreatedById int(11) NOT NULL DEFAULT '-1', + CreatedById int(11) DEFAULT NULL, Priority int(11) NOT NULL DEFAULT '0', `Status` tinyint(4) NOT NULL DEFAULT '2', EditorsPick tinyint(4) NOT NULL DEFAULT '0', @@ -42,7 +42,7 @@ HotItem tinyint(4) NOT NULL DEFAULT '2', Archived int(11) NOT NULL DEFAULT '0', Modified int(11) DEFAULT NULL, - ModifiedById int(11) NOT NULL DEFAULT '-1', + ModifiedById int(11) DEFAULT NULL, OrgId int(11) DEFAULT NULL, PRIMARY KEY (NewsId), UNIQUE KEY ResourceId (ResourceId), Index: in-news/install/upgrades.sql =================================================================== --- in-news/install/upgrades.sql (revision 13954) +++ in-news/install/upgrades.sql (working copy) @@ -90,4 +90,9 @@ # ===== v 5.1.0-RC1 ===== -# ===== v 5.1.0 ===== \ No newline at end of file +# ===== v 5.1.0 ===== + +# ===== v 5.1.1-B1 ===== +ALTER TABLE News + CHANGE CreatedById CreatedById INT(11) NULL DEFAULT NULL , + CHANGE ModifiedById ModifiedById INT(11) NULL DEFAULT NULL; \ No newline at end of file Index: in-news/units/articles/articles_config.php =================================================================== --- in-news/units/articles/articles_config.php (revision 13954) +++ in-news/units/articles/articles_config.php (working copy) @@ -285,7 +285,7 @@ ), 'FilterMenu' => Array ( - 'Groups' => Array ( + 'Groups' => Array ( Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER), Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER), Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER), @@ -395,7 +395,7 @@ 'Hits' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0), 'CachedRating' => Array ('type' => 'string', 'default' => 0), 'CachedVotesQty' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'CreatedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1, 'required' => 1, 'default' => USER_ROOT), + 'CreatedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'required' => 1, 'default' => NULL), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Status' => Array ( 'type' => 'int', @@ -429,7 +429,7 @@ 'HotItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), 'Archived' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 2 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1, 'default' => USER_ROOT), + 'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'default' => NULL), 'OrgId' => Array ('type' => 'int', 'default' => null), 'MetaKeywords' => Array ('type' => 'string', 'default' => null), 'MetaDescription' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), @@ -443,7 +443,9 @@ 'cust_RssOriginalURL' => Array ('type' => 'string', 'default' => ''), 'cust_RssArticleCRC' => Array ('type' => 'int', 'default' => 0), - 'Filename' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'Filename' => Array ('type' => 'string', 'default' => ''), + 'CategoryFilename' => Array ('type' => 'string', 'default' => ''), + 'PrimaryCat' => Array ('type' => 'int', 'default' => 0), 'CachedNavbar' => Array ('type' => 'string', 'default' => ''), 'ParentPath' => Array ('type' => 'string', 'default' => ''), @@ -469,24 +471,24 @@ 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), - 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, + 'use_phrases' => 1, 'default' => 1, ), - 'ExportColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()), - 'AvailableColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()), + 'ExportColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''), + 'AvailableColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''), 'CategoryFormat' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_MixedCategoryPath', 2 => 'la_SeparatedCategoryPath'), 'use_phrases' => 1, 'default' => 1), 'CategorySeparator' => Array ('type' => 'string', 'default' => ':'), 'IsBaseCategory' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), - 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, + 'use_phrases' => 1, 'default' => 0, ), // export related fields: end // import related fields: begin 'FieldTitles' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Automatic', 2 => 'la_Manual'), 'use_phrases' => 1, 'default' => 1), 'ImportSource' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Upload', 2 => 'la_Local'), 'use_phrases' => 1, 'default' => 2), - 'ImportFilename' => Array ('type' => 'string', 'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => EXPORT_BASE_PATH . '/'), + 'ImportFilename' => Array ('type' => 'string', 'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => EXPORT_BASE_PATH . '/', 'default' => ''), 'ImportLocalFilename' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'default' => ''), 'CheckDuplicatesMethod' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_IDField', 2 => 'la_OtherFields'), 'use_phrases' => 1, 'default' => 1), 'ReplaceDuplicates' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'default' => 0), Index: in-news/units/articles/articles_event_handler.php =================================================================== --- in-news/units/articles/articles_event_handler.php (revision 13954) +++ in-news/units/articles/articles_event_handler.php (working copy) @@ -477,12 +477,12 @@ { $new_virtual_fields = Array( 'cust_RssSource' => Array('type' => 'string', 'default' => ''), - 'cust_RssDefaultExpiration' => Array('type' => 'int', 'not_null' => 1, 'default' => ''), + 'cust_RssDefaultExpiration' => Array('type' => 'int', 'default' => ''), 'cust_RssDefaultExpirationType' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(60 => 'la_opt_min', 3600 => 'la_opt_hour', 86400 => 'la_opt_day', 2419200 => 'la_opt_month', 29030400 => 'la_opt_year'), 'default' => 60), - 'cust_RssExpireInterval' => Array('type' => 'int', 'not_null' => 1, 'default' => ''), + 'cust_RssExpireInterval' => Array('type' => 'int', 'default' => ''), 'cust_RssExpireIntervalType' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(60 => 'la_opt_min', 3600 => 'la_opt_hour', 86400 => 'la_opt_day', 2419200 => 'la_opt_month'), 'default' => 60), 'cust_RssDeleteExpired' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'default' => 0), - 'cust_RssUpdateInterval' => Array('type' => 'int', 'not_null' => 1, 'default' => ''), + 'cust_RssUpdateInterval' => Array('type' => 'int', 'default' => ''), 'cust_RssUpdateIntervalType' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(60 => 'la_opt_min', 3600 => 'la_opt_hour', 86400 => 'la_opt_day', 2419200 => 'la_opt_month'), 'default' => 60), 'cust_RssLastUpdated' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''), 'cust_RssLastExpired' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''),