Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 1.8.7.1 #5

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.idea
43 changes: 34 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,56 @@
1.8.7.1
Fix truncate in orderDetail data lines
Fix error message display in checkout on payment error

1.8.7
Ajout des moyens de paiement Klarna et Oney
Correction sur affichage des logo et label des contrats dans le panier
Correction sur les retour de la notification

1.8.6.2
Add better logs in widget return
Add configuration to avoid stock increment on failed dowebpayment
Add possibility to display review on widget integration
Fix issue for saving contracts in store view
Fix issue prevent display payment methods if they are not usable in checkout
Fix issue adjust tab label if payline widget is really displayed
Fix issue zenddesk 71431
Fix redirect error


1.8.6
Ajout du bouton AmazonPay dans le panier
Refactoring de code


1.8.5.6
Prise en compte des codes retour 02016 et 02017

1.8.5.5
Correctif sur l'envoi des catgories produit (test de valorisation pour viter des notices dans les logs)
Correctif sur l'envoi des cat?gories produit (test de valorisation pour ?viter des notices dans les logs)

1.8.5.4
Valorisation du champ buyer.title de l'API partir du prfixe de l'acheteur. Valorisation de buyer.mobilePhone partir du numro renseign dans l'adresse.
Valorisation du champ buyer.title de l'API ? partir du pr?fixe de l'acheteur. Valorisation de buyer.mobilePhone ? partir du num?ro renseign? dans l'adresse.

1.8.5.3
Remise en place du rpertoire skin/frontend/base/default/ dans le package
Remise en place du r?pertoire skin/frontend/base/default/ dans le package

1.8.5.2
Ajout du statut commande "payment data mismatch" : si les donnes de paiement ne correspondent pas la commande, cette dernire est annule et passe au statut slectionn par le commerant.
Ajout du statut commande "payment data mismatch" : si les donn?es de paiement ne correspondent pas ? la commande, cette derni?re est annul?e et pass?e au statut s?lectionn? par le commer?ant.

1.8.5.1
Distinction des commandes dont le paiement est en attente

1.8.5
Modification du paiement direct :
- Utilisation de token via API AJAX pour change d'informations
- Intgration des cinmatiques 3D secure
- Utilisation de token via API AJAX pour ?change d'informations
- Int?gration des cin?matiques 3D secure
Refonte de la configuration et de la gestion des contrats

1.8.4 non publie
1.8.4 non publi?e

1.8.3.2
Monte de version librairie PHP Payline v4.44 Correctif sur la gestion du stock
Mont?e de version librairie PHP Payline v4.44 Correctif sur la gestion du stock

1.8.3.1
Monte de version librairie PHP Payline v4.43 Modification du format d'identifiant du portefeuille client
Mont?e de version librairie PHP Payline v4.43 Modification du format d'identifiant du portefeuille client
140 changes: 140 additions & 0 deletions Payline.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
<_>
<form_key>4jMWWiO9o0z9oiLD</form_key>
<name>Payline</name>
<channel>community</channel>
<version_ids>
<version_ids>2</version_ids>
</version_ids>
<summary>Paiement par carte bancaire avec Payline, par Monext.</summary>
<description>Profitez dès à présent de l’essor du marché de la vente à distance en proposant à vos clients une solution de paiement totalement sécurisée. Grâce à Payline vous permettez à vos clients de régler avec leur moyen de paiement habituel, quel que soit votre canal de vente. Vous leur proposez une interface de paiement facile à utiliser, en mesure de vous accompagner dans votre développement à l’international, en toute simplicité.

Fonctionnalités : autorisation, autorisation + capture, paiement en n fois, paiement en 1 clic, remboursement (partiel), multi-sites, multi-lingues</description>
<license>GNU General Public License (GPL)</license>
<license_uri>http://www.opensource.org/licenses/gpl-license.php</license_uri>
<version>1.8.7</version>
<stability>stable</stability>
<notes>Ajout des paiements par Oney et Klarna</notes>
<authors>
<name>
<name>Payline</name>
</name>
<user>
<user>Payline</user>
</user>
<email>
<email>[email protected]</email>
</email>
</authors>
<depends_php_min>5.0.0</depends_php_min>
<depends_php_max>6.0.0</depends_php_max>
<depends>
<package>
<name>
<name/>
</name>
<channel>
<channel/>
</channel>
<min>
<min/>
</min>
<max>
<max/>
</max>
<files>
<files> </files>
</files>
</package>
<extension>
<name>
<name>Core</name>
<name>Core</name>
</name>
<min>
<min/>
<min/>
</min>
<max>
<max/>
<max/>
</max>
</extension>
</depends>
<contents>
<target>
<target>magelocal</target>
<target>magecommunity</target>
<target>magelocale</target>
<target>magelocale</target>
<target>mageetc</target>
<target>magedesign</target>
<target>magedesign</target>
<target>magedesign</target>
<target>magedesign</target>
<target>mageskin</target>
<target>mageskin</target>
<target>mageskin</target>
<target>mageskin</target>
</target>
<path>
<path/>
<path>Monext/Payline</path>
<path>en_US/Monext_Payline.csv</path>
<path>fr_FR/Monext_Payline.csv</path>
<path>modules/Monext_Payline.xml</path>
<path>frontend/base/default/template/payline</path>
<path>frontend/base/default/layout/payline.xml</path>
<path>adminhtml/default/default/template/payline</path>
<path>adminhtml/default/default/layout/payline.xml</path>
<path>frontend/base/default/images/monext</path>
<path>frontend/base/default/css/payline.css</path>
<path>frontend/base/default/js/payline.js</path>
<path>adminhtml/default/default/payline.css</path>
</path>
<type>
<type>file</type>
<type>dir</type>
<type>file</type>
<type>file</type>
<type>file</type>
<type>dir</type>
<type>file</type>
<type>dir</type>
<type>file</type>
<type>dir</type>
<type>file</type>
<type>file</type>
<type>file</type>
</type>
<include>
<include/>
<include/>
<include/>
<include/>
<include/>
<include/>
<include/>
<include/>
<include/>
<include/>
<include/>
<include/>
<include/>
</include>
<ignore>
<ignore/>
<ignore/>
<ignore/>
<ignore/>
<ignore/>
<ignore/>
<ignore/>
<ignore/>
<ignore/>
<ignore/>
<ignore/>
<ignore/>
<ignore/>
</ignore>
</contents>
</_>
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<?php

class Monext_Payline_Block_Adminhtml_System_Config_Delivery extends Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract
{
/**
* @var Monext_Payline_Block_Adminhtml_System_Config_Renderer_Select
*/
protected $selectRenderer;

/**
* @var Monext_Payline_Block_Adminhtml_System_Config_Renderer_Shippingmethod
*/
protected $shippingMethodRenderer;

/**
* Retrieve select renderer
*
* @param null $class
* @return Monext_Payline_Block_Adminhtml_System_Config_Renderer_Select
*/
protected function _getSelectRenderer($class = null)
{
if (!isset($this->selectRenderer[$class])) {
$this->selectRenderer[$class] = $this->getLayout()->createBlock(
'payline/adminhtml_system_config_renderer_select', $class,
array('is_render_to_js_template' => true)
);
$this->selectRenderer[$class]->setClass($class);
$this->selectRenderer[$class]->setExtraParams('style="width:120px"');
}
return $this->selectRenderer[$class];
}

/**
* Retrieve shipping method renderer
*
* @return Monext_Payline_Block_Adminhtml_System_Config_Renderer_Select
*/
protected function _getShippingMethodRenderer()
{
if (!$this->shippingMethodRenderer) {
$this->shippingMethodRenderer = $this->getLayout()->createBlock(
'payline/adminhtml_system_config_renderer_shippingmethod', '',
array('is_render_to_js_template' => true)
);
$this->shippingMethodRenderer->setClass('shipping_method');
}
return $this->shippingMethodRenderer;
}

/**
* Prepare to render
*/
protected function _prepareToRender()
{
$this->addColumn('shipping_method', array(
'label' => Mage::helper('payline')->__('Shipping method'),
'style' => 'width:50px',
'renderer' => $this->_getShippingMethodRenderer()
));

$this->addColumn('deliverytime', array(
'label' => Mage::helper('payline')->__('Delivery time'),
'style' => 'width:100px',
'renderer' => $this->_getSelectRenderer('deliverytime')
));

$this->addColumn('deliverymode', array(
'label' => Mage::helper('payline')->__('Delivery mode'),
'style' => 'width:100px',
'renderer' => $this->_getSelectRenderer('deliverymode')
));

$this->addColumn('delivery_expected_delay', array(
'label' => Mage::helper('payline')->__('Delivery expected delay'),
'style' => 'width:100px',
));

$this->_addAfter = false;
$this->_addButtonLabel = Mage::helper('payline')->__('Add Configuration');
}

protected function _prepareArrayRow(Varien_Object $row)
{
$row->setData(
'option_extra_attr_' . $this->_getShippingMethodRenderer()->calcOptionHash($row->getData('shipping_method')),
'selected="selected"'
);

$row->setData(
'option_extra_attr_' . $this->_getSelectRenderer('deliverytime')->calcOptionHash($row->getData('deliverytime')),
'selected="selected"'
);

$row->setData(
'option_extra_attr_' . $this->_getSelectRenderer('deliverymode')->calcOptionHash($row->getData('deliverymode')),
'selected="selected"'
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?php

class Monext_Payline_Block_Adminhtml_System_Config_Prefix extends Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract
{
/**
* @var Monext_Payline_Block_Adminhtml_System_Config_Renderer_Prefix
*/
protected $prefixRenderer;

/**
* @var Monext_Payline_Block_Adminhtml_System_Config_Renderer_Title
*/
protected $titleRenderer;

/**
* Retrieve prefix renderer
*
* @return Monext_Payline_Block_Adminhtml_System_Config_Renderer_Prefix
*/
protected function _getPrefixRenderer()
{
if (!$this->prefixRenderer) {
$this->prefixRenderer = $this->getLayout()->createBlock(
'payline/adminhtml_system_config_renderer_prefix', '',
array('is_render_to_js_template' => true)
);
$this->prefixRenderer->setClass('prefix');
}
return $this->prefixRenderer;
}

/**
* Retrieve title renderer
*
* @return Monext_Payline_Block_Adminhtml_System_Config_Renderer_Title
*/
protected function _getTitleRenderer()
{
if (!$this->titleRenderer) {
$this->titleRenderer = $this->getLayout()->createBlock(
'payline/adminhtml_system_config_renderer_title', '',
array('is_render_to_js_template' => true)
);
$this->titleRenderer->setClass('title');
}
return $this->titleRenderer;
}

/**
* Prepare to render
*/
protected function _prepareToRender()
{
$this->addColumn('customer_prefix', array(
'label' => Mage::helper('payline')->__('Prefix'),
'renderer' => $this->_getPrefixRenderer()
));

$this->addColumn('customer_title', array(
'label' => Mage::helper('payline')->__('Title'),
'renderer' => $this->_getTitleRenderer()
));

$this->_addAfter = false;
$this->_addButtonLabel = Mage::helper('payline')->__('Add Configuration');
}

protected function _prepareArrayRow(Varien_Object $row)
{
$row->setData(
'option_extra_attr_' . $this->_getPrefixRenderer()->calcOptionHash($row->getData('customer_prefix')),
'selected="selected"'
);

$row->setData(
'option_extra_attr_' . $this->_getTitleRenderer()->calcOptionHash($row->getData('customer_title')),
'selected="selected"'
);
}
}
Loading