Version Notes
* Fixes for multistore installations
Download this release
Release Info
| Developer | Fermo!Point |
| Extension | fermopoint |
| Version | 1.3.6 |
| Comparing to | |
| See all releases | |
Code changes from version 1.3.5 to 1.3.6
- app/code/community/FermoPoint/StorePickup/Block/Adminhtml/Remote.php +2 -0
- app/code/community/FermoPoint/StorePickup/Block/Adminhtml/Remote/Grid.php +6 -0
- app/code/community/FermoPoint/StorePickup/Block/Adminhtml/Switcher.php +54 -0
- app/code/community/FermoPoint/StorePickup/Helper/Config.php +4 -4
- app/code/community/FermoPoint/StorePickup/Model/Api.php +10 -1
- app/code/community/FermoPoint/StorePickup/Model/Source/Payment.php +24 -21
- app/design/adminhtml/default/default/layout/fpstorepickup.xml +3 -2
- app/design/adminhtml/default/default/template/fpstorepickup/array2.phtml +165 -0
- app/design/adminhtml/default/default/template/fpstorepickup/switcher.phtml +45 -0
- app/locale/it_IT/FermoPoint_StorePickup.csv +2 -1
- package.xml +6 -6
app/code/community/FermoPoint/StorePickup/Block/Adminhtml/Remote.php
CHANGED
|
@@ -10,6 +10,8 @@ class FermoPoint_StorePickup_Block_Adminhtml_Remote extends Mage_Adminhtml_Block
|
|
| 10 |
$this->_headerText = Mage::helper('fpstorepickup')->__('All Orders');
|
| 11 |
parent::__construct();
|
| 12 |
$this->removeButton('add');
|
|
|
|
|
|
|
| 13 |
}
|
| 14 |
|
| 15 |
}
|
| 10 |
$this->_headerText = Mage::helper('fpstorepickup')->__('All Orders');
|
| 11 |
parent::__construct();
|
| 12 |
$this->removeButton('add');
|
| 13 |
+
$this->removeButton('search');
|
| 14 |
+
$this->removeButton('reset');
|
| 15 |
}
|
| 16 |
|
| 17 |
}
|
app/code/community/FermoPoint/StorePickup/Block/Adminhtml/Remote/Grid.php
CHANGED
|
@@ -13,6 +13,7 @@ class FermoPoint_StorePickup_Block_Adminhtml_Remote_Grid extends Mage_Adminhtml_
|
|
| 13 |
$this->setUseAjax(true);
|
| 14 |
$this->setDefaultSort('order_id');
|
| 15 |
$this->setSaveParametersInSession(true);
|
|
|
|
| 16 |
}
|
| 17 |
|
| 18 |
protected function _createCollection()
|
|
@@ -130,4 +131,9 @@ class FermoPoint_StorePickup_Block_Adminhtml_Remote_Grid extends Mage_Adminhtml_
|
|
| 130 |
return 'javascript:void()';
|
| 131 |
}
|
| 132 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 133 |
}
|
| 13 |
$this->setUseAjax(true);
|
| 14 |
$this->setDefaultSort('order_id');
|
| 15 |
$this->setSaveParametersInSession(true);
|
| 16 |
+
$this->setFilterVisibility(false);
|
| 17 |
}
|
| 18 |
|
| 19 |
protected function _createCollection()
|
| 131 |
return 'javascript:void()';
|
| 132 |
}
|
| 133 |
|
| 134 |
+
public function getMainButtonsHtml()
|
| 135 |
+
{
|
| 136 |
+
return '';
|
| 137 |
+
}
|
| 138 |
+
|
| 139 |
}
|
app/code/community/FermoPoint/StorePickup/Block/Adminhtml/Switcher.php
ADDED
|
@@ -0,0 +1,54 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
class FermoPoint_StorePickup_Block_Adminhtml_Switcher extends Mage_Adminhtml_Block_Template
|
| 4 |
+
{
|
| 5 |
+
/**
|
| 6 |
+
* Get websites
|
| 7 |
+
*
|
| 8 |
+
* @return array
|
| 9 |
+
*/
|
| 10 |
+
public function getWebsites()
|
| 11 |
+
{
|
| 12 |
+
$websites = Mage::app()->getWebsites();
|
| 13 |
+
$clientIds = array();
|
| 14 |
+
$config = Mage::helper('fpstorepickup/config');
|
| 15 |
+
foreach ($websites as $websiteId => $website) {
|
| 16 |
+
$store_id = Mage::app()->getWebsite($website)->getDefaultStore()->getId();
|
| 17 |
+
if ( Mage::getStoreConfig('carriers/fpstorepickup/active', $store_id)
|
| 18 |
+
&& Mage::getStoreConfig('carriers/fpstorepickup/accept', $store_id)
|
| 19 |
+
) {
|
| 20 |
+
$clientIds[Mage::getStoreConfig($config::XML_PATH_CLIENTID, $store_id)][] = array('id' => $websiteId, 'name' => $website->getName());
|
| 21 |
+
}
|
| 22 |
+
}
|
| 23 |
+
|
| 24 |
+
$result = array();
|
| 25 |
+
foreach ($clientIds as $clientId => $webistes) {
|
| 26 |
+
$first_website = array_shift($webistes);
|
| 27 |
+
$key = $first_website['id'];
|
| 28 |
+
$value = $first_website['name'];
|
| 29 |
+
$result[$key] = $value;
|
| 30 |
+
foreach($webistes as $website) {
|
| 31 |
+
$result[$key] .= ' / '.$website["name"];
|
| 32 |
+
}
|
| 33 |
+
}
|
| 34 |
+
return $result;
|
| 35 |
+
}
|
| 36 |
+
|
| 37 |
+
public function getSwitchUrl()
|
| 38 |
+
{
|
| 39 |
+
return $this->getUrl('*/*/*', array('_current' => true, 'website' => null));
|
| 40 |
+
}
|
| 41 |
+
|
| 42 |
+
public function getWebsiteId()
|
| 43 |
+
{
|
| 44 |
+
$website = $this->getRequest()->getParam('website', null);
|
| 45 |
+
if (!$website) {
|
| 46 |
+
$websites = $this->getWebsites();
|
| 47 |
+
$website = key($websites);
|
| 48 |
+
Mage::app()->getRequest()->setPost('website', $website);
|
| 49 |
+
}
|
| 50 |
+
|
| 51 |
+
return $website;
|
| 52 |
+
}
|
| 53 |
+
|
| 54 |
+
}
|
app/code/community/FermoPoint/StorePickup/Helper/Config.php
CHANGED
|
@@ -52,9 +52,9 @@ class FermoPoint_StorePickup_Helper_Config extends Mage_Core_Helper_Abstract
|
|
| 52 |
return Mage::getStoreConfigFlag(self::XML_PATH_ACCEPT);
|
| 53 |
}
|
| 54 |
|
| 55 |
-
public function getClientId()
|
| 56 |
{
|
| 57 |
-
return (string) Mage::getStoreConfig(self::XML_PATH_CLIENTID);
|
| 58 |
}
|
| 59 |
|
| 60 |
public function getGuestNickname()
|
|
@@ -77,9 +77,9 @@ class FermoPoint_StorePickup_Helper_Config extends Mage_Core_Helper_Abstract
|
|
| 77 |
return explode(',', Mage::getStoreConfig(self::XML_PATH_SPECIFICPAYMENTS));
|
| 78 |
}
|
| 79 |
|
| 80 |
-
public function getClientSecret()
|
| 81 |
{
|
| 82 |
-
return (string) Mage::getStoreConfig(self::XML_PATH_CLIENTSECRET);
|
| 83 |
}
|
| 84 |
|
| 85 |
public function isSandbox()
|
| 52 |
return Mage::getStoreConfigFlag(self::XML_PATH_ACCEPT);
|
| 53 |
}
|
| 54 |
|
| 55 |
+
public function getClientId($store_id)
|
| 56 |
{
|
| 57 |
+
return (string) Mage::getStoreConfig(self::XML_PATH_CLIENTID, $store_id);
|
| 58 |
}
|
| 59 |
|
| 60 |
public function getGuestNickname()
|
| 77 |
return explode(',', Mage::getStoreConfig(self::XML_PATH_SPECIFICPAYMENTS));
|
| 78 |
}
|
| 79 |
|
| 80 |
+
public function getClientSecret($store_id)
|
| 81 |
{
|
| 82 |
+
return (string) Mage::getStoreConfig(self::XML_PATH_CLIENTSECRET, $store_id);
|
| 83 |
}
|
| 84 |
|
| 85 |
public function isSandbox()
|
app/code/community/FermoPoint/StorePickup/Model/Api.php
CHANGED
|
@@ -54,8 +54,17 @@ class FermoPoint_StorePickup_Model_Api {
|
|
| 54 |
|
| 55 |
public function call($method, $data = array(), $params = array())
|
| 56 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 57 |
$config = Mage::helper('fpstorepickup/config');
|
| 58 |
-
$signedData = $this->_signData($data, $config->getClientId(), $config->getClientSecret());
|
| 59 |
$this->_debug($signedData);
|
| 60 |
|
| 61 |
$client = new Zend_Http_Client($this->_buildUrl($config->getEndpointUrl($method), $params));
|
| 54 |
|
| 55 |
public function call($method, $data = array(), $params = array())
|
| 56 |
{
|
| 57 |
+
if ($method == 'orders') {
|
| 58 |
+
$website = Mage::app()->getRequest()->getParam('website', null);
|
| 59 |
+
if (!$website) {
|
| 60 |
+
return array();
|
| 61 |
+
}
|
| 62 |
+
$store_id = Mage::app()->getWebsite($website)->getDefaultStore()->getId();
|
| 63 |
+
} else {
|
| 64 |
+
$store_id = Mage::app()->getStore()->getStoreId();
|
| 65 |
+
}
|
| 66 |
$config = Mage::helper('fpstorepickup/config');
|
| 67 |
+
$signedData = $this->_signData($data, $config->getClientId($store_id), $config->getClientSecret($store_id));
|
| 68 |
$this->_debug($signedData);
|
| 69 |
|
| 70 |
$client = new Zend_Http_Client($this->_buildUrl($config->getEndpointUrl($method), $params));
|
app/code/community/FermoPoint/StorePickup/Model/Source/Payment.php
CHANGED
|
@@ -1,21 +1,24 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
|
| 3 |
-
class FermoPoint_StorePickup_Model_Source_Payment
|
| 4 |
-
{
|
| 5 |
-
public function toOptionArray()
|
| 6 |
-
{
|
| 7 |
-
|
| 8 |
-
|
| 9 |
-
|
| 10 |
-
|
| 11 |
-
|
| 12 |
-
|
| 13 |
-
|
| 14 |
-
|
| 15 |
-
|
| 16 |
-
|
| 17 |
-
|
| 18 |
-
|
| 19 |
-
|
| 20 |
-
|
| 21 |
-
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
class FermoPoint_StorePickup_Model_Source_Payment
|
| 4 |
+
{
|
| 5 |
+
public function toOptionArray()
|
| 6 |
+
{
|
| 7 |
+
$website = Mage::getSingleton('adminhtml/config_data')->getWebsite();
|
| 8 |
+
$website_id = Mage::getModel('core/website')->load($website)->getId();
|
| 9 |
+
$store_id = Mage::app()->getWebsite($website_id)->getDefaultStore()->getId();
|
| 10 |
+
$collection = Mage::getModel('payment/config')->getActiveMethods($store_id);
|
| 11 |
+
|
| 12 |
+
if ( ! count($collection))
|
| 13 |
+
return;
|
| 14 |
+
|
| 15 |
+
$options = array();
|
| 16 |
+
foreach ($collection as $item)
|
| 17 |
+
{
|
| 18 |
+
$title = $item->getTitle() ? $item->getTitle() : $item->getId();
|
| 19 |
+
$options[] = array('value' => $item->getId(), 'label' => $title);
|
| 20 |
+
}
|
| 21 |
+
|
| 22 |
+
return $options;
|
| 23 |
+
}
|
| 24 |
+
}
|
app/design/adminhtml/default/default/layout/fpstorepickup.xml
CHANGED
|
@@ -1,14 +1,15 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<layout>
|
| 3 |
<fpstorepickupadmin_adminhtml_remote_index>
|
| 4 |
-
<
|
| 5 |
<action method="setTitle" translate="title"><title>All Orders</title></action>
|
| 6 |
-
</
|
| 7 |
<reference name="menu">
|
| 8 |
<action method="setActive"><menupath>sales/fermopoint/remote</menupath></action>
|
| 9 |
</reference>
|
| 10 |
<reference name="content">
|
| 11 |
<block type="core/text_list" name="remote">
|
|
|
|
| 12 |
<block type="fpstorepickup/adminhtml_stats" name="admin.fermopoint.stats" template="fpstorepickup/stats.phtml" />
|
| 13 |
<block type="fpstorepickup/adminhtml_remote" name="admin.fermopoint.remote"/>
|
| 14 |
</block>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<layout>
|
| 3 |
<fpstorepickupadmin_adminhtml_remote_index>
|
| 4 |
+
<reference name="head">
|
| 5 |
<action method="setTitle" translate="title"><title>All Orders</title></action>
|
| 6 |
+
</reference>
|
| 7 |
<reference name="menu">
|
| 8 |
<action method="setActive"><menupath>sales/fermopoint/remote</menupath></action>
|
| 9 |
</reference>
|
| 10 |
<reference name="content">
|
| 11 |
<block type="core/text_list" name="remote">
|
| 12 |
+
<block type="fpstorepickup/adminhtml_switcher" name="website_switcher" as="website_switcher" template="fpstorepickup/switcher.phtml" />
|
| 13 |
<block type="fpstorepickup/adminhtml_stats" name="admin.fermopoint.stats" template="fpstorepickup/stats.phtml" />
|
| 14 |
<block type="fpstorepickup/adminhtml_remote" name="admin.fermopoint.remote"/>
|
| 15 |
</block>
|
app/design/adminhtml/default/default/template/fpstorepickup/array2.phtml
ADDED
|
@@ -0,0 +1,165 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magento.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magento.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2006-2016 X.commerce, Inc. and affiliates (http://www.magento.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
|
| 28 |
+
<?php
|
| 29 |
+
$_htmlId = $this->getHtmlId() ? $this->getHtmlId() : '_' . uniqid();
|
| 30 |
+
|
| 31 |
+
$_colspan = 2;
|
| 32 |
+
if (!$this->_addAfter) {
|
| 33 |
+
$_colspan -= 1;
|
| 34 |
+
}
|
| 35 |
+
$_colspan = $_colspan > 1 ? 'colspan="' . $_colspan . '"' : '';
|
| 36 |
+
?>
|
| 37 |
+
|
| 38 |
+
<a id="<?php echo $_htmlId ?>"></a>
|
| 39 |
+
<div class="grid" id="grid<?php echo $_htmlId ?>">
|
| 40 |
+
<table cellpadding="0" cellspacing="0" class="border">
|
| 41 |
+
<tbody>
|
| 42 |
+
|
| 43 |
+
<tr class="headings" id="headings<?php echo $_htmlId ?>">
|
| 44 |
+
<?php foreach ($this->_columns as $columnName => $column):?>
|
| 45 |
+
<th><?php echo $column['label'] ?></th>
|
| 46 |
+
<?php endforeach;?>
|
| 47 |
+
<th <?php echo $_colspan?>></th>
|
| 48 |
+
</tr>
|
| 49 |
+
|
| 50 |
+
<tr id="addRow<?php echo $_htmlId ?>">
|
| 51 |
+
<td colspan="<?php echo count($this->_columns) ?>"></td>
|
| 52 |
+
<td <?php echo $_colspan?>>
|
| 53 |
+
<button style="" onclick="" class="scalable add" type="button" id="addToEndBtn<?php echo $_htmlId ?>">
|
| 54 |
+
<span><span><span><?php echo $this->_addButtonLabel ?></span></span></span>
|
| 55 |
+
</button>
|
| 56 |
+
</td>
|
| 57 |
+
</tr>
|
| 58 |
+
|
| 59 |
+
</tbody>
|
| 60 |
+
</table>
|
| 61 |
+
<input type="hidden" name="<?php echo $this->getElement()->getName() ?>[__empty]" value="" />
|
| 62 |
+
</div>
|
| 63 |
+
<div id="empty<?php echo $_htmlId ?>">
|
| 64 |
+
<button style="" onclick="" class="scalable add" type="button" id="emptyAddBtn<?php echo $_htmlId ?>">
|
| 65 |
+
<span><span><span><?php echo $this->_addButtonLabel ?></span></span></span>
|
| 66 |
+
</button>
|
| 67 |
+
</div>
|
| 68 |
+
|
| 69 |
+
<script type="text/javascript">
|
| 70 |
+
//<![CDATA[
|
| 71 |
+
// create row creator
|
| 72 |
+
var arrayRow<?php echo $_htmlId ?> = {
|
| 73 |
+
// define row prototypeJS template
|
| 74 |
+
template : new Template(
|
| 75 |
+
'<tr id="#{_id}">'
|
| 76 |
+
<?php foreach ($this->_columns as $columnName => $column):?>
|
| 77 |
+
+'<td>'
|
| 78 |
+
+'<?php echo Mage::helper('core')->jsQuoteEscape($this->_renderCellTemplate($columnName)) ?>'
|
| 79 |
+
+'<\/td>'
|
| 80 |
+
<?php endforeach;?>
|
| 81 |
+
<?php if ($this->_addAfter):?>
|
| 82 |
+
+'<td><button onclick="" class="scalable add" type="button" id="addAfterBtn#{_id}"><span><span><span><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('adminhtml')->__('Add after')) ?><\/span><\/span><\/span><\/button><\/td>'
|
| 83 |
+
<?php endif;?>
|
| 84 |
+
+'<td><button onclick="arrayRow<?php echo $_htmlId ?>.del(\'#{_id}\')" class="scalable delete" type="button"><span><span><span><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('adminhtml')->__('Delete')) ?><\/span><\/span><\/span><\/button><\/td>'
|
| 85 |
+
+'<\/tr>'
|
| 86 |
+
),
|
| 87 |
+
|
| 88 |
+
rowsCount : 0,
|
| 89 |
+
|
| 90 |
+
add : function(templateData, insertAfterId)
|
| 91 |
+
{
|
| 92 |
+
// generate default template data
|
| 93 |
+
if ('' == templateData) {
|
| 94 |
+
var d = new Date();
|
| 95 |
+
var templateData = {
|
| 96 |
+
<?php foreach ($this->_columns as $columnName => $column):?>
|
| 97 |
+
<?php echo $columnName ?> : '',
|
| 98 |
+
<?php endforeach;?>
|
| 99 |
+
_id : '_' + d.getTime() + '_' + d.getMilliseconds()
|
| 100 |
+
};
|
| 101 |
+
}
|
| 102 |
+
|
| 103 |
+
// insert before last row
|
| 104 |
+
if ('' == insertAfterId) {
|
| 105 |
+
Element.insert($('addRow<?php echo $_htmlId ?>'), {before: this.template.evaluate(templateData)});
|
| 106 |
+
}
|
| 107 |
+
// insert after specified row
|
| 108 |
+
else {
|
| 109 |
+
Element.insert($(insertAfterId), {after: this.template.evaluate(templateData)});
|
| 110 |
+
}
|
| 111 |
+
|
| 112 |
+
<?php if ($this->_addAfter):?>
|
| 113 |
+
Event.observe('addAfterBtn' + templateData._id, 'click', this.add.bind(this, '', templateData._id));
|
| 114 |
+
<?php endif;?>
|
| 115 |
+
|
| 116 |
+
this.rowsCount += 1;
|
| 117 |
+
},
|
| 118 |
+
|
| 119 |
+
del : function(rowId)
|
| 120 |
+
{
|
| 121 |
+
$(rowId).remove();
|
| 122 |
+
this.rowsCount -= 1;
|
| 123 |
+
if (0 == this.rowsCount) {
|
| 124 |
+
this.showButtonOnly();
|
| 125 |
+
}
|
| 126 |
+
},
|
| 127 |
+
|
| 128 |
+
showButtonOnly : function()
|
| 129 |
+
{
|
| 130 |
+
$('grid<?php echo $_htmlId ?>').hide();
|
| 131 |
+
$('empty<?php echo $_htmlId ?>').show();
|
| 132 |
+
}
|
| 133 |
+
}
|
| 134 |
+
|
| 135 |
+
// bind add action to "Add" button in last row
|
| 136 |
+
Event.observe('addToEndBtn<?php echo $_htmlId ?>', 'click', arrayRow<?php echo $_htmlId ?>.add.bind(arrayRow<?php echo $_htmlId ?>, '', ''));
|
| 137 |
+
|
| 138 |
+
// add existing rows
|
| 139 |
+
<?php
|
| 140 |
+
$_addAfterId = "headings{$_htmlId}";
|
| 141 |
+
foreach ($this->getArrayRows() as $_rowId => $_row) {
|
| 142 |
+
echo "arrayRow{$_htmlId}.add(" . $_row->toJson() . ", '{$_addAfterId}');\n";
|
| 143 |
+
$_addAfterId = $_rowId;
|
| 144 |
+
}
|
| 145 |
+
?>
|
| 146 |
+
|
| 147 |
+
// initialize standalone button
|
| 148 |
+
$('empty<?php echo $_htmlId ?>').hide();
|
| 149 |
+
Event.observe('emptyAddBtn<?php echo $_htmlId ?>', 'click', function () {
|
| 150 |
+
$('grid<?php echo $_htmlId ?>').show();
|
| 151 |
+
$('empty<?php echo $_htmlId ?>').hide();
|
| 152 |
+
arrayRow<?php echo $_htmlId ?>.add('', '');
|
| 153 |
+
});
|
| 154 |
+
|
| 155 |
+
// if no rows, hide grid and show button only
|
| 156 |
+
<?php if (!$this->getArrayRows()):?>
|
| 157 |
+
arrayRow<?php echo $_htmlId ?>.showButtonOnly();
|
| 158 |
+
<?php endif;?>
|
| 159 |
+
|
| 160 |
+
// toggle the grid, if element is disabled (depending on scope)
|
| 161 |
+
<?php if ($this->getElement()->getDisabled()):?>
|
| 162 |
+
toggleValueElements({checked:true}, $('grid<?php echo $_htmlId ?>').parentNode);
|
| 163 |
+
<?php endif;?>
|
| 164 |
+
//]]>
|
| 165 |
+
</script>
|
app/design/adminhtml/default/default/template/fpstorepickup/switcher.phtml
ADDED
|
@@ -0,0 +1,45 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magento.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magento.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2006-2016 X.commerce, Inc. and affiliates (http://www.magento.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php /* @var $this Mage_Core_Block_Template */ ?>
|
| 28 |
+
<?php if ($websites = $this->getWebsites()): ?>
|
| 29 |
+
<p class="switcher"><label for="website_switcher"><?php echo $this->__('Choose Website:'); ?></label>
|
| 30 |
+
<select name="website_switcher" id="website_switcher" onchange="return switchWebsite(this);">
|
| 31 |
+
<?php foreach ($websites as $websiteId => $websiteName): ?>
|
| 32 |
+
<option value="<?php echo $this->escapeHtml($websiteId) ?>"<?php if($this->getWebsiteId() == $websiteId): ?> selected="selected"<?php endif; ?>><?php echo $this->escapeHtml($websiteName) ?></option>
|
| 33 |
+
<?php endforeach; ?>
|
| 34 |
+
</select>
|
| 35 |
+
</p>
|
| 36 |
+
<script type="text/javascript">
|
| 37 |
+
function switchWebsite(obj) {
|
| 38 |
+
var websiteParam = obj.value ? 'website/' + obj.value + '/' : '';
|
| 39 |
+
if (obj.switchParams) {
|
| 40 |
+
websiteParam += obj.switchParams;
|
| 41 |
+
}
|
| 42 |
+
setLocation('<?php echo $this->getSwitchUrl() ?>' + websiteParam);
|
| 43 |
+
}
|
| 44 |
+
</script>
|
| 45 |
+
<?php endif; ?>
|
app/locale/it_IT/FermoPoint_StorePickup.csv
CHANGED
|
@@ -57,4 +57,5 @@ All Orders,Tutte le Transazioni
|
|
| 57 |
"There is no user with given nickname and date of birth","La coppia nickname / data di nascita non sembra essere corretta"
|
| 58 |
"Enter your birth date %s","Inserisci la tua data di nascita %s"
|
| 59 |
"Enter your birth date mm/dd/yyyy","Inserisci la tua data di nascita gg/mm/aaaa"
|
| 60 |
-
"Invalid Date of Birth","Invalid data di nascita"
|
|
|
| 57 |
"There is no user with given nickname and date of birth","La coppia nickname / data di nascita non sembra essere corretta"
|
| 58 |
"Enter your birth date %s","Inserisci la tua data di nascita %s"
|
| 59 |
"Enter your birth date mm/dd/yyyy","Inserisci la tua data di nascita gg/mm/aaaa"
|
| 60 |
+
"Invalid Date of Birth","Invalid data di nascita"
|
| 61 |
+
"Choose Website:","Mostra Transazioni per:"
|
package.xml
CHANGED
|
@@ -1,18 +1,18 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>fermopoint</name>
|
| 4 |
-
<version>1.3.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>Fermo!Points</summary>
|
| 10 |
<description>Module for integrating Fermo!Points collecting points system.</description>
|
| 11 |
-
<notes>*
|
| 12 |
<authors><author><name>Fermo!Point</name><user>fermopoint</user><email>support@fermopoint.it</email></author></authors>
|
| 13 |
-
<date>
|
| 14 |
-
<time>
|
| 15 |
-
<contents><target name="magecommunity"><dir name="FermoPoint"><dir name="StorePickup"><dir
|
| 16 |
<compatible/>
|
| 17 |
-
<dependencies><required><php><min>5.2.0</min><max>
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>fermopoint</name>
|
| 4 |
+
<version>1.3.6</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>Fermo!Points</summary>
|
| 10 |
<description>Module for integrating Fermo!Points collecting points system.</description>
|
| 11 |
+
<notes>* Fixes for multistore installations</notes>
|
| 12 |
<authors><author><name>Fermo!Point</name><user>fermopoint</user><email>support@fermopoint.it</email></author></authors>
|
| 13 |
+
<date>2017-01-27</date>
|
| 14 |
+
<time>15:11:53</time>
|
| 15 |
+
<contents><target name="magecommunity"><dir name="FermoPoint"><dir name="StorePickup"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Cost"><file name="Subtotal.php" hash="b3bf25953e7884456c37f73990cd27e8"/><file name="Weight.php" hash="b59ef2fdfdd1c3423dcda8cbafbf5c47"/></dir></dir><dir name="Configuration"><file name="Disabled.php" hash="27fc2af187259bddd66552c84231f5f5"/><file name="Manual.php" hash="132e7c4a9f89ad71dccb4ce1b2c4c242"/></dir><dir name="Remote"><dir name="Grid"><dir name="Renderer"><file name="Notes.php" hash="0d3427070e683a438abdabc1926cf316"/></dir></dir><file name="Grid.php" hash="4c566d367a7ee4e2e964d5b6e3d5e270"/></dir><file name="Remote.php" hash="71efb0d0be217aa1131d310aa7bfb313"/><file name="Stats.php" hash="e5f884c631ab63546570ab35e0a8336c"/><file name="Switcher.php" hash="d2e56a62f7314a219a5106e9ca9d2b0b"/></dir><dir name="Checkout"><dir name="Billing"><file name="Js.php" hash="6be3156e2bb484852a9d5b0e9aa7eee2"/><file name="Radio.php" hash="6839fed605f95a79537e09467a578e58"/></dir><dir name="Onepage"><dir name="Payment"><file name="Methods.php" hash="aa8e5a31eb2ce85672e0f8aa290b4759"/></dir><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="59f7cea723940a81ab4a849b0dccca4f"/></dir></dir></dir></dir><dir name="FireCheckout"><dir name="Billing"><file name="Js.php" hash="dc5d3d07ad298c28a0651d6c090d7ef6"/><file name="Radio.php" hash="d85b3da0d7755b3e272a1102325815bf"/></dir><dir name="Onepage"><dir name="Payment"><file name="Methods.php" hash="aa8e5a31eb2ce85672e0f8aa290b4759"/></dir><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="dc6592a6ed82b51a6eb8e44272a6248d"/></dir></dir></dir></dir><dir name="IdevCheckout"><dir name="Billing"><file name="Js.php" hash="403e96b8cbb6207c8bce59dbace08ed8"/><file name="Radio.php" hash="91f805ce7e956dd255b79217b8cf7510"/></dir></dir><dir name="MagestoreCheckout"><dir name="Billing"><file name="Js.php" hash="2873610ad826a26e078f85b048fde3e4"/><file name="Radio.php" hash="26775b177ea8b6b6baebdf1b7aa0f253"/></dir><file name="Js.php" hash="af0a81738f18a071f7bf98bd98ef3c4c"/><dir name="Onepage"><dir name="Payment"><file name="Methods.php" hash="aa8e5a31eb2ce85672e0f8aa290b4759"/></dir><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="dc6592a6ed82b51a6eb8e44272a6248d"/></dir></dir></dir></dir><file name="Map.php" hash="4d6c24521489ea192bc1f0c0d3cbaf26"/></dir><file name="Exception.php" hash="5d30b0aa037248c2709775c8485d5fff"/><dir name="Helper"><file name="Config.php" hash="c80781f017440bf1528c99c505423158"/><file name="Data.php" hash="8eb4e5eb32709e5dae4b19d506044a1e"/><dir name="Firecheckout"><file name="Ajax.php" hash="3378c6cfd23447b88c10d9d2f1f3bf77"/></dir></dir><dir name="Model"><dir name="Api"><file name="OrderCollection.php" hash="f43b08d838be60a4e923fd8e3373356f"/><file name="SearchData.php" hash="ccbba430222bdfd145db0536914c7cc3"/></dir><file name="Api.php" hash="3e412d2786a121543906c77762546c5f"/><dir name="Carrier"><file name="Storepickup.php" hash="0497c47334f60d7cd81cc4f0e81e56a2"/></dir><file name="GoogleMaps.php" hash="57e207c865f97f5eb7c2832862a052d1"/><file name="Observer.php" hash="cd8a906ca0da5c79712b9f382fa50b38"/><dir name="Order"><file name="Point.php" hash="e5d033a2ee6add18f52bd0068102b22f"/></dir><file name="Point.php" hash="b5924ba282ad76dffc269b9c13b823f9"/><file name="Points.php" hash="74965213fce4342cae2fb1dc243fda36"/><dir name="Resource"><dir name="Order"><dir name="Point"><file name="Collection.php" hash="294427a66e6588ec4a5ef9af18eecd01"/></dir><file name="Point.php" hash="6c02668768be696fa833bab39fe3f9db"/></dir><dir name="Point"><file name="Collection.php" hash="9745e0182402f72ee43ce6cd7834afce"/></dir><file name="Point.php" hash="6b8e4a20dbda96bdf1c71bf56fcf8c31"/></dir><dir name="Source"><file name="Costmode.php" hash="2d1a5efc5339270fc9ba3e0acce47ef3"/><file name="Payment.php" hash="dd79d15249c29f888b047c9e29ffcfaa"/><file name="Selectorpayment.php" hash="8448ba93eb8ebe2c25eeeef100ff47f9"/><file name="State.php" hash="6a3f558509964600aa9491fbc7b5a15d"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="RemoteController.php" hash="1572704560ae35965d184bfa25fef23c"/></dir><file name="IndexController.php" hash="c35f79f12a2d78a38fd6b3cfa81f50ee"/><file name="ValidateController.php" hash="81869825387f94dfaa8475408edf054f"/></dir><dir name="etc"><file name="adminhtml.xml" hash="f790d0329024eba67a9018fd782a763a"/><file name="config.xml" hash="b0a3e570cb17c6503a360bce1aa72103"/><file name="jstranslator.xml" hash="f6340ca99cf070450e94d3f0c8f86da2"/><file name="system.xml" hash="0438f4b55be6633b39576704153b7bb3"/></dir><dir name="sql"><dir name="fpstorepickup_setup"><file name="mysql4-install-1.0.0.php" hash="c48472469c87f9975c4b203715e0137c"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="4801c11b1c8698ecbf9b4d857b055c33"/><file name="mysql4-upgrade-1.0.1-1.0.2.php" hash="21b100d87f0d3820e6317774c5ed273d"/><file name="mysql4-upgrade-1.1.1-1.1.2.php" hash="a120ae850a03a56010cf9576715beabd"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="fpstorepickup.xml" hash="9794c462a8b296bce412094a4d581c0a"/></dir><dir name="template"><dir name="fpstorepickup"><file name="array.phtml" hash="76208141443ee6424b2a41aae63dcdf5"/><file name="array2.phtml" hash="4e437681d64d0fdd1e8acc660eaafed2"/><file name="stats.phtml" hash="977cf97e8e340abdc86825c4e853195c"/><file name="switcher.phtml" hash="4ccf6f023cd99db830f292f4bb3f37f6"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="fpstorepickup.xml" hash="865e2e52da6d1dbe1cde3f354865861c"/></dir><dir name="template"><dir name="fpstorepickup"><dir name="checkout"><dir name="onepage"><dir name="billing"><file name="js.phtml" hash="0d0d4fa1a2a807ececff43ffad03e322"/><file name="radio.phtml" hash="975e2309308ae63914aa16b9ad81ea47"/></dir></dir></dir><dir name="firecheckout"><dir name="onepage"><dir name="billing"><file name="js.phtml" hash="b5127c0c43885449bd5e65ffa54f0bc1"/><file name="radio.phtml" hash="a40fd64f5cdd9e35dcd4d8997cf22b13"/></dir></dir></dir><dir name="idevcheckout"><dir name="onepage"><dir name="billing"><file name="js.phtml" hash="fdcc04e0c817d74e350a7dd8b5803690"/><file name="radio.phtml" hash="452a613dbd563d793298f7c2389c7332"/></dir></dir></dir><dir name="magestorecheckout"><dir name="onepage"><dir name="billing"><file name="js.phtml" hash="aea7698098b5af66ed82690565e8295f"/><file name="radio.phtml" hash="35b6589f396285800d04e0906b156bad"/></dir><file name="js.phtml" hash="8dffc297071ac7d454a04cc69a41a947"/></dir></dir><file name="map.phtml" hash="5cfb0cbb2c3bc438b8148f7f6f89e463"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="FermoPoint_StorePickup.xml" hash="88569786925f04dade3952d7951f0fca"/></dir></target><target name="mage"><dir name="js"><dir name="fermopoint"><file name="firecheckout.js" hash="c573c6f2f7a05998a9ed17c59bed749c"/><file name="markerclusterer.js" hash="b623ac6d39ea8ed99d179db49b7b0bab"/><file name="storepickup.js" hash="5bab453f59cb76a6e3e2ae27bae9ecb0"/></dir></dir></target><target name="magemedia"><dir name="fermopoint"><file name="cluster1.png" hash="545e7decba75c26883195707a1caf453"/><file name="cluster2.png" hash="1a2554261502135f8699081f7b7dfc15"/><file name="cluster3.png" hash="381dc5802ac150d868bab1edee7cba6c"/><file name="cluster4.png" hash="5fad1a5d344e178f587c759d9466a937"/><file name="marker_location.png" hash="000a6513abbe2c9683b19f49873710c5"/><file name="marker_point.png" hash="9b4dd5a4dd6ace99004ee529a9097de8"/></dir></target><target name="magelocale"><dir name="it_IT"><file name="FermoPoint_StorePickup.csv" hash="777860e413fd571bf005f77a8fe09fec"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="fermopoint"><dir name="css"><file name="storepickup.css" hash="8adbb580e7b0d7a5ce0025a9ae3a1a04"/></dir><dir name="images"><file name="opc-ajax-loader.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/></dir></dir></dir></dir></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
+
<dependencies><required><php><min>5.2.0</min><max>7.9.9</max></php></required></dependencies>
|
| 18 |
</package>
|
