Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
38ab49f
Support catalog discount in combination to cart discount
BushraAsif Aug 25, 2022
d9eef09
Cancel order issues when there is no transaction and code formatting
BushraAsif Aug 25, 2022
60fc8b0
Order failing issue when applying a fixed discount on the cart
BushraAsif Aug 25, 2022
be0ab7a
Product stock not updating when order status change from cancel to pr…
BushraAsif Aug 25, 2022
fea9d63
Saved credit cards grid styling for mobile view
BushraAsif Aug 26, 2022
cdc7021
Capitalize the first letter of the configuration field
BushraAsif Aug 26, 2022
55529c4
Success page rendering issue when placing an order in incognito mode …
BushraAsif Aug 26, 2022
d7484a6
Add a button to trigger the sync of the terminals with the gateway
BushraAsif Aug 26, 2022
24c7f09
Stock quantity calculation issue
BushraAsif Aug 26, 2022
5e22289
Add configurations section to setup cron scheduler to change the stat…
BushraAsif Aug 26, 2022
f6361c8
Canceled order qty from item grid is missing
BushraAsif Aug 26, 2022
6b4f8c6
Order status set to "closed" despite the orders being in a pre-auth s…
BushraAsif Aug 26, 2022
46617a7
Order status set to "closed" for "Vipps" payment method
BushraAsif Aug 26, 2022
759b74a
Incorrect discount calculation
BushraAsif Aug 26, 2022
ca08928
Add support for Apple Pay
BushraAsif Aug 26, 2022
d44fab8
Support tax exclusive configurations.
BushraAsif Aug 26, 2022
3e5789b
Order status set to "pending" on "incomplete" response
BushraAsif Aug 26, 2022
6f61700
Release stock qty on order cancellation
BushraAsif Aug 26, 2022
306ff2b
Add configuration field for "ApplePay popup label"
BushraAsif Aug 29, 2022
898ff09
Remove unused classes
BushraAsif Aug 29, 2022
3e52349
Version update
BushraAsif Aug 29, 2022
251619e
Fix typo
BushraAsif Aug 29, 2022
d5220dc
Add missing CronConfig file
BushraAsif Aug 29, 2022
9deba14
Fix typo and update dependency classes path
BushraAsif Aug 30, 2022
5ffa1bd
Fix logo src path
BushraAsif Sep 1, 2022
cb36284
Fix order id issue
BushraAsif Sep 1, 2022
3a83b00
Update namespace for Api classes
BushraAsif Sep 5, 2022
4e2aab9
Remove undeclared parameter from the method
BushraAsif Sep 5, 2022
3a567ff
Make a text translatable
BushraAsif Sep 5, 2022
e359f5a
Remove custom logs and use magento logs
BushraAsif Sep 7, 2022
ec22f74
Typo issue
BushraAsif Sep 7, 2022
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 Block/Callback/Redirect.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ class Redirect extends Template
{
protected function _prepareLayout()
{
return $this;
}
}
2 changes: 2 additions & 0 deletions Block/Callback/Verify.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,7 @@ class Verify extends Template
protected function _prepareLayout()
{
$this->setMessage(__('OKAY'));

return $this;
}
}
78 changes: 78 additions & 0 deletions Block/System/Config/Button.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?php
/**
* Altapay Module for Magento 2.x.
*
* Copyright © 2018 Altapay. All rights reserved.
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace SDM\Altapay\Block\System\Config;

use Magento\Config\Block\System\Config\Form\Field;
use Magento\Backend\Block\Template\Context;
use Magento\Framework\Data\Form\Element\AbstractElement;
use Magento\Framework\App\RequestInterface;

class Button extends Field
{
protected $_template = 'SDM_Altapay::system/config/button.phtml';
/**
* @var RequestInterface
*/
private $request;

public function __construct(
Context $context,
RequestInterface $request,
array $data = []
)
{
parent::__construct($context, $data);
$this->request = $request;
}

/**
* @param AbstractElement $element
*
* @return mixed
*/
protected function _getElementHtml(AbstractElement $element)
{
return $this->_toHtml();
}

/**
* @return string
*/
public function getCustomUrl()
{
return $this->getUrl('sdmaltapay/system_config/button');
}

/**
* @return string
*/
public function getButtonHtml()
{
$button = $this->getLayout()->createBlock(
'Magento\Backend\Block\Widget\Button'
)->setData(
[
'id' => 'sync_button',
'label' => __('Synchronize Terminals')
]
);

return $button->toHtml();
}

/**
* @return int
*/
public function getUrlInterfaceData()
{
$request = $this->_request;

return (int) $request->getParam('store', 0);
}
}
78 changes: 78 additions & 0 deletions Block/System/Config/ChangeOrderStatusButton.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?php
/**
* Altapay Module for Magento 2.x.
*
* Copyright © 2018 Altapay. All rights reserved.
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace SDM\Altapay\Block\System\Config;

use Magento\Config\Block\System\Config\Form\Field;
use Magento\Backend\Block\Template\Context;
use Magento\Framework\Data\Form\Element\AbstractElement;
use Magento\Framework\App\RequestInterface;

class ChangeOrderStatusButton extends Field
{
protected $_template = 'SDM_Altapay::system/config/changestatusbutton.phtml';
/**
* @var RequestInterface
*/
private $request;

public function __construct(
Context $context,
RequestInterface $request,
array $data = []
)
{
parent::__construct($context, $data);
$this->request = $request;
}

/**
* @param AbstractElement $element
*
* @return mixed
*/
protected function _getElementHtml(AbstractElement $element)
{
return $this->_toHtml();
}

/**
* @return string
*/
public function getCustomUrl()
{
return $this->getUrl('sdmaltapay/system_config/changeorderstatusbutton');
}

/**
* @return string
*/
public function getButtonHtml()
{
$button = $this->getLayout()->createBlock(
'Magento\Backend\Block\Widget\Button'
)->setData(
[
'id' => 'change_order_status',
'label' => __('Change Status Now')
]
);

return $button->toHtml();
}

/**
* @return int
*/
public function getUrlInterfaceData()
{
$request = $this->_request;

return (int) $request->getParam('store', 0);
}
}
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,32 @@
# Changelog
All notable changes to this project will be documented in this file.

## [3.0.0]
**Improvements**
- Add support when cart and catalog rules are applied simultaneously
- Make text "No saved credit cards" translatable
- Add a button to trigger the sync of the terminals with the gateway
- Add configurations section to setup cron scheduler to change the status of the pending order to cancel
- Add support for Apple Pay
- Support multiple logos/icons option for terminals.

**Fixes**
- Cancel order issues when there is no transaction
- Order failing issue when applying a fixed discount on the cart
- Product stock not updating when order status change from cancel to processing
- Saved credit cards grid styling for mobile view
- Success page rendering issue when placing an order in incognito mode with the MobilePay
- Cancel order if payment_status is "released" in notification callback
- Handle empty synch button response
- Stock quantity calculation issue
- Canceled order qty from item grid is missing
- Order status set to "closed" despite the orders being in a pre-auth state.
- Order status set to "closed" for "Vipps" payment method
- Incorrect discount calculation
- Support tax exclusive configurations
- Order status set to "pending" on "incomplete" response
- Release stock qty on order cancellation

## [2.0.5]
**Fixes**
- Resolve compilation issue for Magento 2.1.9 and below
Expand Down
Loading