Page MenuHomeIn-Portal Phabricator
Files F1046811

D26.id76.diff
No OneTemporary
Actions

File Metadata

Created
Sun, Jun 29, 6:42 AM

D26.id76.diff
View Options

Index: modules/in-commerce/admin_templates/affiliate_plans/affiliates_edit.tpl
===================================================================
--- modules/in-commerce/admin_templates/affiliate_plans/affiliates_edit.tpl
+++ modules/in-commerce/admin_templates/affiliate_plans/affiliates_edit.tpl
@@ -70,7 +70,6 @@
<inp2:m_RenderElement name="inp_edit_user" prefix="affil" field="PortalUserId" title="la_fld_Username"/>
<inp2:m_RenderElement name="inp_edit_options" prefix="affil" field="AffiliatePlanId" title="la_fld_AffiliatePlan"/>
<inp2:m_RenderElement name="inp_edit_options" prefix="affil" field="PaymentTypeId" title="la_fld_PaymentType"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="affil" field="SSN" title="la_fld_SSN" />
<inp2:m_RenderElement name="inp_edit_radio" prefix="affil" field="Status" title="la_fld_Status"/>
<inp2:m_RenderElement name="inp_edit_date" prefix="affil" field="CreatedOn" title="la_fld_RegisteredOn" />
<inp2:m_RenderElement name="inp_edit_textarea" prefix="affil" field="Comments" title="la_fld_Comments" cols="40" rows="5"/>
@@ -99,4 +98,4 @@
</table>
</div>
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: modules/in-commerce/install/english.lang
===================================================================
--- modules/in-commerce/install/english.lang
+++ modules/in-commerce/install/english.lang
@@ -366,7 +366,6 @@
<PHRASE Label="la_fld_ShipZoneName" Module="In-Commerce" Type="1" Column="U2hpcHBpbmcgWm9uZSBOYW1l">U2hpcHBpbmcgWm9uZSBOYW1l</PHRASE>
<PHRASE Label="la_fld_SKU" Module="In-Commerce" Type="1" Column="U0tV">U0tV</PHRASE>
<PHRASE Label="la_fld_SpeedCode" Module="In-Commerce" Type="1" Column="U2hpcHBpbmcgU3BlZWQ=">U3BlZWQgQ29kZQ==</PHRASE>
- <PHRASE Label="la_fld_SSN" Module="In-Commerce" Type="1">U1NOL1RheCBJZC9WQVQgTnVtYmVy</PHRASE>
<PHRASE Label="la_fld_Start" Module="In-Commerce" Type="1" Column="U3RhcnQ=">U3RhcnQgRGF0ZQ==</PHRASE>
<PHRASE Label="la_fld_SubTotal" Module="In-Commerce" Type="1">U3VidG90YWw=</PHRASE>
<PHRASE Label="la_fld_TaxApplyToProcessing" Module="In-Commerce" Type="1" Column="QXBwbHkgdG8gUHJvY2Vzc2luZw==">QXBwbHkgdG8gUHJvY2Vzc2luZw==</PHRASE>
@@ -1045,4 +1044,4 @@
</EVENT>
</EVENTS>
</LANGUAGE>
-</LANGUAGES>
\ No newline at end of file
+</LANGUAGES>
Index: modules/in-commerce/install/install_schema.sql
===================================================================
--- modules/in-commerce/install/install_schema.sql
+++ modules/in-commerce/install/install_schema.sql
@@ -673,7 +673,6 @@
AffiliateCode varchar(30) NOT NULL DEFAULT '',
ItemsSold int(10) unsigned NOT NULL DEFAULT '0',
PaymentTypeId int(11) NOT NULL DEFAULT '0',
- SSN varchar(100) NOT NULL DEFAULT '',
Comments text,
CreatedOn int(11) DEFAULT NULL,
PRIMARY KEY (AffiliateId),
@@ -744,4 +743,4 @@
ADD INDEX (PrimaryCurrencyId),
ADD INDEX (Currencies),
ADD INDEX (PrimaryPaymentTypeId),
- ADD INDEX (PaymentTypes);
\ No newline at end of file
+ ADD INDEX (PaymentTypes);
Index: modules/in-commerce/install/upgrades.sql
===================================================================
--- modules/in-commerce/install/upgrades.sql
+++ modules/in-commerce/install/upgrades.sql
@@ -297,3 +297,5 @@
# ===== v 5.2.1 =====
# ===== v 5.3.0-B1 =====
+ALTER TABLE Affiliates DROP SSN;
+DELETE FROM LanguageLabels WHERE PhraseKey IN ('LA_FLD_SSN', 'LU_COMM_SSNFIELD', 'LU_FLD_SSNFIELD');
Index: modules/in-commerce/units/affiliates/affiliates_config.php
===================================================================
--- modules/in-commerce/units/affiliates/affiliates_config.php
+++ modules/in-commerce/units/affiliates/affiliates_config.php
@@ -207,7 +207,6 @@
'AffiliateCode' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
'ItemsSold' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
'PaymentTypeId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => ''), 'options_sql' => 'SELECT Name, PaymentTypeId FROM '.TABLE_PREFIX.'AffiliatePaymentTypes WHERE Status = 1 ORDER BY IsPrimary DESC, Priority DESC, Name ASC', 'option_key_field' => 'PaymentTypeId', 'option_title_field' => 'Name', 'not_null' => 1, 'default' => 0),
- 'SSN' => Array ('type' => 'string', 'not_null' => '1', 'default' => '', 'required' => 1),
'Comments' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
),
@@ -238,4 +237,4 @@
),
),
),
-);
\ No newline at end of file
+);
Index: themes/advanced/in-commerce/_install/english.lang
===================================================================
--- themes/advanced/in-commerce/_install/english.lang
+++ themes/advanced/in-commerce/_install/english.lang
@@ -308,7 +308,6 @@
<PHRASE Label="lu_comm_Size" Module="In-Commerce" Type="0">U2l6ZQ==</PHRASE>
<PHRASE Label="lu_comm_Sort" Module="In-Commerce" Type="0">U29ydA==</PHRASE>
<PHRASE Label="lu_comm_SortBy" Module="In-Commerce" Type="0">U29ydCBieQ==</PHRASE>
- <PHRASE Label="lu_comm_SSNField" Module="In-Commerce" Type="0">U1NOL1RheCBJZC9WQVQgTnVtYmVy</PHRASE>
<PHRASE Label="lu_comm_Status" Module="In-Commerce" Type="0">U3RhdHVz</PHRASE>
<PHRASE Label="lu_comm_SubCategories" Module="In-Commerce" Type="0">U3ViLUNhdGVnb3JpZXM=</PHRASE>
<PHRASE Label="lu_comm_Subscribe" Module="In-Commerce" Type="0">U3Vic2NyaWJl</PHRASE>
@@ -394,7 +393,6 @@
<PHRASE Label="lu_fld_RegisterAsAffiliate" Module="In-Commerce" Type="0">QmVjb21lIGFuIEFmZmlsaWF0ZQ==</PHRASE>
<PHRASE Label="lu_fld_ReturnTotal" Module="In-Commerce" Type="0">UmV0dXJucw==</PHRASE>
<PHRASE Label="lu_fld_SKU" Module="In-Commerce" Type="0">U0tV</PHRASE>
- <PHRASE Label="lu_fld_SSNField" Module="In-Commerce" Type="0">U29jaWFsIFNlY3VyaXR5ICM=</PHRASE>
<PHRASE Label="lu_fld_YouSave" Module="In-Commerce" Type="0">WW91IFNhdmU=</PHRASE>
<PHRASE Label="lu_hint_OrEnterAddress" Module="In-Commerce" Type="0">b3IgZW50ZXIgbmV3IGFkZHJlc3M=</PHRASE>
<PHRASE Label="lu_hint_profileaddresswarning" Module="In-Commerce" Type="0">UHJvZmlsZSBhZGRyZXNz</PHRASE>
Index: themes/advanced/in-commerce/elements/registration_fields.elm.tpl
===================================================================
--- themes/advanced/in-commerce/elements/registration_fields.elm.tpl
+++ themes/advanced/in-commerce/elements/registration_fields.elm.tpl
@@ -28,7 +28,6 @@
<inp2:affil.register_FormName name="registration"/>
<inp2:affil.register_PresetFormFields/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="affil.register" field="SSN" title="lu_fld_SSNField"/>
<inp2:m_RenderElement name="inp_affiliate_payment_types" prefix="affil.register" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType"/>
<inp2:m_RenderElement name="inp_edit_textarea" prefix="affil.register" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5"/>
<inp2:m_RenderElement name="inp_affiliate_terms_checkbox" prefix="affil.register" field="TermsAccepted"/>
@@ -38,4 +37,4 @@
function toggle_affiliate() {
document.getElementById('events[u.register][OnRefreshForm]').click();
}
-</script>
\ No newline at end of file
+</script>
Index: themes/advanced/in-commerce/my_account/affiliate/affiliate.tpl
===================================================================
--- themes/advanced/in-commerce/my_account/affiliate/affiliate.tpl
+++ themes/advanced/in-commerce/my_account/affiliate/affiliate.tpl
@@ -105,7 +105,6 @@
<form method="post" action="<inp2:m_FormAction/>">
<table border="0" class="form-data fullwidth">
- <inp2:m_RenderElement name="inp_edit_box" prefix="affil.register" field="SSN" title="lu_fld_SSNField" style="width:155px"/>
<inp2:m_RenderElement name="inp_affiliate_payment_types" prefix="affil.register" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType" style="width:155px"/>
<inp2:m_RenderElement name="inp_edit_textarea" prefix="affil.register" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5" style="width:155px"/>
<inp2:m_RenderElement name="inp_affiliate_terms_checkbox" prefix="affil.register" field="TermsAccepted"/>
@@ -123,4 +122,4 @@
</inp2:m_DefineElement>
<!--## //MAIN CONTENT ##-->
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>

Event Timeline

In-Portal CMS · In-Portal Community Pages · In-Portal Issue Tracker · In-Portal Repository Browser · Quality Assurance · In-Portal CI Server