Commit Graph

560 Commits

Author SHA1 Message Date
And Finally 608f4ef44e Merge branch 'trunk' into update/marketplace-1
# Conflicts:
#	tests/e2e/core-tests/specs/merchant/wp-admin-extensions-connect-wccom.test.js
2021-08-10 16:02:18 +01:00
jonathansadowski 7ef09ba1be
Merge pull request #30423 from woocommerce/fix/29630
Fix variations menu order not applying correctly when manually set cl…
2021-08-09 14:32:21 -05:00
Roy Ho cc106854b4
Merge pull request #30448 from alexmigf/master
New hook for product external options
2021-08-06 16:28:34 +01:00
roykho 3d37ac60bf
Fix variations menu order not applying correctly when manually set closes #29630 2021-08-04 09:03:35 -07:00
Roy Ho 5a70e26541
Merge pull request #29470 from Quy/patch-1
Remove trailing colon when checkbox is before label
2021-07-22 16:16:47 +01:00
Alexandre Faustino 31ac6db10f New hook for product external options 2021-07-07 10:41:40 +01:00
Job 03a01b5e06
Update html-order-items.php 2021-06-09 12:55:13 +02:00
Job b020ac8814
"Pending payment" instead of "Pending" as the correct status
The tooltip suggests changing the status to "Pending" while the name of the status that is in the dropdown higher up is "Pending payment". This update changes that.
2021-06-09 11:54:37 +02:00
Vedanshu Jain 6667233eb1
Merge pull request #29762 from woocommerce/fix/29502
Update restock logic during refunds closes #29502
2021-05-21 22:53:22 +05:30
vedanshujain 18411d2b3b Add code comments for confusing changes. 2021-05-07 14:30:45 +05:30
vedanshujain 833193b7f7 Round tax amount appropriately before displaying.
We have special method to round taxes which may round up or round down depending upon settings. This method should be used instead of default rounding in formatting funtions.
2021-05-07 14:30:45 +05:30
roykho 7105a7a17e
Update restock logic during refunds closes #29502 2021-04-23 12:14:51 -07:00
Quy f0cc75223d
Remove colon since checkbox is before label 2021-03-23 14:00:50 -07:00
Roy Ho e62f20b9b3
Merge pull request #29049 from wppunk/master
Fix #29048
2021-03-17 13:46:19 -07:00
Peter Fabian cb6e0d8201 Don't echo the strings, return them for later use. 2021-03-16 13:01:15 +01:00
Peter Fabian a2e9c055d5 Make the inherited values explicit by stating where it comes from. 2021-03-16 12:39:25 +01:00
Peter Fabian f33c80186f Updated the wording of the tooltip. 2021-03-16 08:51:29 +01:00
Peter Fabian bb5c56c148 Set correct placeholder value for variation--first the parent, then the store-wide default. 2021-03-15 18:41:55 +01:00
Peter Fabian 2ae5ec59ba Improve the description of the low stock threshold tooltip. 2021-03-15 12:42:10 +01:00
Peter Fabian 1f8f8580d1 Better wording of the tooltip--being more specific about what the amount relates to. 2021-03-11 16:26:41 +01:00
Peter Fabian f7755f123e Enable bulk updates of variations with low stock amount. 2021-03-10 18:15:31 +01:00
Peter Fabian b92d1d1391 Harmonize the id and name with simple product. 2021-03-10 15:38:49 +01:00
Peter Fabian a6b45d08bf Added low stock threshold input to the Admin UI. 2021-03-10 11:47:22 +01:00
Max WP Punk 585d96f237
Fix #29048 2021-02-08 03:28:43 +02:00
Roy Ho 89efae43a1
Merge pull request #28416 from woocommerce/fix/issue-27154
Fix/issue 27154
2020-11-30 06:14:15 -08:00
OlegApanovich 26dae12279 Fix toggle chevron issue in admin edit product data attribute section #27923
After chevron clicking on attribute section complete edit product data section toggled insted cliackig area.
Key point issue is missing 'postbox' class of wordpress postbox.js library for a attribute block that we try to toggle.
2020-11-27 11:50:44 +02:00
roykho 3981377809
Strip the tags from product description on all other select2 fields that performs searches 2020-11-25 13:32:50 -08:00
Claudio Sanches 3377c60c5e
Merge pull request #27433 from woocommerce/fix/remove-relative-include-paths
Change relative include paths to absolute include paths
2020-09-17 13:15:40 -03:00
Claudio Sanches c4ccc38780 Fixed use __DIR__ for relative paths 2020-08-26 18:46:44 -03:00
Romario 67a178f4f7 Replace 'DIRECTORY_SEPARATOR' with '/' 2020-08-26 15:50:34 -05:00
Hayden Whiteman 3fca3caf1d Fix #27413 2020-08-22 19:35:13 +12:00
Romario 073c63c9c4 Replace dirname with __DIR__ and add DIRECTORY_SEPARATOR
Previously 'dirname(  __FILE__ )' was used to import files, however, the directory separator was missing.

This commit replaces 'dirname(  __FILE__ )' that was introduced in 5370d02484 with __DIR__  and added DIRECTORY_SEPARATOR
2020-08-21 15:16:26 -05:00
Romario 5370d02484 Change relative include paths to absolute include paths
Relative include paths in PHP can break whenever the server is running opcache.  As such, WordPress.com deploy system refuses to include WooCommerce because of that issue.

This commit changes the relative include paths to absolute include paths.

Relates to #27269
2020-08-20 15:32:04 -05:00
Claudio Sanches 525db3aa21 Fixed incorrect package tags 2020-08-05 17:49:10 -03:00
Claudio Sanches d48f1d4e2e Fixed package tag usage 2020-08-05 13:36:24 -03:00
Claudio Sanches cc8282a23f
Merge pull request #27142 from woocommerce/fix/25788
Improve order details UI to highlight "Paid" and "Net Payment" sections
2020-07-30 15:49:24 -03:00
Claudio Sanches 77f8bb57a6 Check if there's a payment method title 2020-07-30 13:05:03 -03:00
Néstor Soriano 0f134ca6a2
Merge pull request #27054 from woocommerce/fix/27036
add/update correct deprecated notices on existing deprecations
2020-07-29 15:20:24 +02:00
Claudio Sanches 008e41170b Improved UX to highlight order data when there's some refund 2020-07-28 15:13:00 -03:00
Claudio Sanches 134ab5c184 Fixed coding standards 2020-07-27 20:21:41 -03:00
Claudio Sanches 4f90307e2e Fixed "Paid By Customer" data when the orders contains refunds 2020-07-27 20:18:33 -03:00
vedanshujain cd09e91817 Applied coding standards 2020-07-24 19:12:25 +05:30
vedanshujain 853539df12 Remove wc_round_tax_total from shipping item because shipping price are never inclusive of taxes 2020-07-24 19:12:24 +05:30
Ron Rennick 5ee0eccb7b add/update correct deprecated notices on existing deprecations 2020-07-16 17:13:08 -03:00
vedanshujain 8ded6a3057 Applied coding standards 2020-07-01 19:09:50 +05:30
Peter Fabian 14a26aca2c Update min files and selectWoo 2020-06-16 17:15:12 +02:00
Rodrigo Primo 44ecb0ec9e Only display the "Paid by customer" section if the order has been paid
This commit changes the condition in the if the statement that decides
whether or not to display the "Paid by customer" section in the order admin
page. Before it, this section was displayed for all orders that
contained one of the following statuses: 'processing', 'completed' or 'refunded'.

The problem with this approach is that offline payment gateways, like
'Cash on Delivery', set the order status to processing when the order is
placed but before the customer pays for it. So the "Paid by customer"
section was being displayed in some cases where the order was not
actually paid yet creating a confusing experience to store managers.

To fix this, this commit also checks for the presence of the
`_date_paid` order meta. If this order meta is present and the order
status corresponds to one of the three statuses listed above, it means that
the order has been paid and we can display the "Paid by customer"
section. If this order meta is not present, we don't display the "Paid
by customer" section.
2020-02-05 16:08:13 -03:00
Peter Fabian 147266f44f Updates to reflect PR feedback. 2020-02-04 21:43:29 +01:00
Peter Fabian 5001e14086 Renamed Discounts to Coupons. 2020-02-04 18:27:53 +01:00
Peter Fabian d588218eb6 PHPCS 2020-02-03 23:18:12 +01:00