-
Couldn't load subscription status.
- Fork 40
Magic integration latest #524
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
Open
ChetanGN
wants to merge
78
commits into
master-2.x
Choose a base branch
from
magic_integration_latest
base: master-2.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
78 commits
Select commit
Hold shift + click to select a range
01c9e90
Magic integration
ChetanGN 1d3b68a
Commented devstack mode
ChetanGN b81cc2f
Button fix
ChetanGN 440255b
Added magic spinner
ChetanGN 96d2b0a
Handled loader in payment success
ChetanGN afc1364
Added minicart template
ChetanGN 357e03b
Removed dummy button
ChetanGN b225dbb
Added mini cart checkout
ChetanGN 3128b8b
Added cart empty check condition for minicart
ChetanGN 0a14050
Bug fix for auto discount
ChetanGN c95eaa1
Refactoring the code and handled auto coupon
ChetanGN 650a4ce
Buy now fix
ChetanGN 48a2fcf
Added magic notes in order summary
ChetanGN 97660a5
Added button changes and image fix
ChetanGN e9bffdf
Added support for auto discount
ChetanGN b0324bd
Added support for coupon apply on cart
ChetanGN 79cf8ca
Bug fix for order status update for COD payments
ChetanGN 0f52715
Merchant name fix
ChetanGN f78cf33
Sending one cc falg in checkout options and name as empty
ChetanGN e5eab62
Removed rzp offer discount update on magento order for navya
ChetanGN 2a5c184
Added merchant order id in order notes
ChetanGN 02552ee
Added support for GTM events
ChetanGN 1869ba0
Updated the php sdk version in composer
ChetanGN 81170bb
Removed debugger
ChetanGN 7d5122e
Reverted branded button from mini cart
ChetanGN 2613b8c
Added coupon widget config on magento admin panel
ChetanGN 73354f8
Passing affiliation param in GTM
ChetanGN ab9759b
Fixed the state name issue for Odisha
ChetanGN 9ee89ab
Added auto refund for out of stock inventory case and added logged in…
ChetanGN 9850a30
Modified the purchase event push data logic
ChetanGN 28ac684
Syntax issue fix
ChetanGN 3326e68
Added website logged in customer email address to order notes
ChetanGN a6c253d
Added Abandoned quote update feature
ChetanGN 638e12a
Added GSTIN field to magento order
ChetanGN f39bd80
Exit the webhook process if it's a magic order
ChetanGN 6151b93
Merge branch 'magic_integration' of github.com:razorpay/razorpay-mage…
ChetanGN b12d671
Order placement cron job in case of callback fails and AB cart pendin…
ChetanGN eb1b93e
Removed return statement in webhook file
ChetanGN 20e3555
Var defined and added GSTIN under comments
ChetanGN 9aad341
Bug fix for pondicherry state name
ChetanGN 734e719
fix synchronous order placement
nkttiwari 184f2cf
moving the function to different file
nkttiwari eea70e1
Added quote inactive logic
ChetanGN 4135b42
Bug fix and comment to identify the order placed through what process
ChetanGN 32e06c6
Considering the address line 2 as well for street address
ChetanGN 37ee1a1
Merge pull request #498 from razorpay/bugfix/fix-synchronous-order-pl…
ChetanGN 4355d13
Merge branch 'magic_integration_latest' of github.com:razorpay/razorp…
ChetanGN b83e266
Removed invoice not generated status code update from callback logic
ChetanGN eb5af64
Added retry logic in callback and address details to order comments i…
ChetanGN 87dc6f5
Bug fix for mini cart checkout button issue
ChetanGN 6e73d71
Converting item qty as int
ChetanGN 3f82c02
Added COD fee support in magento order
ChetanGN 563f1ef
Added cod fee in order comment
ChetanGN 7e190ff
Added magic-integration param
ChetanGN 7f0709b
Merge pull request #502 from razorpay/magic_cod_engine_support
ChetanGN 607f9be
Merge branch 'master-2.x' of github.com:razorpay/razorpay-magento int…
ChetanGN fc092d8
Version bump to 4.1.7 with COD support
ChetanGN 8acdbda
Merge branch 'magic_integration_latest' of github.com:razorpay/razorp…
ChetanGN db7e2ac
Updated customer consent logic
ChetanGN b3a51ae
Removed magic script from PDP and cart layout
ChetanGN fca55c7
Merge branch 'magic_integration_latest' of github.com:razorpay/razorp…
ChetanGN bbebd88
Merge pull request #503 from razorpay/add_magic_integration_param
ChetanGN 3b991d4
Updated consent fetch key and added logs
ChetanGN 3163452
Email less checkout feature support
ChetanGN 2b09f03
loader fix on order success
alex-rzp 5121193
Loader fix
ChetanGN 549eaf4
Bug fix for incomplete name of customer in order
ChetanGN ced2d14
Bug fix for address line 2 error
ChetanGN b09bde1
Bug fix for address id not found for logged in customer cart checkout
ChetanGN 21bfb9f
Minicart handling in case magic is disabled
ChetanGN cd3d353
Merge branch 'master-2.x' of github.com:razorpay/razorpay-magento int…
ChetanGN c33883b
Bug fix for cron job and status update
ChetanGN 5b25048
Handled cron fix
ChetanGN 7c1a60a
Bug fix for cart price rule discounts
ChetanGN 3cfcdcf
Status update to sales table to handle stop cron job for stock unavai…
ChetanGN 412271c
Merge branch 'master-2.x' into magic_integration_latest
ChetanGN 284c7be
Error handling and logging upgradation
ChetanGN f11c55e
Merge branch 'magic_integration_latest' of github.com:razorpay/razorp…
ChetanGN File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <?php | ||
|
|
||
| namespace Razorpay\Magento\Block\Adminhtml\Order; | ||
|
|
||
| use Magento\Sales\Block\Adminhtml\Order\Totals as MagentoOrderTotals; | ||
| use Magento\Framework\DataObject; | ||
|
|
||
| class Totals extends MagentoOrderTotals | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You should avoid inheritance. |
||
| { | ||
| public function _initTotals() | ||
| { | ||
| parent::_initTotals(); | ||
| $order = $this->getOrder(); | ||
| $customAmount = $order->getData('razorpay_cod_fee'); // Use your custom field here | ||
| if ($customAmount) { | ||
| $this->addTotal(new DataObject([ | ||
| 'code' => 'razorpay_cod_fee', | ||
| 'label' => __('COD Fee'), | ||
| 'value' => $customAmount, | ||
| 'area' => 'footer' | ||
| ]), 'shipping'); | ||
| } | ||
|
|
||
| return $this; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add strict types declaration