Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
01c9e90
Magic integration
ChetanGN Mar 5, 2024
1d3b68a
Commented devstack mode
ChetanGN Mar 6, 2024
b81cc2f
Button fix
ChetanGN Mar 6, 2024
440255b
Added magic spinner
ChetanGN Mar 6, 2024
96d2b0a
Handled loader in payment success
ChetanGN Mar 6, 2024
afc1364
Added minicart template
ChetanGN Mar 10, 2024
357e03b
Removed dummy button
ChetanGN Mar 12, 2024
b225dbb
Added mini cart checkout
ChetanGN Mar 12, 2024
3128b8b
Added cart empty check condition for minicart
ChetanGN Mar 13, 2024
0a14050
Bug fix for auto discount
ChetanGN Mar 14, 2024
c95eaa1
Refactoring the code and handled auto coupon
ChetanGN Mar 18, 2024
650a4ce
Buy now fix
ChetanGN Mar 18, 2024
48a2fcf
Added magic notes in order summary
ChetanGN Mar 26, 2024
97660a5
Added button changes and image fix
ChetanGN Apr 4, 2024
e9bffdf
Added support for auto discount
ChetanGN Apr 4, 2024
b0324bd
Added support for coupon apply on cart
ChetanGN Apr 4, 2024
79cf8ca
Bug fix for order status update for COD payments
ChetanGN Apr 5, 2024
0f52715
Merchant name fix
ChetanGN Apr 5, 2024
f78cf33
Sending one cc falg in checkout options and name as empty
ChetanGN Apr 5, 2024
e5eab62
Removed rzp offer discount update on magento order for navya
ChetanGN Apr 6, 2024
2a5c184
Added merchant order id in order notes
ChetanGN Apr 7, 2024
02552ee
Added support for GTM events
ChetanGN Apr 12, 2024
1869ba0
Updated the php sdk version in composer
ChetanGN Apr 12, 2024
81170bb
Removed debugger
ChetanGN Apr 12, 2024
7d5122e
Reverted branded button from mini cart
ChetanGN Apr 12, 2024
2613b8c
Added coupon widget config on magento admin panel
ChetanGN Apr 18, 2024
73354f8
Passing affiliation param in GTM
ChetanGN Apr 18, 2024
ab9759b
Fixed the state name issue for Odisha
ChetanGN Apr 23, 2024
9ee89ab
Added auto refund for out of stock inventory case and added logged in…
ChetanGN May 2, 2024
9850a30
Modified the purchase event push data logic
ChetanGN May 2, 2024
28ac684
Syntax issue fix
ChetanGN May 2, 2024
3326e68
Added website logged in customer email address to order notes
ChetanGN May 15, 2024
a6c253d
Added Abandoned quote update feature
ChetanGN May 22, 2024
638e12a
Added GSTIN field to magento order
ChetanGN May 24, 2024
f39bd80
Exit the webhook process if it's a magic order
ChetanGN Jun 21, 2024
6151b93
Merge branch 'magic_integration' of github.com:razorpay/razorpay-mage…
ChetanGN Jun 27, 2024
b12d671
Order placement cron job in case of callback fails and AB cart pendin…
ChetanGN Jul 5, 2024
eb1b93e
Removed return statement in webhook file
ChetanGN Jul 11, 2024
20e3555
Var defined and added GSTIN under comments
ChetanGN Jul 24, 2024
9aad341
Bug fix for pondicherry state name
ChetanGN Aug 2, 2024
734e719
fix synchronous order placement
nkttiwari Aug 13, 2024
184f2cf
moving the function to different file
nkttiwari Aug 16, 2024
eea70e1
Added quote inactive logic
ChetanGN Aug 20, 2024
4135b42
Bug fix and comment to identify the order placed through what process
ChetanGN Aug 20, 2024
32e06c6
Considering the address line 2 as well for street address
ChetanGN Aug 20, 2024
37ee1a1
Merge pull request #498 from razorpay/bugfix/fix-synchronous-order-pl…
ChetanGN Aug 20, 2024
4355d13
Merge branch 'magic_integration_latest' of github.com:razorpay/razorp…
ChetanGN Aug 20, 2024
b83e266
Removed invoice not generated status code update from callback logic
ChetanGN Aug 21, 2024
eb5af64
Added retry logic in callback and address details to order comments i…
ChetanGN Aug 26, 2024
87dc6f5
Bug fix for mini cart checkout button issue
ChetanGN Aug 29, 2024
6e73d71
Converting item qty as int
ChetanGN Aug 29, 2024
3f82c02
Added COD fee support in magento order
ChetanGN Sep 18, 2024
563f1ef
Added cod fee in order comment
ChetanGN Sep 19, 2024
7e190ff
Added magic-integration param
ChetanGN Sep 19, 2024
7f0709b
Merge pull request #502 from razorpay/magic_cod_engine_support
ChetanGN Sep 23, 2024
607f9be
Merge branch 'master-2.x' of github.com:razorpay/razorpay-magento int…
ChetanGN Sep 23, 2024
fc092d8
Version bump to 4.1.7 with COD support
ChetanGN Sep 23, 2024
8acdbda
Merge branch 'magic_integration_latest' of github.com:razorpay/razorp…
ChetanGN Sep 23, 2024
db7e2ac
Updated customer consent logic
ChetanGN Oct 8, 2024
b3a51ae
Removed magic script from PDP and cart layout
ChetanGN Oct 8, 2024
fca55c7
Merge branch 'magic_integration_latest' of github.com:razorpay/razorp…
ChetanGN Oct 8, 2024
bbebd88
Merge pull request #503 from razorpay/add_magic_integration_param
ChetanGN Oct 8, 2024
3b991d4
Updated consent fetch key and added logs
ChetanGN Oct 16, 2024
3163452
Email less checkout feature support
ChetanGN Dec 5, 2024
2b09f03
loader fix on order success
alex-rzp Dec 13, 2024
5121193
Loader fix
ChetanGN Dec 13, 2024
549eaf4
Bug fix for incomplete name of customer in order
ChetanGN Dec 17, 2024
ced2d14
Bug fix for address line 2 error
ChetanGN Dec 17, 2024
b09bde1
Bug fix for address id not found for logged in customer cart checkout
ChetanGN Dec 17, 2024
21bfb9f
Minicart handling in case magic is disabled
ChetanGN Dec 19, 2024
cd3d353
Merge branch 'master-2.x' of github.com:razorpay/razorpay-magento int…
ChetanGN Jan 2, 2025
c33883b
Bug fix for cron job and status update
ChetanGN Jan 7, 2025
5b25048
Handled cron fix
ChetanGN Feb 12, 2025
7c1a60a
Bug fix for cart price rule discounts
ChetanGN Feb 14, 2025
3cfcdcf
Status update to sales table to handle stop cron job for stock unavai…
ChetanGN Feb 14, 2025
412271c
Merge branch 'master-2.x' into magic_integration_latest
ChetanGN Apr 14, 2025
284c7be
Error handling and logging upgradation
ChetanGN Apr 16, 2025
f11c55e
Merge branch 'magic_integration_latest' of github.com:razorpay/razorp…
ChetanGN Apr 16, 2025
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
26 changes: 26 additions & 0 deletions Block/Adminhtml/Order/Totals.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add strict types declaration


namespace Razorpay\Magento\Block\Adminhtml\Order;

use Magento\Sales\Block\Adminhtml\Order\Totals as MagentoOrderTotals;
use Magento\Framework\DataObject;

class Totals extends MagentoOrderTotals

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should avoid inheritance.
In this specific case, you should use Magento built-in composition for adding custom Totals.

{
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;
}
}
1 change: 1 addition & 0 deletions Constants/OrderCronStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ class OrderCronStatus
const INVOICE_GENERATED = 3;
const INVOICE_GENERATION_NOT_POSSIBLE = 4;
const PAYMENT_AUTHORIZED_CRON_REPEAT = 5;
const ORDER_NOT_PLACED_DUE_TO_STOCK_UNAVAILABILITY = 6;
}
Loading