Tritac_Capayable - Version 2.3.2

Version Notes

* Minor improvements

Download this release

Release Info

Developer Capayable
Extension Tritac_Capayable
Version 2.3.2
Comparing to
See all releases


Code changes from version 2.3.1 to 2.3.2

Files changed (4) hide show
  1. app/code/community/Tritac/Capayable/etc/config.xml +1 -1
  2. app/design/frontend/base/default/template/capayable/form.phtml +60 -3
  3. app/locale/nl_NL/Tritac_Capayable.csv +42 -0
  4. package.xml +4 -4
app/code/community/Tritac/Capayable/etc/config.xml CHANGED
@@ -10,7 +10,7 @@
10
  <config>
11
  <modules>
12
  <Tritac_Capayable>
13
- <version>2.3.1</version>
14
  </Tritac_Capayable>
15
  </modules>
16
 
10
  <config>
11
  <modules>
12
  <Tritac_Capayable>
13
+ <version>2.3.2</version>
14
  </Tritac_Capayable>
15
  </modules>
16
 
app/design/frontend/base/default/template/capayable/form.phtml CHANGED
@@ -43,7 +43,7 @@
43
  }
44
  //if($_customer->getCustomerMiddlename() && $isLoggedIn)
45
  // $initials = $_customer->getCustomerMiddlename();
46
- $hasMageWorldOSC = Mage::helper('core')->isModuleEnabled('MW_Onestepcheckout') || true;
47
 
48
  $postcode = $billingAddress->getData("postcode");
49
  if($_customer->getPostalCode() && $isLoggedIn) {
@@ -55,6 +55,49 @@
55
  $city = $_customer->getCity();
56
  }
57
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
58
  ?>
59
  <ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none;">
60
 
@@ -168,13 +211,14 @@
168
  </div>
169
  </li>
170
 
 
171
  <?php if($hasMageWorldOSC): ?>
172
 
173
  <input type="hidden" id="<?php echo $_code?>_middlename" name="payment[customer_middlename]" class="input-text required-entry" value="<?php echo $initials; ?>" />
174
 
175
  <input type="hidden" id="<?php echo $_code?>_street" name="payment[street]" class="input-text required-entry" value="<?php if($_customer->getStreet(0) && $isLoggedIn) echo $_customer->getStreet(0)?>" />
176
- <input type="hidden" id="<?php echo $_code?>_house_number" name="payment[house_number]" class="validate-digits validate-greater-than-zero input-text required-entry" value="<?php if($_customer->getStreet(1) && $isLoggedIn) echo $_customer->getStreet(1)?>" />
177
- <input type="hidden" id="<?php echo $_code?>_house_suffix" name="payment[house_suffix]" class="input-text" value="<?php if($_customer->getHouseSuffix() && $isLoggedIn) echo $_customer->getHouseSuffix()?>" />
178
 
179
  <input type="hidden" id="<?php echo $_code?>_postcode" name="payment[postcode]" class="input-text required-entry" value="<?php echo $postcode; ?>" />
180
  <input type="hidden" id="<?php echo $_code?>_city" name="payment[city]" class="input-text required-entry" value="<?php echo $city; ?>" />
@@ -352,6 +396,19 @@
352
  });
353
  }
354
 
 
 
 
 
 
 
 
 
 
 
 
 
 
355
  if(capayableSelector == '#capayable_corporation_name') {
356
  $MW_Onestepcheckout('#capayable_is_corporation').val(val ? 1 : 0);
357
 
43
  }
44
  //if($_customer->getCustomerMiddlename() && $isLoggedIn)
45
  // $initials = $_customer->getCustomerMiddlename();
46
+ $hasMageWorldOSC = Mage::helper('core')->isModuleEnabled('MW_Onestepcheckout');
47
 
48
  $postcode = $billingAddress->getData("postcode");
49
  if($_customer->getPostalCode() && $isLoggedIn) {
55
  $city = $_customer->getCity();
56
  }
57
 
58
+ function splitHouseNo($houseNo)
59
+ {
60
+ $numberIndex = strspn($houseNo, "0123456789");
61
+ $result = array(
62
+ 'number' => substr($houseNo, 0, $numberIndex),
63
+ 'suffix' => substr($houseNo, $numberIndex)
64
+ );
65
+ return $result;
66
+ }
67
+
68
+ function getHouseSuffix()
69
+ {
70
+ if($isLoggedIn)
71
+ {
72
+ if($_customer->getHouseSuffix())
73
+ {
74
+ return $_customer->getHouseSuffix();
75
+ }
76
+ elseif($_customer->getStreet(1))
77
+ {
78
+ $result = splitHouseNo($_customer->getStreet(1));
79
+ return $result['suffix'];
80
+ }
81
+ }
82
+ return '';
83
+ }
84
+ function getHouseNumber()
85
+ {
86
+ if($isLoggedIn)
87
+ {
88
+ if($_customer->getHouseNumber())
89
+ {
90
+ return $_customer->getHouseNumber();
91
+ }
92
+ elseif($_customer->getStreet(1))
93
+ {
94
+ $result = splitHouseNo($_customer->getStreet(1));
95
+ return $result['number'];
96
+ }
97
+ }
98
+ return '';
99
+ }
100
+
101
  ?>
102
  <ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none;">
103
 
211
  </div>
212
  </li>
213
 
214
+
215
  <?php if($hasMageWorldOSC): ?>
216
 
217
  <input type="hidden" id="<?php echo $_code?>_middlename" name="payment[customer_middlename]" class="input-text required-entry" value="<?php echo $initials; ?>" />
218
 
219
  <input type="hidden" id="<?php echo $_code?>_street" name="payment[street]" class="input-text required-entry" value="<?php if($_customer->getStreet(0) && $isLoggedIn) echo $_customer->getStreet(0)?>" />
220
+ <input type="hidden" id="<?php echo $_code?>_house_number" name="payment[house_number]" class="validate-digits validate-greater-than-zero input-text required-entry" value="<?php echo getHouseNumber(); ?>" />
221
+ <input type="hidden" id="<?php echo $_code?>_house_suffix" name="payment[house_suffix]" class="input-text" value="<?php echo getHouseSuffix(); ?>" />
222
 
223
  <input type="hidden" id="<?php echo $_code?>_postcode" name="payment[postcode]" class="input-text required-entry" value="<?php echo $postcode; ?>" />
224
  <input type="hidden" id="<?php echo $_code?>_city" name="payment[city]" class="input-text required-entry" value="<?php echo $city; ?>" />
396
  });
397
  }
398
 
399
+ if(capayableSelector == '#capayable_house_number' && val) {
400
+
401
+ var matches = val.match(/[\d]+/);
402
+ if(matches && matches.length > 0){
403
+ var match = matches[0];
404
+ var index = match.length;
405
+ var suffix = str.substr(index);
406
+
407
+ $MW_Onestepcheckout('#capayable_house_suffix').val(suffix);
408
+ val = match;
409
+ }
410
+ }
411
+
412
  if(capayableSelector == '#capayable_corporation_name') {
413
  $MW_Onestepcheckout('#capayable_is_corporation').val(val ? 1 : 0);
414
 
app/locale/nl_NL/Tritac_Capayable.csv ADDED
@@ -0,0 +1,42 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ "The first name cannot be empty.","Voornaam is een vereist veld."
2
+ "The initials cannot be empty.","Initialen is een vereist veld."
3
+ "Invalid email address '%s'.","Het e-mailadres '%s' is ongeldig."
4
+ "Gender is required.","Geslacht is een vereist veld."
5
+ "The Date of Birth is requiredd.","Geboortedaturm is een vereist veld."
6
+ "The street is required.","Straat is een vereist veld."
7
+ "House number must be numeric.","Het huisnummer mag alleen getallen bevatten."
8
+ "The zip/postal is required.","Postcode is een vereist veld."
9
+ "The city is required.","Woonplaats is een vereist veld."
10
+ "The country is required.","Land is een vereist veld."
11
+ "The telephone number is required.","Telefoonnummer is een vereist veld."
12
+ "Cannot create an empty invoice.","Er kan geen factuur zonder orderregels worden aangemaakt."
13
+ "Failed to send the invoice.","Het verzenden van de factuur is mislukt."
14
+ "The amount due must be greater than 0.","Het te betalen bedrag moet groter zijn dan 0."
15
+ "Capayable refused the payment","Betaling geweigerd door Capayable"
16
+ "AMOUNT_EXCEEDS_LIMIT","Uw bestelling overschrijdt het maximumbedrag voor achteraf betalen."
17
+ "BALANCE_EXEEDS_LIMIT","Het totaal aan openstaande betalingen overschrijdt het maximumbedrag voor achteraf betalen."
18
+ "NOT_CREDITWORTHY","Uw krediet is niet toereikend."
19
+ "CREDITCHECK_UNAVAILABLE","Achteraf betalen is momenteel niet beschikbaar."
20
+ "NOT_FOUND","Bedrijf niet gevonden, controleer uw bedrijfsinformatie."
21
+ "For additional information contact %s on %s .","Voor aanvullende informatie kunt u contact opnemen met %s via %s ."
22
+ "Order", "Bestelling"
23
+ "Initials","Initialen"
24
+ "Date of Birth","Geboortedatum"
25
+ "Day","Dag"
26
+ "DD","DD"
27
+ "Month","Maand"
28
+ "MM","MM"
29
+ "Year","Jaar"
30
+ "YYYY","JJJJ"
31
+ "Gender","Geslacht"
32
+ "Street","Straatnaam",
33
+ "Postal Code","Postcode",
34
+ "City", "Woonplaats",
35
+ "House number","Huisnummer"
36
+ "House number suffix","Huisnummer toevoeging"
37
+ "Is Corporation","Bedrijf"
38
+ "Is Sole Proprietor","Eenmanszaak"
39
+ "No","Nee"
40
+ "Yes","Ja"
41
+ "Corporation Name","Bedrijfsnaam"
42
+ "Chamber of Commerce Number","KvK-nummer"
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Tritac_Capayable</name>
4
- <version>2.3.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
@@ -16,9 +16,9 @@ By fulfilling your customers desires you will realize a substatial gain in onlin
16
  Keep the risk of default to a minimum with Capayable. During the order process Capayable will assess the solvency of the customer. The result of this assessment will determine if the customer gets the option to pay after delivery. Moreover, the collection of the due payment is Capayable's risk. Customer service at checkout and your financial security go hand in hand.</description>
17
  <notes>* Minor improvements</notes>
18
  <authors><author><name>Capayable</name><user>capayable</user><email>capayable@tritac.com</email></author></authors>
19
- <date>2014-09-10</date>
20
- <time>12:22:17</time>
21
- <contents><target name="mageetc"><dir name="modules"><file name="Tritac_Capayable.xml" hash="7001b4ff4fb879a1186fcd5d2c8e66a9"/></dir></target><target name="magecommunity"><dir name="Tritac"><dir name="Capayable"><dir name="Block"><file name="Form.php" hash="6e7b2763ca0b75f0654d1abf3f8ad997"/><file name="Info.php" hash="a77b42b5730b33e46a3e9168d2080d3f"/></dir><dir name="Helper"><file name="Data.php" hash="a0804e5a3fd7b051530d202a19829ced"/></dir><dir name="Model"><file name="Customer.php" hash="562adc10291a0e835affbad196f3a8e7"/><file name="Observer.php" hash="bc1487f9a350ea681de64df7f69138a9"/><file name="Payment.php" hash="f64dd63d9024205610a13e6e74ddbae8"/><dir name="Resource"><dir name="Customer"><file name="Collection.php" hash="d3ada6e04cd45cf7722194707ab46b72"/></dir><file name="Customer.php" hash="3e56839b9b93adf24f711cfc6b08cbb1"/><file name="Setup.php" hash="1d6ad9d431cf9a945720ba82d2adf57f"/></dir></dir><dir name="controllers"><file name="AjaxController.php" hash="2bf8a0353625fa86d06ce5af8c2f8c1b"/></dir><dir name="etc"><file name="config.xml" hash="4a9e545373429b8b4fe0411f357ebf54"/><file name="system.xml" hash="5fd9ee783a0cb5a8c93d96973e6f46b4"/></dir><dir name="sql"><dir name="capayable_setup"><file name="install-1.0.0.php" hash="8e3ad890975e11649a0dc51970aba4ec"/></dir></dir></dir></dir></target><target name="magelib"><dir name="Tritac"><dir name="CapayableApiClient"><file name="AddTrustExternalCARoot.crt" hash="f85d1ff17b0079709f131f3ce3f288d2"/><file name="Client.php" hash="ac813fed45cb5bd4108b52f9cb1bac41"/><dir name="Enums"><file name="Enum.php" hash="25559e778c2d276f731b6a8b63827d03"/><file name="Environment.php" hash="1c138f029b693bde668e9a5c33b73e8a"/><file name="Gender.php" hash="ad079406a788728980d6142405675cfd"/><file name="HttpMethod.php" hash="f9dc6ddcdef8c7573c726642ef596163"/><file name="InvoiceCreditStatus.php" hash="785c735390476ed66e3c0e1a538d8e44"/><file name="InvoicePdfSubmitType.php" hash="596d1e64019a9177a05fa677407ad85a"/><file name="RefuseReason.php" hash="47ddf3a0f5cc3613099c401acabbe8f0"/></dir><dir name="Models"><file name="BaseModel.php" hash="0656176f09813a43eb27cb3a17001c55"/><file name="CreditCheckRequest.php" hash="30333356893937e860b79c7248810856"/><file name="CreditCheckResponse.php" hash="7886ac596afcca7a48ecfe0a104609be"/><file name="Invoice.php" hash="9f081793f2feec025d5dd478311875db"/><file name="InvoiceCreditRequest.php" hash="be0649d3b7584165ed12abe45452ab32"/><file name="InvoiceCreditResponse.php" hash="808df1a58451393d91fe358413b7eab4"/><file name="RegistrationCheckRequest.php" hash="c6d5e5eb633839a03e86f4fe4bcd3ce5"/><file name="RegistrationCheckResponse.php" hash="e65c5157a29403a0f916316823e7ee25"/></dir><file name="fiddler.crt" hash="b0dff65ab013256030658fee29ce0919"/><file name="loader.php" hash="5a7f334b15555740f45c3d54cf826bc3"/></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="capayable"><file name="form.phtml" hash="ad3f5202c707daee216bdfb0c019a057"/><file name="info.phtml" hash="fabb3f3bfe1d75424d7e5af1659bf2f1"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="."><file name="Tritac_Capayable.csv" hash=""/></dir></target></contents>
22
  <compatible/>
23
  <dependencies><required><php><min>5.2.13</min><max>6.0.0</max></php></required></dependencies>
24
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Tritac_Capayable</name>
4
+ <version>2.3.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
16
  Keep the risk of default to a minimum with Capayable. During the order process Capayable will assess the solvency of the customer. The result of this assessment will determine if the customer gets the option to pay after delivery. Moreover, the collection of the due payment is Capayable's risk. Customer service at checkout and your financial security go hand in hand.</description>
17
  <notes>* Minor improvements</notes>
18
  <authors><author><name>Capayable</name><user>capayable</user><email>capayable@tritac.com</email></author></authors>
19
+ <date>2014-09-23</date>
20
+ <time>12:32:00</time>
21
+ <contents><target name="mageetc"><dir name="modules"><file name="Tritac_Capayable.xml" hash="7001b4ff4fb879a1186fcd5d2c8e66a9"/></dir></target><target name="magecommunity"><dir name="Tritac"><dir name="Capayable"><dir name="Block"><file name="Form.php" hash="6e7b2763ca0b75f0654d1abf3f8ad997"/><file name="Info.php" hash="a77b42b5730b33e46a3e9168d2080d3f"/></dir><dir name="Helper"><file name="Data.php" hash="a0804e5a3fd7b051530d202a19829ced"/></dir><dir name="Model"><file name="Customer.php" hash="562adc10291a0e835affbad196f3a8e7"/><file name="Observer.php" hash="bc1487f9a350ea681de64df7f69138a9"/><file name="Payment.php" hash="f64dd63d9024205610a13e6e74ddbae8"/><dir name="Resource"><dir name="Customer"><file name="Collection.php" hash="d3ada6e04cd45cf7722194707ab46b72"/></dir><file name="Customer.php" hash="3e56839b9b93adf24f711cfc6b08cbb1"/><file name="Setup.php" hash="1d6ad9d431cf9a945720ba82d2adf57f"/></dir></dir><dir name="controllers"><file name="AjaxController.php" hash="2bf8a0353625fa86d06ce5af8c2f8c1b"/></dir><dir name="etc"><file name="config.xml" hash="a77ab702957de083bd05bc7249d7dfd6"/><file name="system.xml" hash="5fd9ee783a0cb5a8c93d96973e6f46b4"/></dir><dir name="sql"><dir name="capayable_setup"><file name="install-1.0.0.php" hash="8e3ad890975e11649a0dc51970aba4ec"/></dir></dir></dir></dir></target><target name="magelib"><dir name="Tritac"><dir name="CapayableApiClient"><file name="AddTrustExternalCARoot.crt" hash="f85d1ff17b0079709f131f3ce3f288d2"/><file name="Client.php" hash="ac813fed45cb5bd4108b52f9cb1bac41"/><dir name="Enums"><file name="Enum.php" hash="25559e778c2d276f731b6a8b63827d03"/><file name="Environment.php" hash="1c138f029b693bde668e9a5c33b73e8a"/><file name="Gender.php" hash="ad079406a788728980d6142405675cfd"/><file name="HttpMethod.php" hash="f9dc6ddcdef8c7573c726642ef596163"/><file name="InvoiceCreditStatus.php" hash="785c735390476ed66e3c0e1a538d8e44"/><file name="InvoicePdfSubmitType.php" hash="596d1e64019a9177a05fa677407ad85a"/><file name="RefuseReason.php" hash="47ddf3a0f5cc3613099c401acabbe8f0"/></dir><dir name="Models"><file name="BaseModel.php" hash="0656176f09813a43eb27cb3a17001c55"/><file name="CreditCheckRequest.php" hash="30333356893937e860b79c7248810856"/><file name="CreditCheckResponse.php" hash="7886ac596afcca7a48ecfe0a104609be"/><file name="Invoice.php" hash="9f081793f2feec025d5dd478311875db"/><file name="InvoiceCreditRequest.php" hash="be0649d3b7584165ed12abe45452ab32"/><file name="InvoiceCreditResponse.php" hash="808df1a58451393d91fe358413b7eab4"/><file name="RegistrationCheckRequest.php" hash="c6d5e5eb633839a03e86f4fe4bcd3ce5"/><file name="RegistrationCheckResponse.php" hash="e65c5157a29403a0f916316823e7ee25"/></dir><file name="fiddler.crt" hash="b0dff65ab013256030658fee29ce0919"/><file name="loader.php" hash="5a7f334b15555740f45c3d54cf826bc3"/></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="capayable"><file name="form.phtml" hash="e85122dbb0262d77d76428a8e4b4ed02"/><file name="info.phtml" hash="fabb3f3bfe1d75424d7e5af1659bf2f1"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="nl_NL"><file name="Tritac_Capayable.csv" hash="1c6c5cba166528dbdd85909f32bb1d9f"/></dir></dir></target></contents>
22
  <compatible/>
23
  <dependencies><required><php><min>5.2.13</min><max>6.0.0</max></php></required></dependencies>
24
  </package>