nypwidget - Version 2.1.4

Version Notes

Bug Fix:
- Resolves some order writing issues.

Download this release

Release Info

Developer PriceWaiter
Extension nypwidget
Version 2.1.4
Comparing to
See all releases


Code changes from version 2.1.3 to 2.1.4

Files changed (5) hide show
  1. app/code/community/PriceWaiter/NYPWidget/Helper/Data.php +6 -10
  2. app/code/community/PriceWaiter/NYPWidget/Model/Callback.php +9 -7
  3. app/code/community/PriceWaiter/NYPWidget/etc/config.xml +1 -1
  4. app/design/frontend/base/default/template/pricewaiter/widget.phtml +8 -0
  5. package.xml +7 -7
app/code/community/PriceWaiter/NYPWidget/Helper/Data.php CHANGED
@@ -17,10 +17,6 @@
17
  *
18
  */
19
 
20
- if (is_file(dirname(__FILE__).'/../../pwconfig.local.php')) {
21
- include dirname(__FILE__).'/../../pwconfig.local.php';
22
- }
23
-
24
  class PriceWaiter_NYPWidget_Helper_Data extends Mage_Core_Helper_Abstract
25
  {
26
  private $_product = false;
@@ -34,16 +30,16 @@ class PriceWaiter_NYPWidget_Helper_Data extends Mage_Core_Helper_Abstract
34
 
35
  public function __construct()
36
  {
37
- if (!!defined('_PW_WIDGET_URL_')) {
38
- $this->_widgetUrl = _PW_WIDGET_URL_;
39
  }
40
 
41
- if (!!defined('_PW_MANAGE_URL_')) {
42
- $this->_manageUrl = _PW_MANAGE_URL_;
43
  }
44
 
45
- if (!!defined('_PW_API_URL_')) {
46
- $this->_apiUrl = _PW_API_URL_;
47
  }
48
  }
49
 
17
  *
18
  */
19
 
 
 
 
 
20
  class PriceWaiter_NYPWidget_Helper_Data extends Mage_Core_Helper_Abstract
21
  {
22
  private $_product = false;
30
 
31
  public function __construct()
32
  {
33
+ if (!!getenv('PRICEWAITER_WIDGET_URL')) {
34
+ $this->_widgetUrl = getenv('PRICEWAITER_WIDGET_URL');
35
  }
36
 
37
+ if (!!getenv('PRICEWAITER_MANAGE_URL')) {
38
+ $this->_manageUrl = getenv('PRICEWAITER_MANAGE_URL');
39
  }
40
 
41
+ if (!!getenv('PRICEWAITER_API_URL')) {
42
+ $this->_apiUrl = getenv('PRICEWAITER_API_URL');
43
  }
44
  }
45
 
app/code/community/PriceWaiter/NYPWidget/Model/Callback.php CHANGED
@@ -275,6 +275,15 @@ class PriceWaiter_NYPWidget_Model_Callback
275
  $transaction->addCommitCallback(array($order, 'place'));
276
  $transaction->addCommitCallback(array($order, 'save'));
277
  $transaction->save();
 
 
 
 
 
 
 
 
 
278
  if (Mage::getStoreConfig('pricewaiter/customer_interaction/send_new_order_email')) {
279
  $order->sendNewOrderEmail();
280
  }
@@ -296,13 +305,6 @@ class PriceWaiter_NYPWidget_Model_Callback
296
  ->loadByIncrementId($invoiceId);
297
  $invoice->capture()->save();
298
 
299
- // Add this order to the list of received callback orders
300
- $pricewaiterOrder->setData(array(
301
- 'store_id' => $order->getStoreId(),
302
- 'pricewaiter_id' => $request['pricewaiter_id'],
303
- 'order_id' => $order->getId()
304
- ));
305
- $pricewaiterOrder->save();
306
 
307
  Mage::log("The Name Your Price Widget has created order #"
308
  . $order->getIncrementId() . " with order ID " . $order->getId());
275
  $transaction->addCommitCallback(array($order, 'place'));
276
  $transaction->addCommitCallback(array($order, 'save'));
277
  $transaction->save();
278
+
279
+ // Add this order to the list of received callback orders
280
+ $pricewaiterOrder->setData(array(
281
+ 'store_id' => $order->getStoreId(),
282
+ 'pricewaiter_id' => $request['pricewaiter_id'],
283
+ 'order_id' => $order->getId()
284
+ ));
285
+ $pricewaiterOrder->save();
286
+
287
  if (Mage::getStoreConfig('pricewaiter/customer_interaction/send_new_order_email')) {
288
  $order->sendNewOrderEmail();
289
  }
305
  ->loadByIncrementId($invoiceId);
306
  $invoice->capture()->save();
307
 
 
 
 
 
 
 
 
308
 
309
  Mage::log("The Name Your Price Widget has created order #"
310
  . $order->getIncrementId() . " with order ID " . $order->getId());
app/code/community/PriceWaiter/NYPWidget/etc/config.xml CHANGED
@@ -18,7 +18,7 @@
18
 
19
  <modules>
20
  <PriceWaiter_NYPWidget>
21
- <version>2.1.1</version>
22
  </PriceWaiter_NYPWidget>
23
  </modules>
24
 
18
 
19
  <modules>
20
  <PriceWaiter_NYPWidget>
21
+ <version>2.1.4</version>
22
  </PriceWaiter_NYPWidget>
23
  </modules>
24
 
app/design/frontend/base/default/template/pricewaiter/widget.phtml CHANGED
@@ -22,6 +22,10 @@
22
  $customCss = Mage::getStoreConfig('pricewaiter/appearance/display_custom_css');
23
  $helper = $this->_getHelper();
24
 
 
 
 
 
25
  $brand = $_product->getData('brand');
26
  $image = $_product->getImageUrl();
27
  $currency = Mage::app()->getStore()->getCurrentCurrencyCode();
@@ -58,6 +62,10 @@
58
  <?php if ($image != ''): ?>
59
  image: <?php echo json_encode($image); ?>
60
  <?php endif; ?>
 
 
 
 
61
  }
62
  };
63
 
22
  $customCss = Mage::getStoreConfig('pricewaiter/appearance/display_custom_css');
23
  $helper = $this->_getHelper();
24
 
25
+ $magentoVersion = Mage::getVersion();
26
+ $extensionVersion = Mage::getConfig()->getNode()->modules->PriceWaiter_NYPWidget->version;
27
+
28
+
29
  $brand = $_product->getData('brand');
30
  $image = $_product->getImageUrl();
31
  $currency = Mage::app()->getStore()->getCurrentCurrencyCode();
62
  <?php if ($image != ''): ?>
63
  image: <?php echo json_encode($image); ?>
64
  <?php endif; ?>
65
+ },
66
+ metadata: {
67
+ _magento_version: "<?php echo $magentoVersion; ?>",
68
+ _magento_extention_version: "<?php echo $extensionVersion; ?>"
69
  }
70
  };
71
 
package.xml CHANGED
@@ -1,14 +1,14 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>nypwidget</name>
4
- <version>2.1.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
- <summary>PriceWaiter&#xAE; let's buyers make offers on your products that you can easily accept, counter offer or reject.</summary>
10
- <description>Sell more, immediately, with the PriceWaiter&#xAE; widget. Convert comparison shoppers you might have lost, increase sales and conversions, and stop "minimum advertised price" from preventing sales before they even start.&#xD;&#xD; PriceWaiter&#xAE; lets customers make offers on products you sell-- offers you can accept, reject or counter. The widget embeds a simple Name Your Price button on any product page or category that you choose. Simply install the extension and you'll have full control over PriceWaiter&#xAE; in your Magento admin control panel.</description>
11
- <notes>Bug Fix:&#xD;- Resolved issue that caused Billing Address to be duplicate of Shipping Address.</notes>
12
  <authors>
13
  <author>
14
  <name>PriceWaiter</name>
@@ -16,9 +16,9 @@
16
  <email>extensions@pricewaiter.com</email>
17
  </author>
18
  </authors>
19
- <date>2015-11-11</date>
20
- <time>18:57:12</time>
21
- <contents><target name="mageweb"><dir name="app"><dir name="etc"><dir name="modules"><file name="PriceWaiter_NYPWidget.xml" hash="72be18d9a8a741abc8926866449619cd"/></dir></dir><dir name="code"><dir name="community"><dir name="PriceWaiter"><dir name="NYPWidget"><dir name="Block"><dir name="Adminhtml"><file name="Link.php" hash="848a4e3813a3d238cacdd812334bb780"/><file name="Signup.php" hash="35a2739246307b5c7a3b69780a7f31fd"/><file name="Widget.php" hash="b781daf1de34d7856de7faba65afe414"/></dir><file name="Category.php" hash="de6397a45d7deabc803bef83a83d6b9a"/><file name="Widget.php" hash="193d694c4acc2133d8402f1e59d4dc25"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="PricewaiterController.php" hash="27e17f05c8e2b2edcc28230185334f35"/></dir><file name="CallbackController.php" hash="4c45b3d73999c3e69a11538b99b3b3fd"/><file name="ProductinfoController.php" hash="62780d33252c907cd48f9ff3326b3e8b"/></dir><dir name="etc"><file name="adminhtml.xml" hash="dff2f6de0dacaf5a933048fa4a347f2f"/><file name="config.xml" hash="739770ab608f83b7625f8059f3050957"/><file name="system.xml" hash="82bb83cf7eb6a1d0ebf6bb774cd24414"/></dir><dir name="Helper"><file name="Data.php" hash="0e66b1bc250f25d4e3000446f7786d32"/></dir><dir name="Model"><file name="Callback.php" hash="60f99a9adf00f0615288d215c809ade1"/><file name="Category.php" hash="884685769be745cb273833ab7d691593"/><file name="Observer.php" hash="2399e210dd82633091570483f144bf12"/><file name="Order.php" hash="080844dcc4cf55d516abe27175a3a62a"/><file name="PaymentMethod.php" hash="386134e1ac803580222263523f0ced31"/><dir name="Carrier"><file name="ShippingMethod.php" hash="43a6ec1ad462797a5359238dcf9a749d"/></dir><dir name="Display"><file name="Phrase.php" hash="5b595a42b487930154c505a8e9a1301c"/><file name="Size.php" hash="8a596164268f48c3c034274550b13b96"/></dir><dir name="Mysql4"><dir name="Category"><file name="Collection.php" hash="45eaa532cd5935b69102b8969da848fa"/></dir><file name="Category.php" hash="f4e761813ec4bb81d919f30895ce3578"/><file name="Order.php" hash="c08b340cec16bf774a7c178726dee0ac"/><dir name="Order"><file name="Collection.php" hash="4dc5b344274c0e5a391a24864fd1c003"/></dir></dir><dir name="Resource"><dir name="Eav"><dir name="Mysql4"><file name="Setup.php" hash="d63678e9cc718ee87e8db3ca5163a8fd"/></dir></dir></dir></dir><dir name="sql"><dir name="nypwidget_setup"><file name="mysql4-install-1.0.0.php" hash="cd1b7892e75e4452ee94afbbefb4de6e"/><file name="mysql4-upgrade-1.1.2-1.1.3.php" hash="d1ae05f5cbe4a8f833e92b9f49d395db"/><file name="mysql4-upgrade-1.1.7-1.1.8.php" hash="bd342c802f6c91de6f9f51b0a4a25414"/><file name="mysql4-upgrade-1.2.4-1.2.5.php" hash="b1ced0226bef6e950e026402b933872f"/><file name="mysql4-upgrade-1.3.0-1.3.1.php" hash="106b36065c125be31fc67424d80acdd4"/></dir></dir></dir></dir></dir></dir><dir name="design"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="pricewaiter.xml" hash="9e06026a8a820224336de4c9a7dde3fd"/></dir><dir name="template"><dir name="pricewaiter"><file name="categorytab.phtml" hash="d1d2c333cc9b18c909a44d333d8ab077"/><file name="signup.phtml" hash="fc18c669c18c55cccdf2c66c96199dec"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="pricewaiter.xml" hash="ab65e8c99c560997d403a780295a47da"/></dir><dir name="template"><dir name="pricewaiter"><file name="widget.phtml" hash="2275ce7d629b604a08c73f3b7d53bdae"/></dir></dir></dir></dir></dir></dir></dir><dir name="skin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><file name="pricewaiter_logo.png" hash="becb9713a561131ff69eabb7503d3e74"/><file name="pricewaiter_tab.png" hash="1bab71be6b1a93aee2ae7aeae3807484"/><file name="pricewaiter_logo.png" hash="becb9713a561131ff69eabb7503d3e74"/><file name="pricewaiter_tab.png" hash="1bab71be6b1a93aee2ae7aeae3807484"/></dir><file name="pricewaiter.css" hash="c4061169f3e505c28bd09924108ca0ad"/></dir></dir></dir></dir><dir name="js"><dir name="pricewaiter"><file name="product-pages.js" hash="073eb5cd568a3db8b3ab7f94d5ffba3c"/><file name="token.js" hash="dbaedb04a60982743949e16096ed7f58"/></dir></dir></target></contents>
22
  <compatible/>
23
  <dependencies>
24
  <required>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>nypwidget</name>
4
+ <version>2.1.4</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
+ <summary>PriceWaiter lets buyers make offers on your products that you can easily accept, counter offer or reject.</summary>
10
+ <description>Sell more, immediately, with the PriceWaiter widget. Convert comparison shoppers you might have lost, increase sales and conversions, and stop "minimum advertised price" from preventing sales before they even start.&#xD;&#xD; PriceWaiter lets customers make offers on products you sell-- offers you can accept, reject or counter. The widget embeds a simple Name Your Price button on any product page or category that you choose. Simply install the extension and you'll have full control over PriceWaiter in your Magento admin control panel.</description>
11
+ <notes>Bug Fix:&#xD;- Resolves some order writing issues.</notes>
12
  <authors>
13
  <author>
14
  <name>PriceWaiter</name>
16
  <email>extensions@pricewaiter.com</email>
17
  </author>
18
  </authors>
19
+ <date>2015-11-19</date>
20
+ <time>00:15:40</time>
21
+ <contents><target name="mageweb"><dir name="app"><dir name="etc"><dir name="modules"><file name="PriceWaiter_NYPWidget.xml" hash="72be18d9a8a741abc8926866449619cd"/></dir></dir><dir name="code"><dir name="community"><dir name="PriceWaiter"><dir name="NYPWidget"><dir name="Block"><dir name="Adminhtml"><file name="Link.php" hash="848a4e3813a3d238cacdd812334bb780"/><file name="Signup.php" hash="35a2739246307b5c7a3b69780a7f31fd"/><file name="Widget.php" hash="b781daf1de34d7856de7faba65afe414"/></dir><file name="Category.php" hash="de6397a45d7deabc803bef83a83d6b9a"/><file name="Widget.php" hash="193d694c4acc2133d8402f1e59d4dc25"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="PricewaiterController.php" hash="27e17f05c8e2b2edcc28230185334f35"/></dir><file name="CallbackController.php" hash="4c45b3d73999c3e69a11538b99b3b3fd"/><file name="ProductinfoController.php" hash="62780d33252c907cd48f9ff3326b3e8b"/></dir><dir name="etc"><file name="adminhtml.xml" hash="dff2f6de0dacaf5a933048fa4a347f2f"/><file name="config.xml" hash="7f516fdb3fc971efea45e869ff15a399"/><file name="system.xml" hash="82bb83cf7eb6a1d0ebf6bb774cd24414"/></dir><dir name="Helper"><file name="Data.php" hash="02a3f95d06939001ed5ab7a195b810f4"/></dir><dir name="Model"><file name="Callback.php" hash="441661b9a5a6d812a1d39b1a199da2a0"/><file name="Category.php" hash="884685769be745cb273833ab7d691593"/><file name="Observer.php" hash="2399e210dd82633091570483f144bf12"/><file name="Order.php" hash="080844dcc4cf55d516abe27175a3a62a"/><file name="PaymentMethod.php" hash="386134e1ac803580222263523f0ced31"/><dir name="Carrier"><file name="ShippingMethod.php" hash="43a6ec1ad462797a5359238dcf9a749d"/></dir><dir name="Display"><file name="Phrase.php" hash="5b595a42b487930154c505a8e9a1301c"/><file name="Size.php" hash="8a596164268f48c3c034274550b13b96"/></dir><dir name="Mysql4"><dir name="Category"><file name="Collection.php" hash="45eaa532cd5935b69102b8969da848fa"/></dir><file name="Category.php" hash="f4e761813ec4bb81d919f30895ce3578"/><file name="Order.php" hash="c08b340cec16bf774a7c178726dee0ac"/><dir name="Order"><file name="Collection.php" hash="4dc5b344274c0e5a391a24864fd1c003"/></dir></dir><dir name="Resource"><dir name="Eav"><dir name="Mysql4"><file name="Setup.php" hash="d63678e9cc718ee87e8db3ca5163a8fd"/></dir></dir></dir></dir><dir name="sql"><dir name="nypwidget_setup"><file name="mysql4-install-1.0.0.php" hash="cd1b7892e75e4452ee94afbbefb4de6e"/><file name="mysql4-upgrade-1.1.2-1.1.3.php" hash="d1ae05f5cbe4a8f833e92b9f49d395db"/><file name="mysql4-upgrade-1.1.7-1.1.8.php" hash="bd342c802f6c91de6f9f51b0a4a25414"/><file name="mysql4-upgrade-1.2.4-1.2.5.php" hash="b1ced0226bef6e950e026402b933872f"/><file name="mysql4-upgrade-1.3.0-1.3.1.php" hash="106b36065c125be31fc67424d80acdd4"/></dir></dir></dir></dir></dir></dir><dir name="design"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="pricewaiter.xml" hash="9e06026a8a820224336de4c9a7dde3fd"/></dir><dir name="template"><dir name="pricewaiter"><file name="categorytab.phtml" hash="d1d2c333cc9b18c909a44d333d8ab077"/><file name="signup.phtml" hash="fc18c669c18c55cccdf2c66c96199dec"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="pricewaiter.xml" hash="ab65e8c99c560997d403a780295a47da"/></dir><dir name="template"><dir name="pricewaiter"><file name="widget.phtml" hash="0b96e17e76b40dfb4b641dce3246e195"/></dir></dir></dir></dir></dir></dir></dir><dir name="skin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><file name="pricewaiter_logo.png" hash="becb9713a561131ff69eabb7503d3e74"/><file name="pricewaiter_tab.png" hash="1bab71be6b1a93aee2ae7aeae3807484"/><file name="pricewaiter_logo.png" hash="becb9713a561131ff69eabb7503d3e74"/><file name="pricewaiter_tab.png" hash="1bab71be6b1a93aee2ae7aeae3807484"/></dir><file name="pricewaiter.css" hash="c4061169f3e505c28bd09924108ca0ad"/></dir></dir></dir></dir><dir name="js"><dir name="pricewaiter"><file name="product-pages.js" hash="073eb5cd568a3db8b3ab7f94d5ffba3c"/><file name="token.js" hash="dbaedb04a60982743949e16096ed7f58"/></dir></dir></target></contents>
22
  <compatible/>
23
  <dependencies>
24
  <required>