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

V2 release #47

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3cafbdc
Added edit subscription for admin
sonyy-m Dec 29, 2021
cb4a23c
Add webhook events for failed payments
Jan 10, 2022
152803f
Add webhook events for resume subscriptions
Jan 12, 2022
8a5d7a5
Merge pull request #37 from razorpay/failed_payment_webhook
Feb 4, 2022
fb51bcc
Merge pull request #35 from razorpay/admin_edit_subscription
Feb 4, 2022
91650f1
Escape function with return
sofiya02 Jan 18, 2022
ff91325
replaced global variable with Magento php enviroment request
sofiya02 Jan 18, 2022
82a6e39
changed gobal variable
sofiya02 Jan 19, 2022
5f99a41
format and chnages as per magento marketplace report
sofiya02 Jan 25, 2022
44e5a6a
Rebuilt plan creation in admin
Jan 20, 2022
3cb5078
Fixed back button url
Jan 20, 2022
51bcc68
Renamed `edit` to `readonly` in plan form edit
Jan 25, 2022
9259030
Refactored plan creation with searchable dropdown
Jan 28, 2022
d820d9f
Removed commented code and unused files
Jan 28, 2022
5307136
Review changes
Feb 1, 2022
eaad98e
Removed Edit file
Feb 1, 2022
0052164
removed .DS_Store file
Feb 1, 2022
ebfe65a
Api/.DS_Store
Feb 1, 2022
9acc2db
Fixed PHP 7.3 issue and added `BaseController` for calling Razorpay api
Feb 3, 2022
209562e
Review Changes
Feb 3, 2022
924d893
sorting plan and subscription list with entity_id
sofiya02 Feb 3, 2022
3f30e53
Removed .idea files
Feb 4, 2022
3f4ae7a
Merge pull request #41 from razorpay/admin_plan_creation
Feb 4, 2022
3b16767
Updated change log
Feb 4, 2022
c74647d
Merge branch 'v2_release' of github.com:razorpay/subscriptions-magent…
Feb 4, 2022
f1b8c4b
Fixed plan edit issue
Feb 8, 2022
a174907
Fetching only active plan on subscription edit
Feb 8, 2022
988c19b
Fixed issue when shipping charges is 0
Feb 11, 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
10 changes: 5 additions & 5 deletions Api/Data/SubscribInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,39 +51,39 @@ public function getId();
/**
* Set SubscriptionId
*
* @param string $SubscriptionId
* @param string $SubscriptionId
* @return $this
*/
public function setSubscriptionId($SubscriptionId);

/**
* Set Status
*
* @param string $status
* @param string $status
* @return $this
*/
public function setStatus($status);

/**
* Set Value
*
* @param string $value
* @param string $value
* @return $this
*/
public function setValue($value);

/**
* Set Crated At
*
* @param int $nextChargeAt
* @param int $nextChargeAt
* @return $this
*/
public function setNextChargeAt($nextChargeAt);

/**
* Set ID
*
* @param int $id
* @param int $id
* @return $this
*/
public function setId($id);
Expand Down
98 changes: 0 additions & 98 deletions Block/Adminhtml/Plan/Edit.php

This file was deleted.

37 changes: 37 additions & 0 deletions Block/Adminhtml/Plan/Edit/Button/Generic.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?php

namespace Razorpay\Subscription\Block\Adminhtml\Plan\Edit\Button;

use Magento\Backend\Block\Widget\Context;
use Magento\Framework\Exception\NoSuchEntityException;

class Generic
{
protected $context;

/**
* @param Context $context
*/
public function __construct(Context $context)
{
$this->context = $context;
}

/**
* @return mixed
*/
public function getEntityId()
{
return $this->context->getRequest()->getParam('entity_id');
}

/**
* @param $route
* @param $params
* @return mixed
*/
public function getUrl($route = '', $params = [])
{
return $this->context->getUrlBuilder()->getUrl($route, $params);
}
}
26 changes: 26 additions & 0 deletions Block/Adminhtml/Plan/Edit/Button/Save.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php
namespace Razorpay\Subscription\Block\Adminhtml\Plan\Edit\Button;

use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;

/**
* Class Save
*/
class Save extends Generic implements ButtonProviderInterface
{
/**
* @return array
*/
public function getButtonData()
{
return [
'label' => __('Save'),
'class' => 'save primary',
'data_attribute' => [
'mage-init' => ['button' => ['event' => 'save']],
'form-role' => 'save',
],
'sort_order' => 90,
];
}
}
Loading