FlexShopper_Payment - Version 0.2.3

Version Notes

- Add more compatible dimensions for the widget.

Download this release

Release Info

Developer FlexShopper
Extension FlexShopper_Payment
Version 0.2.3
Comparing to
See all releases


Code changes from version 0.2.2 to 0.2.3

Files changed (4) hide show
  1. app/code/community/FlexShopper/Payment/etc/config.xml +6 -6
  2. app/design/frontend/base/default/template/flexshopper/.widget.phtml.swp +0 -0
  3. app/design/frontend/base/default/template/flexshopper/widget.phtml +45 -9
  4. package.xml +5 -5
app/code/community/FlexShopper/Payment/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <FlexShopper_Payment>
5
- <version>0.2.1</version>
6
  </FlexShopper_Payment>
7
  </modules>
8
  <global>
@@ -58,7 +58,7 @@
58
  <class>FlexShopper_Payment_Model_Observer</class>
59
  <method>refundOrder</method>
60
  </flex_payment_refund>
61
- </observers>
62
  </sales_order_creditmemo_refund>
63
  <sales_model_service_quote_submit_before>
64
  <observers>
@@ -67,7 +67,7 @@
67
  <class>FlexShopper_Payment_Model_Observer</class>
68
  <method>checkLimit</method>
69
  </flex_payment_limit>
70
- </observers>
71
  </sales_model_service_quote_submit_before>
72
  <order_cancel_after>
73
  <observers>
@@ -76,7 +76,7 @@
76
  <class>FlexShopper_Payment_Model_Observer</class>
77
  <method>cancelTransaction</method>
78
  </flex_transaction_cancel>
79
- </observers>
80
  </order_cancel_after>
81
  <payment_method_is_active>
82
  <observers>
@@ -85,7 +85,7 @@
85
  <class>FlexShopper_Payment_Model_Observer</class>
86
  <method>isFlexshopperActive</method>
87
  </flex_check_if_active>
88
- </observers>
89
  </payment_method_is_active>
90
  </events>
91
  </global>
@@ -135,4 +135,4 @@
135
  </flexpayment>
136
  </jobs>
137
  </crontab>
138
- </config>
2
  <config>
3
  <modules>
4
  <FlexShopper_Payment>
5
+ <version>0.2.3</version>
6
  </FlexShopper_Payment>
7
  </modules>
8
  <global>
58
  <class>FlexShopper_Payment_Model_Observer</class>
59
  <method>refundOrder</method>
60
  </flex_payment_refund>
61
+ </observers>
62
  </sales_order_creditmemo_refund>
63
  <sales_model_service_quote_submit_before>
64
  <observers>
67
  <class>FlexShopper_Payment_Model_Observer</class>
68
  <method>checkLimit</method>
69
  </flex_payment_limit>
70
+ </observers>
71
  </sales_model_service_quote_submit_before>
72
  <order_cancel_after>
73
  <observers>
76
  <class>FlexShopper_Payment_Model_Observer</class>
77
  <method>cancelTransaction</method>
78
  </flex_transaction_cancel>
79
+ </observers>
80
  </order_cancel_after>
81
  <payment_method_is_active>
82
  <observers>
85
  <class>FlexShopper_Payment_Model_Observer</class>
86
  <method>isFlexshopperActive</method>
87
  </flex_check_if_active>
88
+ </observers>
89
  </payment_method_is_active>
90
  </events>
91
  </global>
135
  </flexpayment>
136
  </jobs>
137
  </crontab>
138
+ </config>
app/design/frontend/base/default/template/flexshopper/.widget.phtml.swp DELETED
Binary file
app/design/frontend/base/default/template/flexshopper/widget.phtml CHANGED
@@ -1,9 +1,45 @@
1
- <?php
2
  if($this->showWidget()){
 
 
 
 
 
3
  ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
4
  <script type="text/javascript">
5
- <?php
6
- $product = $this->getProduct();
 
 
7
  $type = $product->getTypeId();
8
 
9
  if($type != 'downloadable' && $type != 'virtual'){
@@ -12,18 +48,18 @@ if($this->showWidget()){
12
  jQuery.noConflict();
13
  var the_element_to_use = '';
14
  var _flex = _flex || {};
15
- var the_element_to_use = "#product-price-<?php echo $product->getId(); ?>";
16
- var elementExists = document.getElementById("product-price-<?php echo $product->getId(); ?>"); //" .price";
17
  if(elementExists != null){
18
  var child_exists = elementExists.getElementsByTagName("span").length;
19
  if(child_exists > 0){
20
- var the_element_to_use = "#product-price-<?php echo $product->getId(); ?> .price";
21
  }
22
  }
23
  console.log(the_element_to_use);
24
  _flex.priceSelector = the_element_to_use;
25
- <?php
26
- } else {
27
  // $associated = $product->getTypeInstance(true)->getAssociatedProducts($product);
28
  // foreach ($associated as $product_associated) {
29
  ?>
@@ -50,4 +86,4 @@ if($this->showWidget()){
50
  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(fx, s);
51
  })();
52
  </script>
53
- <?php } ?>
1
+ <?php
2
  if($this->showWidget()){
3
+ $product = $this->getProduct();
4
+ $type = $product->getTypeId();
5
+
6
+ if($type != 'downloadable' && $type != 'virtual'){
7
+ if($type != 'grouped'){
8
  ?>
9
+ <script type="text/javascript" src="http://cdn.flexprice.com/flexprice.js"></script>
10
+ <script type="application/javascript">
11
+ var elementExists = document.getElementsByClassName("special-price"); //" .price";
12
+ if(elementExists.length > 0 ){
13
+ var elementToUse = '.special-price .price';
14
+ } else {
15
+ var elementToUse = '.price'
16
+ }
17
+
18
+ var _FP = new _FlexPrice({
19
+ productSelector: '.product-view',
20
+ priceSelector: elementToUse,
21
+ size: 'SM'
22
+ });
23
+ </script>
24
+ <style>
25
+ .fs-wkly-price {
26
+ clear: both;
27
+ height: 37px !important;
28
+ width: 165px !important;
29
+ }
30
+ </style>
31
+ <?php
32
+ }
33
+ }
34
+ }
35
+ ?>
36
+
37
+ <?php /* ?>
38
  <script type="text/javascript">
39
+ <?php
40
+ */
41
+ /*
42
+ $product = $this->getProduct();
43
  $type = $product->getTypeId();
44
 
45
  if($type != 'downloadable' && $type != 'virtual'){
48
  jQuery.noConflict();
49
  var the_element_to_use = '';
50
  var _flex = _flex || {};
51
+ var the_element_to_use = "#product-price-<?php// echo $product->getId(); ?>";
52
+ var elementExists = document.getElementById("product-price-<?php //echo $product->getId(); ?>"); //" .price";
53
  if(elementExists != null){
54
  var child_exists = elementExists.getElementsByTagName("span").length;
55
  if(child_exists > 0){
56
+ var the_element_to_use = "#product-price-<?php //echo $product->getId(); ?> .price";
57
  }
58
  }
59
  console.log(the_element_to_use);
60
  _flex.priceSelector = the_element_to_use;
61
+ <?php
62
+ //} else {
63
  // $associated = $product->getTypeInstance(true)->getAssociatedProducts($product);
64
  // foreach ($associated as $product_associated) {
65
  ?>
86
  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(fx, s);
87
  })();
88
  </script>
89
+ <?php } */ ?>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>FlexShopper_Payment</name>
4
- <version>0.2.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.gnu.org/licenses/gpl.html">GPLv3</license>
7
  <channel>community</channel>
@@ -16,12 +16,12 @@ With the extension admins have access to all standard order management actions l
16
  FlexShopper Payment Gateway requires some additional information about the goods sold by a merchant. The information includes Manufacturer or Brand product attribute to be passed to the gateway. For that to work flawlessly the extension has a setting where merchant can assign attributes to be used to retrieve Manufacturer/Brand information for each product.&#xD;
17
  &#xD;
18
  In case when a merchant doesn&#x2019;t use any Manufacturer/Brand attribute in his product catalog, he has an option to enter a default Manufacturer/Brand value to be used with a product that doesn&#x2019;t have that information.</description>
19
- <notes>- Payment response messages to comments&#xD;
20
  </notes>
21
  <authors><author><name>FlexShopper</name><user>flexshopper</user><email>support@flexshopper.com</email></author></authors>
22
- <date>2015-05-22</date>
23
- <time>07:15:21</time>
24
- <contents><target name="magecommunity"><dir name="FlexShopper"><dir name="Payment"><dir name="Block"><file name="Form.php" hash="610fe24c23a134fce859d8be0e4f3c97"/><file name="Widget.php" hash="513bc06d4c43befef1f97c89d5abaa11"/></dir><dir name="Helper"><file name="Api.php" hash="ef258ee98904c6bcb519fa8d89c1351b"/><file name="Data.php" hash="5d359150762bcf5c201ff75c9f47c15e"/><file name="Jwt.php" hash="754c2a63c6bec6438662b04d0ea9a017"/><file name="Version.php" hash="dae75d7c918a67790c4581c39c329612"/></dir><dir name="Model"><file name="Api.php" hash="21d574b0252267bf8ea9037bd37994be"/><file name="Method.php" hash="fad53714669da8cec6c0a7c7f53960f7"/><file name="Observer.php" hash="e2e133490f836e023318269555666f2c"/><dir name="Source"><file name="Attribute.php" hash="38e3c2ce7c723a0a6e876ee9e4e9ac17"/></dir></dir><dir name="controllers"><file name="IndexController.php" hash="4adedc5abf199f11818f3eb1a2f0dff5"/><file name="PaymentController.php" hash="ef661a0a8752fb3af1c6bea7b70824f8"/></dir><dir name="etc"><file name="config.xml" hash="e60d553c017cd7385a168b7d6c4a1ee3"/><file name="system.xml" hash="87c68e0a09141543d1a18d2c83a4f036"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="FlexShopper_Payment.xml" hash="7fab7994a8c83b41163f442d3247f503"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="flexshopper"><file name="payment.xml" hash="7d18d7ec0a6df9d308951f224d9bc228"/></dir></dir><dir name="template"><dir name="flexshopper"><dir name="payment"><file name="form.phtml" hash="c0de7d37bbbae2b9039bbefc831c7b32"/><file name="layout.phtml" hash="509893c584213ad7d78e17a1a53249d1"/><file name="logo.phtml" hash="7b9c24fa27eba07eaa357b76be3659a7"/><file name="redirect.phtml" hash="bd062ef48c65def1e385fb8b457f5b2f"/><file name="response.phtml" hash="92e18b6456f8e6ed132f8977bb60746a"/><file name="responsefail.phtml" hash="cd67cb5c6cdc22a835787042bd589d3c"/></dir><file name="widget.phtml" hash="8d4e8948df25a727b01cd05f08445206"/><file name=".widget.phtml.swp" hash="af45cce93f8f796a782e66e9c6dfe6c9"/></dir></dir></dir></dir></dir></target></contents>
25
  <compatible/>
26
  <dependencies><required><php><min>5.4.0</min><max>6.0.0</max></php></required></dependencies>
27
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>FlexShopper_Payment</name>
4
+ <version>0.2.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.gnu.org/licenses/gpl.html">GPLv3</license>
7
  <channel>community</channel>
16
  FlexShopper Payment Gateway requires some additional information about the goods sold by a merchant. The information includes Manufacturer or Brand product attribute to be passed to the gateway. For that to work flawlessly the extension has a setting where merchant can assign attributes to be used to retrieve Manufacturer/Brand information for each product.&#xD;
17
  &#xD;
18
  In case when a merchant doesn&#x2019;t use any Manufacturer/Brand attribute in his product catalog, he has an option to enter a default Manufacturer/Brand value to be used with a product that doesn&#x2019;t have that information.</description>
19
+ <notes>- Add more compatible dimensions for the widget. &#xD;
20
  </notes>
21
  <authors><author><name>FlexShopper</name><user>flexshopper</user><email>support@flexshopper.com</email></author></authors>
22
+ <date>2015-07-06</date>
23
+ <time>08:10:45</time>
24
+ <contents><target name="magecommunity"><dir name="FlexShopper"><dir name="Payment"><dir name="Block"><file name="Form.php" hash="610fe24c23a134fce859d8be0e4f3c97"/><file name="Widget.php" hash="513bc06d4c43befef1f97c89d5abaa11"/></dir><dir name="Helper"><file name="Api.php" hash="ef258ee98904c6bcb519fa8d89c1351b"/><file name="Data.php" hash="5d359150762bcf5c201ff75c9f47c15e"/><file name="Jwt.php" hash="754c2a63c6bec6438662b04d0ea9a017"/><file name="Version.php" hash="dae75d7c918a67790c4581c39c329612"/></dir><dir name="Model"><file name="Api.php" hash="21d574b0252267bf8ea9037bd37994be"/><file name="Method.php" hash="fad53714669da8cec6c0a7c7f53960f7"/><file name="Observer.php" hash="e2e133490f836e023318269555666f2c"/><dir name="Source"><file name="Attribute.php" hash="38e3c2ce7c723a0a6e876ee9e4e9ac17"/></dir></dir><dir name="controllers"><file name="IndexController.php" hash="4adedc5abf199f11818f3eb1a2f0dff5"/><file name="PaymentController.php" hash="ef661a0a8752fb3af1c6bea7b70824f8"/></dir><dir name="etc"><file name="config.xml" hash="8ec2adc47a052673a7fc01a5270209a4"/><file name="system.xml" hash="87c68e0a09141543d1a18d2c83a4f036"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="FlexShopper_Payment.xml" hash="7fab7994a8c83b41163f442d3247f503"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="flexshopper"><file name="payment.xml" hash="7d18d7ec0a6df9d308951f224d9bc228"/></dir></dir><dir name="template"><dir name="flexshopper"><dir name="payment"><file name="form.phtml" hash="c0de7d37bbbae2b9039bbefc831c7b32"/><file name="layout.phtml" hash="509893c584213ad7d78e17a1a53249d1"/><file name="logo.phtml" hash="7b9c24fa27eba07eaa357b76be3659a7"/><file name="redirect.phtml" hash="bd062ef48c65def1e385fb8b457f5b2f"/><file name="response.phtml" hash="92e18b6456f8e6ed132f8977bb60746a"/><file name="responsefail.phtml" hash="cd67cb5c6cdc22a835787042bd589d3c"/></dir><file name="widget.phtml" hash="1853df3a2239b7b84d2dfb6ec79fedd0"/></dir></dir></dir></dir></dir></target></contents>
25
  <compatible/>
26
  <dependencies><required><php><min>5.4.0</min><max>6.0.0</max></php></required></dependencies>
27
  </package>