From 1075382575298ad03d3963870b45e8ed4caa94a0 Mon Sep 17 00:00:00 2001 From: OlegApanovich Date: Thu, 19 Nov 2020 00:31:51 +0200 Subject: [PATCH 001/249] Fix filter woocommerce_shipping_rate_cost backwards compatible with cart taxes #28008 --- includes/class-wc-tax.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/includes/class-wc-tax.php b/includes/class-wc-tax.php index f80a7d8422d..b8fe9f72f1e 100644 --- a/includes/class-wc-tax.php +++ b/includes/class-wc-tax.php @@ -82,7 +82,13 @@ class WC_Tax { * @return array */ public static function calc_shipping_tax( $price, $rates ) { + // Backwards compatible from WC_Shipping_Rate::get_cost(). + if ( has_filter( 'woocommerce_shipping_rate_cost' ) ) { + $rate = new WC_Shipping_Rate(); + $price = $rate->get_cost(); + } $taxes = self::calc_exclusive_tax( $price, $rates ); + return apply_filters( 'woocommerce_calc_shipping_tax', $taxes, $price, $rates ); } From 142fafc60eb0c266357c0c8772061ce942e8e77b Mon Sep 17 00:00:00 2001 From: jjchrisdiehl Date: Tue, 26 Jan 2021 09:42:05 -0500 Subject: [PATCH 002/249] Adding Venezuelan states --- i18n/states.php | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/i18n/states.php b/i18n/states.php index cda1e51e4aa..25fdd505ba8 100644 --- a/i18n/states.php +++ b/i18n/states.php @@ -1735,6 +1735,33 @@ return array( 'AE' => __( 'Armed Forces (AE)', 'woocommerce' ), 'AP' => __( 'Armed Forces (AP)', 'woocommerce' ), ), + 'VE' => array( // Venezuela States. Ref: https://en.wikipedia.org/wiki/ISO_3166-2:VE + 'W' => __( 'Dependencias Federales', 'woocommerce' ), + 'A' => __( 'Distrito Capital', 'woocommerce' ), + 'Z' => __( 'Amazonas', 'woocommerce' ), + 'B' => __( 'Anzoátegui', 'woocommerce' ), + 'C' => __( 'Apure', 'woocommerce' ), + 'D' => __( 'Aragua', 'woocommerce' ), + 'E' => __( 'Barinas', 'woocommerce' ), + 'F' => __( 'Bolívar', 'woocommerce' ), + 'G' => __( 'Carabobo', 'woocommerce' ), + 'H' => __( 'Cojedes', 'woocommerce' ), + 'Y' => __( 'Delta Amacuro', 'woocommerce' ), + 'I' => __( 'Falcón', 'woocommerce' ), + 'J' => __( 'Guárico', 'woocommerce' ), + 'K' => __( 'Lara', 'woocommerce' ), + 'L' => __( 'Mérida', 'woocommerce' ), + 'M' => __( 'Miranda', 'woocommerce' ), + 'N' => __( 'Monagas', 'woocommerce' ), + 'O' => __( 'Nueva Esparta', 'woocommerce' ), + 'P' => __( 'Portuguesa', 'woocommerce' ), + 'R' => __( 'Sucre', 'woocommerce' ), + 'S' => __( 'Táchira', 'woocommerce' ), + 'T' => __( 'Trujillo', 'woocommerce' ), + 'X' => __( 'La Guaira', 'woocommerce' ), + 'U' => __( 'Yaracuy', 'woocommerce' ), + 'V' => __( 'Zulia', 'woocommerce' ), + ), 'VN' => array(), 'YT' => array(), 'ZA' => array( // South African states. From 7a892f61d28f1c10ad198f3626bc12e5b0211958 Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Wed, 3 Mar 2021 19:52:29 -0400 Subject: [PATCH 003/249] update shared objects among models - add optional defaultKey, defaultValue to meta data - move REST _links object to model shared - add _links collection to coupons --- tests/e2e/api/src/models/coupons/coupon.ts | 11 +++ .../src/models/products/abstract/common.ts | 8 +-- .../api/src/models/products/abstract/data.ts | 8 +-- .../api/src/models/products/shared/classes.ts | 56 --------------- .../e2e/api/src/models/products/variation.ts | 8 +-- tests/e2e/api/src/models/shared-types.ts | 70 +++++++++++++++++++ .../repositories/rest/coupons/transformer.ts | 1 + tests/e2e/api/src/repositories/rest/shared.ts | 7 ++ 8 files changed, 101 insertions(+), 68 deletions(-) diff --git a/tests/e2e/api/src/models/coupons/coupon.ts b/tests/e2e/api/src/models/coupons/coupon.ts index a0ee904de29..20e3f42ee9b 100644 --- a/tests/e2e/api/src/models/coupons/coupon.ts +++ b/tests/e2e/api/src/models/coupons/coupon.ts @@ -12,6 +12,7 @@ import { import { CouponUpdateParams, } from './shared'; +import { ObjectLinks } from '../shared-types'; /** * The parameters embedded in this generic can be used in the ModelRepository in order to give @@ -222,6 +223,16 @@ export class Coupon extends Model { */ public readonly usedBy: Array = []; + /** + * The coupon's links. + * + * @type {ReadonlyArray.} + */ + public readonly links: ObjectLinks = { + collection: [ { href: '' } ], + self: [ { href: '' } ], + }; + /** * Creates a new coupon instance with the given properties * diff --git a/tests/e2e/api/src/models/products/abstract/common.ts b/tests/e2e/api/src/models/products/abstract/common.ts index 88601fa6ad0..4f9833f8eab 100644 --- a/tests/e2e/api/src/models/products/abstract/common.ts +++ b/tests/e2e/api/src/models/products/abstract/common.ts @@ -3,9 +3,9 @@ import { ModelID } from '../../model'; import { CatalogVisibility, ProductTerm, - ProductLinks, ProductAttribute, } from '../shared'; +import { ObjectLinks } from '../../shared-types'; /** * The common parameters that all products can use in search. @@ -137,11 +137,11 @@ export abstract class AbstractProduct extends AbstractProductData { public readonly attributes: readonly ProductAttribute[] = []; /** - * The products links. + * The product's links. * - * @type {ReadonlyArray.} + * @type {ReadonlyArray.} */ - public readonly links: ProductLinks = { + public readonly links: ObjectLinks = { collection: [ { href: '' } ], self: [ { href: '' } ], }; diff --git a/tests/e2e/api/src/models/products/abstract/data.ts b/tests/e2e/api/src/models/products/abstract/data.ts index 0d1b83cb37e..e76c1c7d9d8 100644 --- a/tests/e2e/api/src/models/products/abstract/data.ts +++ b/tests/e2e/api/src/models/products/abstract/data.ts @@ -1,6 +1,6 @@ import { Model } from '../../model'; -import { MetaData, PostStatus } from '../../shared-types'; -import { ProductImage, ProductLinks } from '../shared'; +import { MetaData, PostStatus, ObjectLinks } from '../../shared-types'; +import { ProductImage } from '../shared'; /** * Base product data. @@ -93,9 +93,9 @@ export abstract class AbstractProductData extends Model { /** * The product data links. * - * @type {ReadonlyArray.} + * @type {ReadonlyArray.} */ - public readonly links: ProductLinks = { + public readonly links: ObjectLinks = { collection: [ { href: '' } ], self: [ { href: '' } ], }; diff --git a/tests/e2e/api/src/models/products/shared/classes.ts b/tests/e2e/api/src/models/products/shared/classes.ts index 7343c594352..c08e0a20b70 100644 --- a/tests/e2e/api/src/models/products/shared/classes.ts +++ b/tests/e2e/api/src/models/products/shared/classes.ts @@ -208,59 +208,3 @@ export class ProductImage { Object.assign( this, properties ); } } - -/** - * A product link item. - */ -class ProductLinkItem { - /** - * The options which are available for the attribute. - * - * @type {ReadonlyArray.} - */ - public readonly href: string = ''; - - /** - * Creates a new product link item. - * - * @param {Partial.} properties The properties to set. - */ - public constructor( properties?: Partial< ProductLinkItem > ) { - Object.assign( this, properties ); - } -} - -/** - * A product's links. - */ -export class ProductLinks { - /** - * The collection containing the product. - * - * @type {ReadonlyArray.} - */ - public readonly collection: readonly ProductLinkItem[] = []; - - /** - * Self referential link to the product. - * - * @type {ReadonlyArray.} - */ - public readonly self: readonly ProductLinkItem[] = []; - - /** - * The link to the parent. - * - * @type {ReadonlyArray.} - */ - public readonly up?: readonly ProductLinkItem[] = []; - - /** - * Creates a new product link list. - * - * @param {Partial.} properties The properties to set. - */ - public constructor( properties?: Partial< ProductLinks > ) { - Object.assign( this, properties ); - } -} diff --git a/tests/e2e/api/src/models/products/variation.ts b/tests/e2e/api/src/models/products/variation.ts index 78e8580c2fa..beb1bad8071 100644 --- a/tests/e2e/api/src/models/products/variation.ts +++ b/tests/e2e/api/src/models/products/variation.ts @@ -15,13 +15,13 @@ import { ProductPriceUpdateParams, ProductSalesTaxUpdateParams, ProductShippingUpdateParams, - ProductLinks, Taxability, ProductDownload, StockStatus, BackorderStatus, ProductDefaultAttribute, } from './shared'; +import { ObjectLinks } from '../shared-types'; import { CreatesChildModels, DeletesChildModels, @@ -149,11 +149,11 @@ export class ProductVariation extends AbstractProductData implements public readonly shippingClassId: number = 0; /** - * The variation links. + * The variation's links. * - * @type {ReadonlyArray.} + * @type {ReadonlyArray.} */ - public readonly links: ProductLinks = { + public readonly links: ObjectLinks = { collection: [ { href: '' } ], self: [ { href: '' } ], up: [ { href: '' } ], diff --git a/tests/e2e/api/src/models/shared-types.ts b/tests/e2e/api/src/models/shared-types.ts index 5f64fff0b72..d041f3c48c8 100644 --- a/tests/e2e/api/src/models/shared-types.ts +++ b/tests/e2e/api/src/models/shared-types.ts @@ -35,6 +35,20 @@ export class MetaData extends Model { */ public readonly value: any = ''; + /** + * The key of the metadata. + * + * @type {string} + */ + public readonly displayKey?: string = ''; + + /** + * The value of the metadata. + * + * @type {*} + */ + public readonly displayValue?: string = ''; + /** * Creates a new metadata. * @@ -45,3 +59,59 @@ export class MetaData extends Model { Object.assign( this, properties ); } } + +/** + * An object link item. + */ +class LinkItem { + /** + * The href of the link. + * + * @type {ReadonlyArray.} + */ + public readonly href: string = ''; + + /** + * Creates a new product link item. + * + * @param {Partial.} properties The properties to set. + */ + public constructor( properties?: Partial< LinkItem > ) { + Object.assign( this, properties ); + } +} + +/** + * An object's links. + */ +export class ObjectLinks { + /** + * The collection containing the object. + * + * @type {ReadonlyArray.} + */ + public readonly collection: readonly LinkItem[] = []; + + /** + * Self referential link to the object. + * + * @type {ReadonlyArray.} + */ + public readonly self: readonly LinkItem[] = []; + + /** + * The link to the parent object. + * + * @type {ReadonlyArray.} + */ + public readonly up?: readonly LinkItem[] = []; + + /** + * Creates a new product link list. + * + * @param {Partial.} properties The properties to set. + */ + public constructor( properties?: Partial< ObjectLinks > ) { + Object.assign( this, properties ); + } +} diff --git a/tests/e2e/api/src/repositories/rest/coupons/transformer.ts b/tests/e2e/api/src/repositories/rest/coupons/transformer.ts index b3827471242..8e0c7d85eb9 100644 --- a/tests/e2e/api/src/repositories/rest/coupons/transformer.ts +++ b/tests/e2e/api/src/repositories/rest/coupons/transformer.ts @@ -57,6 +57,7 @@ export function createCouponTransformer(): ModelTransformer< Coupon > { maximumAmount: 'maximum_amount', emailRestrictions: 'email_restrictions', usedBy: 'used_by', + links: '_links', }, ), ], diff --git a/tests/e2e/api/src/repositories/rest/shared.ts b/tests/e2e/api/src/repositories/rest/shared.ts index 1d52d73ec3d..3c4e976d177 100644 --- a/tests/e2e/api/src/repositories/rest/shared.ts +++ b/tests/e2e/api/src/repositories/rest/shared.ts @@ -16,6 +16,7 @@ import { CreateChildFn, ModelTransformer, IgnorePropertyTransformation, + KeyChangeTransformation, // @ts-ignore ModelParentID, } from '../../framework'; @@ -34,6 +35,12 @@ export function createMetaDataTransformer(): ModelTransformer< MetaData > { return new ModelTransformer( [ new IgnorePropertyTransformation( [ 'id' ] ), + new KeyChangeTransformation< MetaData >( + { + displayKey: 'display_key', + displayValue: 'display_value', + }, + ), ], ); } From 03c60b988b086b15e23e8760e9c67eb9a65a33b9 Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Fri, 5 Mar 2021 10:39:35 -0400 Subject: [PATCH 004/249] add order classes --- tests/e2e/api/src/models/orders/index.ts | 1 + .../api/src/models/orders/shared/classes.ts | 412 ++++++++++++++++++ .../e2e/api/src/models/orders/shared/index.ts | 2 + .../e2e/api/src/models/orders/shared/types.ts | 3 + 4 files changed, 418 insertions(+) create mode 100644 tests/e2e/api/src/models/orders/index.ts create mode 100644 tests/e2e/api/src/models/orders/shared/classes.ts create mode 100644 tests/e2e/api/src/models/orders/shared/index.ts create mode 100644 tests/e2e/api/src/models/orders/shared/types.ts diff --git a/tests/e2e/api/src/models/orders/index.ts b/tests/e2e/api/src/models/orders/index.ts new file mode 100644 index 00000000000..c3da79f741b --- /dev/null +++ b/tests/e2e/api/src/models/orders/index.ts @@ -0,0 +1 @@ +export * from './shared'; diff --git a/tests/e2e/api/src/models/orders/shared/classes.ts b/tests/e2e/api/src/models/orders/shared/classes.ts new file mode 100644 index 00000000000..3852519b94c --- /dev/null +++ b/tests/e2e/api/src/models/orders/shared/classes.ts @@ -0,0 +1,412 @@ +import { MetaData } from '../../shared-types'; +import { Model } from '../../model'; +import { TaxStatus } from './types'; + +/** + * Order item meta. + */ +export class OrderItemMeta extends Model { + /** + * The meta data the order item. + * + * @type {ReadonlyArray.} + */ + public readonly metaData: MetaData[] = []; +} + +/** + * Order line item tax entry. + */ +export class OrderItemTax extends Model { + /** + * The total tax for this tax rate on this item. + * + * @type {string} + */ + public readonly total: string = ''; + + /** + * The subtotal tax for this tax rate on this item. + * + * @type {string} + */ + public readonly subtotal: string = ''; +} + +/** + * An order address. + */ +export class OrderAddress { + /** + * The first name of the person in the address. + * + * @type {string} + */ + public readonly firstName: string = ''; + + /** + * The last name of the person in the address. + * + * @type {string} + */ + public readonly lastName: string = ''; + + /** + * The company name of the person in the address. + * + * @type {string} + */ + public readonly companyName: string = ''; + + /** + * The first address line in the address. + * + * @type {string} + */ + public readonly address1: string = ''; + + /** + * The second address line in the address. + * + * @type {string} + */ + public readonly address2: string = ''; + + /** + * The city in the address. + * + * @type {string} + */ + public readonly city: string = ''; + + /** + * The state in the address. + * + * @type {string} + */ + public readonly state: string = ''; + + /** + * The postal code in the address. + * + * @type {string} + */ + public readonly postCode: string = ''; + + /** + * The country code for the address. + * + * @type {string} + */ + public readonly countryCode: string = ''; + + /** + * The email address of the person in the address. + * + * @type {string} + */ + public readonly email: string = ''; + + /** + * The phone number of the person in the address. + * + * @type {string} + */ + public readonly phone: string = ''; +} + +/** + * Order Line Item + */ +export class OrderLineItem extends OrderItemMeta { + /** + * The name of the product. + * + * @type {string} + */ + public readonly name: string = ''; + + /** + * The ID of the product. + * + * @type {number} + */ + public readonly ProductId: number = -1; + + /** + * The ID of the product variation. + * + * @type {number} + */ + public readonly variationId: number = 0; + + /** + * The quantity of the product. + * + * @type {number} + */ + public readonly quantity: number = -1; + + /** + * The tax class for the product. + * + * @type {string} + */ + public readonly taxClass: string = ''; + + /** + * The subtotal for the product. + * + * @type {string} + */ + public readonly subtotal: string = ''; + + /** + * The subtotal tax for the product. + * + * @type {string} + */ + public readonly subtotalTax: string = ''; + + /** + * The total for the product including adjusments. + * + * @type {string} + */ + public readonly total: string = ''; + + /** + * The total tax for the product including adjusments. + * + * @type {string} + */ + public readonly totalTax: string = ''; + + /** + * The taxes applied to the product. + * + * @type {ReadonlyArray.} + */ + public readonly taxes: OrderItemTax[] = []; + + /** + * The product SKU. + * + * @type {string} + */ + public readonly sku: string = ''; + + /** + * The price of the product. + * + * @type {number} + */ + public readonly price: number = -1; + + /** + * The name of the parent product. + * + * @type {string|null} + */ + public readonly parentName: string | null = null; +} + +/** + * Order Tax Rate + */ +export class OrderTaxRate extends Model { + /** + * The tax rate code. + * + * @type {string} + */ + public readonly rateCode: string = ''; + + /** + * The tax rate id. + * + * @type {number} + */ + public readonly rateId: number = 0; + + /** + * The tax label. + * + * @type {string} + */ + public readonly label: string = ''; + + /** + * Flag indicating whether it's a compound tax rate. + * + * @type {boolean} + */ + public readonly compoundRate: boolean = false; + + /** + * The total tax for this rate code. + * + * @type {string} + */ + public readonly taxTotal: string = ''; + + /** + * The total shipping tax for this rate code. + * + * @type {string} + */ + public readonly shippingTaxTotal: string = ''; + + /** + * The tax rate as a percentage. + * + * @type {number} + */ + public readonly ratePercent: number = 0; +} + +/** + * Order shipping line + */ +export class OrderShippingLine extends OrderItemMeta { + /** + * The shipping method title. + * + * @type {string} + */ + public readonly methodTitle: string = ''; + + /** + * The shipping method id. + * + * @type {string} + */ + public readonly methodId: string = ''; + + /** + * The shipping method instance id. + * + * @type {string} + */ + public readonly instanceId: string = ''; + + /** + * The total shipping amount for this method. + * + * @type {string} + */ + public readonly total: string = ''; + + /** + * The total tax amount for this shipping method. + * + * @type {string} + */ + public readonly totalTax: string = ''; + + /** + * The taxes applied to this shipping method. + * + * @type {ReadonlyArray.} + */ + public readonly taxes: OrderItemTax[] = []; +} + +/** + * Order fee line + */ +export class OrderFeeLine extends OrderItemMeta { + /** + * The name of the fee. + * + * @type {string} + */ + public readonly name: string = ''; + + /** + * The tax class of the fee. + * + * @type {string} + */ + public readonly taxClass: string = ''; + + /** + * The tax status of the fee. + * + * @type {TaxStatus} + */ + public readonly taxStatus: TaxStatus = ''; + + /** + * The total amount for this fee. + * + * @type {string} + */ + public readonly amount: string = ''; + + /** + * The display total amount for this fee. + * + * @type {string} + */ + public readonly total: string = ''; + + /** + * The total tax amount for this fee. + * + * @type {string} + */ + public readonly totalTax: string = ''; + + /** + * The taxes applied to this fee. + * + * @type {ReadonlyArray.} + */ + public readonly taxes: OrderItemTax[] = []; +} + +/** + * Order coupon line + */ +export class OrderCouponLine extends OrderItemMeta { + /** + * The coupon code + * + * @type {string} + */ + public readonly code: string = ''; + + /** + * The discount amount. + * + * @type {string} + */ + public readonly discount: string = ''; + + /** + * The discount tax. + * + * @type {string} + */ + public readonly discountTax: string = ''; +} + +/** + * Order refund line + */ +export class OrderRefundLine extends Model { + /** + * The reason for giving the refund. + * + * @type {string} + */ + public readonly reason: string = ''; + + /** + * The total amount of the refund. + * + * @type {string} + */ + public readonly total: string = ''; +} diff --git a/tests/e2e/api/src/models/orders/shared/index.ts b/tests/e2e/api/src/models/orders/shared/index.ts new file mode 100644 index 00000000000..15eb796c953 --- /dev/null +++ b/tests/e2e/api/src/models/orders/shared/index.ts @@ -0,0 +1,2 @@ +export * from './classes'; +export * from './types'; diff --git a/tests/e2e/api/src/models/orders/shared/types.ts b/tests/e2e/api/src/models/orders/shared/types.ts new file mode 100644 index 00000000000..4e987c99d24 --- /dev/null +++ b/tests/e2e/api/src/models/orders/shared/types.ts @@ -0,0 +1,3 @@ + +//@todo: complete this type +export type TaxStatus = 'taxable' | string; From b05a97e2c069f3dffbc23e576bbd9529eb729343 Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Sun, 7 Mar 2021 23:06:48 -0400 Subject: [PATCH 005/249] add order types --- .../e2e/api/src/models/orders/shared/types.ts | 67 ++++++++++++++++++- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/tests/e2e/api/src/models/orders/shared/types.ts b/tests/e2e/api/src/models/orders/shared/types.ts index 4e987c99d24..adeba0128c4 100644 --- a/tests/e2e/api/src/models/orders/shared/types.ts +++ b/tests/e2e/api/src/models/orders/shared/types.ts @@ -1,3 +1,66 @@ +/** + * An order's status. + * + * @typedef OrderStatus + */ +export type OrderStatus = 'pending' | 'processing' | 'complete' | 'on-hold' | 'refunded' + | 'cancelled' | 'failed' | 'trash' | string; -//@todo: complete this type -export type TaxStatus = 'taxable' | string; +/** + * An fee's tax status. + * + * @typedef TaxStatus + */ +export type TaxStatus = 'taxable' | 'none'; + +/** + * Base order properties + */ +export type OrderDataUpdateParams = 'id' | 'parentId' | 'status' | 'currency' | 'version' + | 'pricesIncludeTax' | 'discountTotal' | 'discountTax' | 'shippingTotal' | 'shippingTax' + | 'cartTax' | 'customerId' | 'orderKey' | 'paymentMethod' | 'paymentMethodTitle' + | 'transactionId' | 'customerIpAddress' | 'customerUserAgent' | 'createdVia' | 'datePaid' + | 'customerNote' | 'dateCompleted' | 'cartHash' | 'orderNumber' | 'currencySymbol'; + +/** + * Common total properties + */ +export type OrderTotalUpdateParams = 'total' | 'totalTax'; + +/** + * Order address properties + */ +export type OrderAddressUpdateParams = 'firstName' | 'lastName' | 'companyName' | 'address1' + | 'address2' | 'city' | 'state' | 'postCode' | 'countryCode' | 'email' | 'phone'; + +/** + * Line item properties + */ +export type OrderLineItemUpdateParams = 'name' | 'ProductId' | 'variationId' | 'quantity' + | 'taxClass' | 'subtotal' | 'subtotalTax' | 'sku' | 'price' | 'parentName'; + +/** + * Tax rate properties + */ +export type OrderTaxUpdateParams = 'rateCode' | 'rateId' | 'label' | 'compoundRate' + | 'taxTotal' | 'shippingTaxTotal' | 'ratePercent'; + +/** + * Order shipping properties + */ +export type OrderShippingUpdateParams = 'methodTitle' | 'methodId' | 'instanceId'; + +/** + * Order fee properties + */ +export type OrderFeeUpdateParams = 'name' | 'taxClass' | 'taxStatus' | 'amount'; + +/** + * Order coupon properties + */ +export type OrderCouponUpdateParams = 'code' | 'discount' | 'discountTax'; + +/** + * Order refund properties + */ +export type OrderRefundUpdateParams = 'reason' | 'total'; From 1664ece7eb3ff04a76ad97d53b579772768d013a Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Mon, 8 Mar 2021 09:59:46 -0400 Subject: [PATCH 006/249] use valid tax status on fees --- tests/e2e/api/src/models/orders/shared/classes.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/api/src/models/orders/shared/classes.ts b/tests/e2e/api/src/models/orders/shared/classes.ts index 3852519b94c..c506f6563cc 100644 --- a/tests/e2e/api/src/models/orders/shared/classes.ts +++ b/tests/e2e/api/src/models/orders/shared/classes.ts @@ -335,7 +335,7 @@ export class OrderFeeLine extends OrderItemMeta { * * @type {TaxStatus} */ - public readonly taxStatus: TaxStatus = ''; + public readonly taxStatus: TaxStatus = 'taxable'; /** * The total amount for this fee. From 1cda09d2607e46004d0e1a9a988db4d0bfcbe741 Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Tue, 9 Mar 2021 11:33:29 -0400 Subject: [PATCH 007/249] fix api package build errors --- tests/e2e/api/src/framework/model-repository.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/e2e/api/src/framework/model-repository.ts b/tests/e2e/api/src/framework/model-repository.ts index ca598404b93..9c30993a83a 100644 --- a/tests/e2e/api/src/framework/model-repository.ts +++ b/tests/e2e/api/src/framework/model-repository.ts @@ -401,7 +401,7 @@ export class ModelRepository< T extends ModelRepositoryParams > implements } return ( this.listHook as ListChildFn< T > )( - paramsOrParent as ParentID< T >, + ( paramsOrParent as unknown ) as ParentID< T >, params, ); } @@ -428,7 +428,7 @@ export class ModelRepository< T extends ModelRepositoryParams > implements } return ( this.createHook as CreateChildFn< T > )( - propertiesOrParent as ParentID, + ( propertiesOrParent as unknown ) as ParentID, properties as Partial< ModelClass >, ); } @@ -455,7 +455,7 @@ export class ModelRepository< T extends ModelRepositoryParams > implements } return ( this.readHook as ReadChildFn< T > )( - idOrParent as ParentID< T >, + ( idOrParent as unknown ) as ParentID< T >, childID, ); } @@ -480,14 +480,14 @@ export class ModelRepository< T extends ModelRepositoryParams > implements if ( properties === undefined ) { return ( this.updateHook as UpdateFn< T > )( idOrParent as ModelID, - propertiesOrChildID as UpdateParams< T >, + ( propertiesOrChildID as unknown ) as UpdateParams< T >, ); } return ( this.updateHook as UpdateChildFn< T > )( - idOrParent as ParentID< T >, + ( idOrParent as unknown ) as ParentID< T >, propertiesOrChildID as ModelID, - properties, + ( properties as unknown ) as UpdateParams< T >, ); } @@ -513,7 +513,7 @@ export class ModelRepository< T extends ModelRepositoryParams > implements } return ( this.deleteHook as DeleteChildFn< T > )( - idOrParent as ParentID< T >, + ( idOrParent as unknown ) as ParentID< T >, childID, ); } From 2c1b3b52a91267b45641c5325cc0b3d8961661d0 Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Thu, 11 Mar 2021 09:20:26 -0400 Subject: [PATCH 008/249] add order class and repository --- tests/e2e/api/src/models/orders/index.ts | 1 + tests/e2e/api/src/models/orders/orders.ts | 364 ++++++++++++++++++ .../api/src/models/orders/shared/classes.ts | 4 +- 3 files changed, 367 insertions(+), 2 deletions(-) create mode 100644 tests/e2e/api/src/models/orders/orders.ts diff --git a/tests/e2e/api/src/models/orders/index.ts b/tests/e2e/api/src/models/orders/index.ts index c3da79f741b..de526a0af64 100644 --- a/tests/e2e/api/src/models/orders/index.ts +++ b/tests/e2e/api/src/models/orders/index.ts @@ -1 +1,2 @@ export * from './shared'; +export * from './orders'; diff --git a/tests/e2e/api/src/models/orders/orders.ts b/tests/e2e/api/src/models/orders/orders.ts new file mode 100644 index 00000000000..04fd8a93282 --- /dev/null +++ b/tests/e2e/api/src/models/orders/orders.ts @@ -0,0 +1,364 @@ +//import { HTTPClient } from '../../http'; +//import { orderRESTRepository } from '../../repositories'; +import { + ModelRepositoryParams, + CreatesModels, + ListsModels, + ReadsModels, + UpdatesModels, + DeletesModels, +} from '../../framework'; +import { + OrderAddressUpdateParams, + OrderCouponUpdateParams, + OrderDataUpdateParams, + OrderFeeUpdateParams, + OrderLineItemUpdateParams, + OrderRefundUpdateParams, + OrderShippingUpdateParams, + OrderTaxUpdateParams, + OrderTotalUpdateParams, + OrderItemMeta, + OrderAddress, + OrderCouponLine, + OrderFeeLine, + OrderLineItem, + OrderRefundLine, + OrderShippingLine, + OrderStatus, + OrderTaxRate, +} from './shared'; +import { ObjectLinks } from '../shared-types'; + +/** + * The parameters that orders can update. + */ +type OrderUpdateParams = OrderAddressUpdateParams + & OrderCouponUpdateParams + & OrderDataUpdateParams + & OrderFeeUpdateParams + & OrderLineItemUpdateParams + & OrderRefundUpdateParams + & OrderShippingUpdateParams + & OrderTaxUpdateParams + & OrderTotalUpdateParams; + +/** + * The parameters embedded in this generic can be used in the ModelRepository in order to give + * type-safety in an incredibly granular way. + */ +export type OrderRepositoryParams = ModelRepositoryParams< Order, never, never, OrderUpdateParams >; + +/** + * An interface for creating coupons using the repository. + * + * @typedef CreatesCoupons + * @alias CreatesModels. + */ +export type CreatesCoupons = CreatesModels< OrderRepositoryParams >; + +/** + * An interface for reading coupons using the repository. + * + * @typedef ReadsCoupons + * @alias ReadsModels. + */ +export type ReadsCoupons = ReadsModels< OrderRepositoryParams >; + +/** + * An interface for updating coupons using the repository. + * + * @typedef UpdatesCoupons + * @alias UpdatesModels. + */ +export type UpdatesCoupons = UpdatesModels< OrderRepositoryParams >; + +/** + * An interface for listing coupons using the repository. + * + * @typedef ListsCoupons + * @alias ListsModels. + */ +export type ListsCoupons = ListsModels< OrderRepositoryParams >; + +/** + * An interface for deleting coupons using the repository. + * + * @typedef DeletesCoupons + * @alias DeletesModels. + */ +export type DeletesCoupons = DeletesModels< OrderRepositoryParams >; + +/** + * A coupon object. + */ +export class Order extends OrderItemMeta { + /** + * The parent order id. + * + * @type {number} + */ + public readonly parentId: number = 0; + + /** + * The order status. + * + * @type {string} + */ + public readonly status: OrderStatus = ''; + + /** + * The order currency. + * + * @type {string} + */ + public readonly currency: string = ''; + + /** + * The WC version used to create the order. + * + * @type {string} + */ + public readonly version: string = ''; + + /** + * Flags if the prices include tax. + * + * @type {boolean} + */ + public readonly pricesIncludeTax: boolean = false; + + /** + * The total of the discounts on the order. + * + * @type {string} + */ + public readonly discountTotal: string = ''; + + /** + * The total of the tax on discounts on the order. + * + * @type {string} + */ + public readonly discountTax: string = ''; + + /** + * The total of the shipping on the order. + * + * @type {string} + */ + public readonly shippingTotal: string = ''; + + /** + * The total of the tax on shipping on the order. + * + * @type {string} + */ + public readonly shippingTax: string = ''; + + /** + * The total cart tax on the order. + * + * @type {string} + */ + public readonly cartTax: string = ''; + + /** + * The total for the order including adjustments. + * + * @type {string} + */ + public readonly total: string = ''; + + /** + * The total tax for the order including adjustments. + * + * @type {string} + */ + public readonly totalTax: string = ''; + + /** + * The customer id. + * + * @type {number} + */ + public readonly customerId: number = 0; + + /** + * A unique key assigned to the order. + * + * @type {string} + */ + public readonly orderKey: string = ''; + + /** + * The billing address. + * + * @type {OrderAddress} + */ + public readonly billing: OrderAddress | null = null; + + /** + * The shipping address. + * + * @type {OrderAddress} + */ + public readonly shipping: OrderAddress | null = null; + + /** + * Name of the payment method. + * + * @type {string} + */ + public readonly paymentMethod: string = ''; + + /** + * Title of the payment method + * + * @type {string} + */ + public readonly paymentMethodTitle: string = ''; + + /** + * Payment transaction ID. + * + * @type {string} + */ + public readonly transactionId: string = ''; + + /** + * Customer IP address. + * + * @type {string} + */ + public readonly customerIpAddress: string = ''; + + /** + * Customer web browser user agent. + * + * @type {string} + */ + public readonly customerUserAgent: string = ''; + + /** + * Method used to create the order. + * + * @type {string} + */ + public readonly createdVia: string = ''; + + /** + * Customer note. + * + * @type {string} + */ + public readonly customerNote: string = ''; + + /** + * Date the order was completed. + * + * @type {string} + */ + public readonly dateCompleted: Date | null = null; + + /** + * Date the order was paid. + * + * @type {string} + */ + public readonly datePaid: Date | null = null; + + /** + * Hash of the cart's contents. + * + * @type {string} + */ + public readonly cartHash: string = ''; + + /** + * Number assigned to the order. + * + * @type {string} + */ + public readonly orderNumber: string = ''; + + /** + * Currency symbol for the order. + * + * @type {string} + */ + public readonly currencySymbol: string = ''; + + /** + * The order's line items. + * + * @type {ReadonlyArray.} + */ + public readonly lineItems: OrderLineItem[] = []; + + /** + * The order's tax rates. + * + * @type {ReadonlyArray.} + */ + public readonly taxLines: OrderTaxRate[] = []; + + /** + * The order's shipping charges. + * + * @type {ReadonlyArray.} + */ + public readonly shippingLines: OrderShippingLine[] = []; + + /** + * The order's fees. + * + * @type {ReadonlyArray.} + */ + public readonly feeLines: OrderFeeLine[] = []; + + /** + * The coupons used on the order. + * + * @type {ReadonlyArray.} + */ + public readonly couponLines: OrderCouponLine[] = []; + + /** + * The refunds to the order. + * + * @type {ReadonlyArray.} + */ + public readonly refunds: OrderRefundLine[] = []; + + /** + * The order's links. + * + * @type {ReadonlyArray.} + */ + public readonly links: ObjectLinks = { + collection: [ { href: '' } ], + self: [ { href: '' } ], + }; + + /** + * Creates a new coupon instance with the given properties + * + * @param {Object} properties The properties to set in the object. + */ + public constructor( properties?: Partial< Order > ) { + super(); + Object.assign( this, properties ); + } + /* + /** + * Returns the repository for interacting with this type of model. + * + * @param {HTTPClient} httpClient The client for communicating via HTTP. + */ + /* + public static restRepository( httpClient: HTTPClient ): ReturnType< typeof orderRESTRepository > { + return orderRESTRepository( httpClient ); + } + */ +} diff --git a/tests/e2e/api/src/models/orders/shared/classes.ts b/tests/e2e/api/src/models/orders/shared/classes.ts index c506f6563cc..f26923edcd5 100644 --- a/tests/e2e/api/src/models/orders/shared/classes.ts +++ b/tests/e2e/api/src/models/orders/shared/classes.ts @@ -169,14 +169,14 @@ export class OrderLineItem extends OrderItemMeta { public readonly subtotalTax: string = ''; /** - * The total for the product including adjusments. + * The total for the product including adjustments. * * @type {string} */ public readonly total: string = ''; /** - * The total tax for the product including adjusments. + * The total tax for the product including adjustments. * * @type {string} */ From e5341ae237196989a94a8b850ddb31558e115a72 Mon Sep 17 00:00:00 2001 From: Chris Diehl Date: Wed, 7 Apr 2021 22:47:12 -0400 Subject: [PATCH 009/249] Updates standardization from ISO to CLDR --- i18n/states.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/i18n/states.php b/i18n/states.php index 25fdd505ba8..d77b05248e9 100644 --- a/i18n/states.php +++ b/i18n/states.php @@ -1736,9 +1736,8 @@ return array( 'AP' => __( 'Armed Forces (AP)', 'woocommerce' ), ), 'VE' => array( // Venezuela States. Ref: https://en.wikipedia.org/wiki/ISO_3166-2:VE - 'W' => __( 'Dependencias Federales', 'woocommerce' ), - 'A' => __( 'Distrito Capital', 'woocommerce' ), - 'Z' => __( 'Amazonas', 'woocommerce' ), + + 'A' => __( 'Capital', 'woocommerce' ), 'B' => __( 'Anzoátegui', 'woocommerce' ), 'C' => __( 'Apure', 'woocommerce' ), 'D' => __( 'Aragua', 'woocommerce' ), @@ -1746,7 +1745,6 @@ return array( 'F' => __( 'Bolívar', 'woocommerce' ), 'G' => __( 'Carabobo', 'woocommerce' ), 'H' => __( 'Cojedes', 'woocommerce' ), - 'Y' => __( 'Delta Amacuro', 'woocommerce' ), 'I' => __( 'Falcón', 'woocommerce' ), 'J' => __( 'Guárico', 'woocommerce' ), 'K' => __( 'Lara', 'woocommerce' ), @@ -1758,9 +1756,12 @@ return array( 'R' => __( 'Sucre', 'woocommerce' ), 'S' => __( 'Táchira', 'woocommerce' ), 'T' => __( 'Trujillo', 'woocommerce' ), - 'X' => __( 'La Guaira', 'woocommerce' ), 'U' => __( 'Yaracuy', 'woocommerce' ), 'V' => __( 'Zulia', 'woocommerce' ), + 'W' => __( 'Federal Dependencies', 'woocommerce' ), + 'X' => __( 'Vargas', 'woocommerce' ), + 'Y' => __( 'Delta Amacuro', 'woocommerce' ), + 'Z' => __( 'Amazonas', 'woocommerce' ) ), 'VN' => array(), 'YT' => array(), From e1c6c540d72ad3de6a0f0116ca8d6064d7f3ed15 Mon Sep 17 00:00:00 2001 From: roykho Date: Fri, 9 Apr 2021 05:33:06 -0700 Subject: [PATCH 010/249] Convert notices to use native nonce generation from WC Admin --- includes/admin/class-wc-admin-notices.php | 45 ------------------- .../notes/class-wc-notes-run-db-update.php | 41 ++++++++++------- includes/class-woocommerce.php | 1 - 3 files changed, 24 insertions(+), 63 deletions(-) diff --git a/includes/admin/class-wc-admin-notices.php b/includes/admin/class-wc-admin-notices.php index fa9716cc498..70c76ee6120 100644 --- a/includes/admin/class-wc-admin-notices.php +++ b/includes/admin/class-wc-admin-notices.php @@ -64,51 +64,6 @@ class WC_Admin_Notices { } } - /** - * Parses query to create nonces when available. - * - * @param object $response The WP_REST_Response we're working with. - * @return object $response The prepared WP_REST_Response object. - */ - public static function prepare_note_with_nonce( $response ) { - if ( 'wc-update-db-reminder' !== $response->data['name'] || ! isset( $response->data['actions'] ) ) { - return $response; - } - - foreach ( $response->data['actions'] as $action_key => $action ) { - $url_parts = ! empty( $action->query ) ? wp_parse_url( $action->query ) : ''; - - if ( ! isset( $url_parts['query'] ) ) { - continue; - } - - wp_parse_str( $url_parts['query'], $params ); - - if ( array_key_exists( '_nonce_action', $params ) && array_key_exists( '_nonce_name', $params ) ) { - $org_params = $params; - - // Check to make sure we're acting on the whitelisted nonce actions. - if ( 'wc_db_update' !== $params['_nonce_action'] && 'woocommerce_hide_notices_nonce' !== $params['_nonce_action'] ) { - continue; - } - - unset( $org_params['_nonce_action'] ); - unset( $org_params['_nonce_name'] ); - - $url = $url_parts['scheme'] . '://' . $url_parts['host'] . $url_parts['path']; - - $nonce = array( $params['_nonce_name'] => wp_create_nonce( $params['_nonce_action'] ) ); - $merged_params = array_merge( $nonce, $org_params ); - $parsed_query = add_query_arg( $merged_params, $url ); - - $response->data['actions'][ $action_key ]->query = $parsed_query; - $response->data['actions'][ $action_key ]->url = $parsed_query; - } - } - - return $response; - } - /** * Store notices to DB */ diff --git a/includes/admin/notes/class-wc-notes-run-db-update.php b/includes/admin/notes/class-wc-notes-run-db-update.php index 1fad100ff9e..77017ec2ca2 100644 --- a/includes/admin/notes/class-wc-notes-run-db-update.php +++ b/includes/admin/notes/class-wc-notes-run-db-update.php @@ -109,24 +109,23 @@ class WC_Notes_Run_Db_Update { * @return int Created/Updated note id */ private static function update_needed_notice( $note_id = null ) { - $update_url = html_entity_decode( + $update_url = add_query_arg( array( 'do_update_woocommerce' => 'true', - '_nonce_action' => 'wc_db_update', - '_nonce_name' => 'wc_db_update_nonce', ), wc_get_current_admin_url() ? wc_get_current_admin_url() : admin_url( 'admin.php?page=wc-settings' ) - ) - ); + ); $note_actions = array( array( - 'name' => 'update-db_run', - 'label' => __( 'Update WooCommerce Database', 'woocommerce' ), - 'url' => $update_url, - 'status' => 'unactioned', - 'primary' => true, + 'name' => 'update-db_run', + 'label' => __( 'Update WooCommerce Database', 'woocommerce' ), + 'url' => $update_url, + 'status' => 'unactioned', + 'primary' => true, + 'nonce_action' => 'wc_db_update', + 'nonce_name' => 'wc_db_update_nonce', ), array( 'name' => 'update-db_learn-more', @@ -166,6 +165,10 @@ class WC_Notes_Run_Db_Update { $note->clear_actions(); foreach ( $note_actions as $note_action ) { $note->add_action( ...array_values( $note_action ) ); + + if ( isset( $note_action['nonce_action'] ) ) { + $note->add_nonce_to_action( $note_action['name'], $note_action['nonce_action'], $note_action['nonce_name'] ); + } } return $note->save(); @@ -212,8 +215,6 @@ class WC_Notes_Run_Db_Update { add_query_arg( array( 'wc-hide-notice' => 'update', - '_nonce_action' => 'woocommerce_hide_notices_nonce', - '_nonce_name' => '_wc_notice_nonce', ), wc_get_current_admin_url() ? remove_query_arg( 'do_update_woocommerce', wc_get_current_admin_url() ) : admin_url( 'admin.php?page=wc-settings' ) ) @@ -221,11 +222,13 @@ class WC_Notes_Run_Db_Update { $note_actions = array( array( - 'name' => 'update-db_done', - 'label' => __( 'Thanks!', 'woocommerce' ), - 'url' => $hide_notices_url, - 'status' => 'actioned', - 'primary' => true, + 'name' => 'update-db_done', + 'label' => __( 'Thanks!', 'woocommerce' ), + 'url' => $hide_notices_url, + 'status' => 'actioned', + 'primary' => true, + 'nonce_action' => 'woocommerce_hide_notices_nonce', + 'nonce_name' => '_wc_notice_nonce', ), ); @@ -242,6 +245,10 @@ class WC_Notes_Run_Db_Update { $note->clear_actions(); foreach ( $note_actions as $note_action ) { $note->add_action( ...array_values( $note_action ) ); + + if ( isset( $note_action['nonce_action'] ) ) { + $note->add_nonce_to_action( $note_action['name'], $note_action['nonce_action'], $note_action['nonce_name'] ); + } } $note->save(); diff --git a/includes/class-woocommerce.php b/includes/class-woocommerce.php index be2df455f7d..b25315cbcf6 100644 --- a/includes/class-woocommerce.php +++ b/includes/class-woocommerce.php @@ -203,7 +203,6 @@ final class WooCommerce { add_action( 'switch_blog', array( $this, 'wpdb_table_fix' ), 0 ); add_action( 'activated_plugin', array( $this, 'activated_plugin' ) ); add_action( 'deactivated_plugin', array( $this, 'deactivated_plugin' ) ); - add_filter( 'woocommerce_rest_prepare_note', array( 'WC_Admin_Notices', 'prepare_note_with_nonce' ) ); // These classes set up hooks on instantiation. wc_get_container()->get( DownloadPermissionsAdjuster::class ); From 6ed847a7b9fa1f30442281d0e50bfc81aa6f799a Mon Sep 17 00:00:00 2001 From: roykho Date: Tue, 13 Apr 2021 19:53:00 -0700 Subject: [PATCH 011/249] Deprecate method instead of removing it --- includes/admin/class-wc-admin-notices.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/includes/admin/class-wc-admin-notices.php b/includes/admin/class-wc-admin-notices.php index 70c76ee6120..b543c698472 100644 --- a/includes/admin/class-wc-admin-notices.php +++ b/includes/admin/class-wc-admin-notices.php @@ -64,6 +64,19 @@ class WC_Admin_Notices { } } + /** + * Parses query to create nonces when available. + * + * @deprecated 5.4.0 + * @param object $response The WP_REST_Response we're working with. + * @return object $response The prepared WP_REST_Response object. + */ + public static function prepare_note_with_nonce( $response ) { + wc_deprecated_function( __CLASS__ . '::' . __FUNCTION__, '5.4.0' ); + + return $response; + } + /** * Store notices to DB */ From edd8f545df59249bf80d678d5b07fa41163bb230 Mon Sep 17 00:00:00 2001 From: Bero Date: Fri, 16 Apr 2021 11:54:10 +0200 Subject: [PATCH 012/249] Always search all addons --- includes/admin/views/html-admin-page-addons.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/includes/admin/views/html-admin-page-addons.php b/includes/admin/views/html-admin-page-addons.php index ceea4ec99e5..3a8dd3648ed 100644 --- a/includes/admin/views/html-admin-page-addons.php +++ b/includes/admin/views/html-admin-page-addons.php @@ -56,8 +56,7 @@ if ( ! defined( 'ABSPATH' ) ) { value="" placeholder=""> - - +
From 5c07f8e7e1f1d6b03e6e8dba725432dd88d6d4dd Mon Sep 17 00:00:00 2001 From: kkmuffme <11071985+kkmuffme@users.noreply.github.com> Date: Mon, 19 Apr 2021 17:06:59 +0200 Subject: [PATCH 013/249] Sort country codes alphabetically Sort country codes alphabetically to make finding them easier. --- includes/class-wc-countries.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/includes/class-wc-countries.php b/includes/class-wc-countries.php index 064f035cabc..e20d1358b27 100644 --- a/includes/class-wc-countries.php +++ b/includes/class-wc-countries.php @@ -365,7 +365,7 @@ class WC_Countries { * @return string[] */ public function get_european_union_countries( $type = '' ) { - $countries = array( 'AT', 'BE', 'BG', 'CY', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GR', 'HU', 'HR', 'IE', 'IT', 'LT', 'LU', 'LV', 'MT', 'NL', 'PL', 'PT', 'RO', 'SE', 'SI', 'SK' ); + $countries = array( 'AT', 'BE', 'BG', 'CY', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GR', 'HR', 'HU', 'IE', 'IT', 'LT', 'LU', 'LV', 'MT', 'NL', 'PL', 'PT', 'RO', 'SE', 'SI', 'SK' ); if ( 'eu_vat' === $type ) { $countries[] = 'MC'; @@ -383,7 +383,7 @@ class WC_Countries { */ public function countries_using_vat() { wc_deprecated_function( 'countries_using_vat', '4.0', 'WC_Countries::get_vat_countries' ); - $countries = array( 'AL', 'AR', 'AZ', 'BS', 'BH', 'BY', 'BB', 'BO', 'EG', 'ET', 'CL', 'CO', 'EC', 'SV', 'FJ', 'GM', 'GH', 'GT', 'IN', 'IR', 'IL', 'KZ', 'MU', 'MK', 'MX', 'MD', 'MN', 'ME', 'NA', 'NP', 'NG', 'PS', 'PY', 'RU', 'RW', 'KN', 'SA', 'RS', 'ZA', 'KR', 'LK', 'TH', 'TR', 'UA', 'UY', 'UZ', 'VE', 'VN', 'AE' ); + $countries = array( 'AE', 'AL', 'AR', 'AZ', 'BB', 'BH', 'BO', 'BS', 'BY', 'CL', 'CO', 'EC', 'EG', 'ET', 'FJ', 'GH', 'GM', 'GT', 'IL', 'IN', 'IR', 'KN', 'KR', 'KZ', 'LK', 'MD', 'ME', 'MK', 'MN', 'MU', 'MX', 'NA', 'NG', 'NP', 'PS', 'PY', 'RS', 'RU', 'RW', 'SA', 'SV', 'TH', 'TR', 'UA', 'UY', 'UZ', 'VE', 'VN', 'ZA' ); return apply_filters( 'woocommerce_countries_using_vat', $countries ); } @@ -409,7 +409,7 @@ class WC_Countries { */ public function shipping_to_prefix( $country_code = '' ) { $country_code = $country_code ? $country_code : WC()->customer->get_shipping_country(); - $countries = array( 'GB', 'US', 'AE', 'CZ', 'DO', 'NL', 'PH', 'USAF' ); + $countries = array( 'AE', 'CZ', 'DO', 'GB', 'NL', 'PH', 'US', 'USAF' ); $return = in_array( $country_code, $countries, true ) ? __( 'to the', 'woocommerce' ) : __( 'to', 'woocommerce' ); return apply_filters( 'woocommerce_countries_shipping_to_prefix', $return, $country_code ); @@ -423,7 +423,7 @@ class WC_Countries { */ public function estimated_for_prefix( $country_code = '' ) { $country_code = $country_code ? $country_code : $this->get_base_country(); - $countries = array( 'GB', 'US', 'AE', 'CZ', 'DO', 'NL', 'PH', 'USAF' ); + $countries = array( 'AE', 'CZ', 'DO', 'GB', 'NL', 'PH', 'US', 'USAF' ); $return = in_array( $country_code, $countries, true ) ? __( 'the', 'woocommerce' ) . ' ' : ''; return apply_filters( 'woocommerce_countries_estimated_for_prefix', $return, $country_code ); @@ -510,8 +510,8 @@ class WC_Countries { 'woocommerce_localisation_address_formats', array( 'default' => "{name}\n{company}\n{address_1}\n{address_2}\n{city}\n{state}\n{postcode}\n{country}", - 'AU' => "{name}\n{company}\n{address_1}\n{address_2}\n{city} {state} {postcode}\n{country}", 'AT' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", + 'AU' => "{name}\n{company}\n{address_1}\n{address_2}\n{city} {state} {postcode}\n{country}", 'BE' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", 'CA' => "{company}\n{name}\n{address_1}\n{address_2}\n{city} {state_code} {postcode}\n{country}", 'CH' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", @@ -519,9 +519,10 @@ class WC_Countries { 'CN' => "{country} {postcode}\n{state}, {city}, {address_2}, {address_1}\n{company}\n{name}", 'CZ' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", 'DE' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", - 'EE' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", - 'FI' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", 'DK' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", + 'EE' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", + 'ES' => "{name}\n{company}\n{address_1}\n{address_2}\n{postcode} {city}\n{state}\n{country}", + 'FI' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", 'FR' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city_upper}\n{country}", 'HK' => "{company}\n{first_name} {last_name_upper}\n{address_1}\n{address_2}\n{city_upper}\n{state_upper}\n{country}", 'HU' => "{last_name} {first_name}\n{company}\n{city}\n{address_1}\n{address_2}\n{postcode}\n{country}", @@ -530,20 +531,19 @@ class WC_Countries { 'IT' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode}\n{city}\n{state_upper}\n{country}", 'JM' => "{name}\n{company}\n{address_1}\n{address_2}\n{city}\n{state}\n{postcode_upper}\n{country}", 'JP' => "{postcode}\n{state} {city} {address_1}\n{address_2}\n{company}\n{last_name} {first_name}\n{country}", - 'TW' => "{company}\n{last_name} {first_name}\n{address_1}\n{address_2}\n{state}, {city} {postcode}\n{country}", 'LI' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", 'NL' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", - 'NZ' => "{name}\n{company}\n{address_1}\n{address_2}\n{city} {postcode}\n{country}", 'NO' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", + 'NZ' => "{name}\n{company}\n{address_1}\n{address_2}\n{city} {postcode}\n{country}", 'PL' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", 'PR' => "{company}\n{name}\n{address_1} {address_2}\n{city} \n{country} {postcode}", 'PT' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", - 'SK' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", 'RS' => "{name}\n{company}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", - 'SI' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", - 'ES' => "{name}\n{company}\n{address_1}\n{address_2}\n{postcode} {city}\n{state}\n{country}", 'SE' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", + 'SI' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", + 'SK' => "{company}\n{name}\n{address_1}\n{address_2}\n{postcode} {city}\n{country}", 'TR' => "{name}\n{company}\n{address_1}\n{address_2}\n{postcode} {city} {state}\n{country}", + 'TW' => "{company}\n{last_name} {first_name}\n{address_1}\n{address_2}\n{state}, {city} {postcode}\n{country}", 'UG' => "{name}\n{company}\n{address_1}\n{address_2}\n{city}\n{state}, {country}", 'US' => "{name}\n{company}\n{address_1}\n{address_2}\n{city}, {state_code} {postcode}\n{country}", 'VN' => "{name}\n{company}\n{address_1}\n{city}\n{country}", From ce2f04feeb68c4638d9a7faca3215771f2ade0d4 Mon Sep 17 00:00:00 2001 From: Veljko Date: Thu, 22 Apr 2021 09:47:49 +0200 Subject: [PATCH 014/249] Added new scenario of non-virtual product --- .../merchant/wp-admin-product-new.test.js | 52 ++++++++++++++----- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js index 5155fbae0b6..f944d99d82d 100644 --- a/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js +++ b/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js @@ -3,11 +3,12 @@ * Internal dependencies */ const { + shopper, merchant, clickTab, uiUnblocked, evalAndClick, - setCheckbox, + verifyAndPublish, } = require( '@woocommerce/e2e-utils' ); const { waitAndClick, @@ -24,7 +25,8 @@ const { } = require( '@jest/globals' ); const config = require( 'config' ); -const simpleProductName = config.get( 'products.simple.name' ); +const VirtualProductName = 'Virtual Product Name'; +const NonVirtualProductName = 'Non-Virtual Product Name'; const simpleProductPrice = config.has('products.simple.price') ? config.get('products.simple.price') : '9.99'; const verifyPublishAndTrash = async () => { @@ -61,23 +63,47 @@ const runAddSimpleProductTest = () => { await merchant.login(); }); - it('can create simple virtual product titled "Simple Product" with regular price $9.99', async () => { + it('can create simple virtual product and add it to the cart', async () => { await openNewProductAndVerify(); - // Set product data - await expect(page).toFill('#title', simpleProductName); + // Set product data and publish the product + await expect(page).toFill('#title', VirtualProductName); await expect(page).toClick('#_virtual'); + await clickTab('General'); await expect(page).toFill('#_regular_price', simpleProductPrice); + await verifyAndPublish(); - // Publish product, verify that it was published. Trash product, verify that it was trashed. - await verifyPublishAndTrash( - '#publish', - '.updated.notice', - 'Product published.', - 'Move to Trash', - '1 product moved to the Trash.' - ); + await merchant.logout(); + + // See product in the shop end and add to the cart + await shopper.goToShop(); + await shopper.addToCartFromShopPage(VirtualProductName); + await shopper.goToCart(); + await shopper.productIsInCart(VirtualProductName); + + // Remove product from cart + await shopper.removeFromCart(VirtualProductName); + }); + + it('can create simple non-virtual product and add it to the cart', async () => { + await merchant.login(); + await openNewProductAndVerify(); + + // Set product data and publish the product + await expect(page).toFill('#title', NonVirtualProductName); + await clickTab('General'); + await expect(page).toFill('#_regular_price', simpleProductPrice); + await verifyAndPublish(); + + // See product in the shop end and add to the cart + await shopper.goToShop(); + await shopper.addToCartFromShopPage(NonVirtualProductName); + await shopper.goToCart(); + await shopper.productIsInCart(NonVirtualProductName); + + // Remove product from cart + await shopper.removeFromCart(NonVirtualProductName); }); }); }; From fd85f8239bb166a793d8d953b5e4d7dc86b54502 Mon Sep 17 00:00:00 2001 From: Veljko Date: Thu, 22 Apr 2021 10:21:36 +0200 Subject: [PATCH 015/249] Update test scenarios to cover both flows --- .../specs/merchant/wp-admin-product-new.test.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js index f944d99d82d..5ef7630151e 100644 --- a/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js +++ b/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js @@ -69,19 +69,21 @@ const runAddSimpleProductTest = () => { // Set product data and publish the product await expect(page).toFill('#title', VirtualProductName); await expect(page).toClick('#_virtual'); - await clickTab('General'); await expect(page).toFill('#_regular_price', simpleProductPrice); await verifyAndPublish(); await merchant.logout(); - // See product in the shop end and add to the cart + // See product in the shop and add it to the cart await shopper.goToShop(); await shopper.addToCartFromShopPage(VirtualProductName); await shopper.goToCart(); await shopper.productIsInCart(VirtualProductName); + // Assert that the page does not contain shipping calculation button + await expect(page).not.toMatchElement('a.shipping-calculator-button'); + // Remove product from cart await shopper.removeFromCart(VirtualProductName); }); @@ -96,12 +98,18 @@ const runAddSimpleProductTest = () => { await expect(page).toFill('#_regular_price', simpleProductPrice); await verifyAndPublish(); - // See product in the shop end and add to the cart + await merchant.logout(); + + // See product in the shop and add it to the cart await shopper.goToShop(); await shopper.addToCartFromShopPage(NonVirtualProductName); await shopper.goToCart(); await shopper.productIsInCart(NonVirtualProductName); + // Assert that the page does contain shipping calculation button + await page.waitForSelector('a.shipping-calculator-button'); + await expect(page).toMatchElement('a.shipping-calculator-button'); + // Remove product from cart await shopper.removeFromCart(NonVirtualProductName); }); From 29f11a5b5ac6ae36353d5927af00adec05bc71f8 Mon Sep 17 00:00:00 2001 From: Veljko Date: Thu, 22 Apr 2021 12:42:50 +0200 Subject: [PATCH 016/249] Added new e2e test to initiate wccom connect --- tests/e2e/core-tests/specs/index.js | 5 +- .../wp-admin-extensions-connect-wccom.test.js | 47 +++++++++++++++++++ .../wp-admin/test-extensions-connect-wccom.js | 6 +++ tests/e2e/utils/README.md | 2 + tests/e2e/utils/src/flows/constants.js | 1 + tests/e2e/utils/src/flows/merchant.js | 7 +++ 6 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 tests/e2e/core-tests/specs/merchant/wp-admin-extensions-connect-wccom.test.js create mode 100644 tests/e2e/specs/wp-admin/test-extensions-connect-wccom.js diff --git a/tests/e2e/core-tests/specs/index.js b/tests/e2e/core-tests/specs/index.js index 4380bb79d4f..c7cbd79b2fe 100644 --- a/tests/e2e/core-tests/specs/index.js +++ b/tests/e2e/core-tests/specs/index.js @@ -45,6 +45,7 @@ const runMerchantOrderEmailsTest = require( './merchant/wp-admin-order-emails.te const runOrderSearchingTest = require( './merchant/wp-admin-order-searching.test' ); const runAnalyticsPageLoadsTest = require( './merchant/wp-admin-analytics-page-loads.test' ); const runImportProductsTest = require( './merchant/wp-admin-product-import-csv.test' ); +const runInitiateWccomConnectionTest = require( './merchant/wp-admin-extensions-connect-wccom.test' ); // REST API tests const runExternalProductAPITest = require( './api/external-product.test' ); @@ -73,7 +74,7 @@ const runShopperTests = () => { runCheckoutCreateAccountTest(); runCheckoutLoginAccountTest(); runCartCalculateShippingTest(); - runCartRedirectionTest(); + runCartRedirectionTest(); runOrderEmailReceivingTest(); }; @@ -97,6 +98,7 @@ const runMerchantTests = () => { runProductSearchTest(); runMerchantOrdersCustomerPaymentPage(); runAnalyticsPageLoadsTest(); + runInitiateWccomConnectionTest(); } const runApiTests = () => { @@ -154,4 +156,5 @@ module.exports = { runCartRedirectionTest, runMyAccountCreateAccountTest, runOrderEmailReceivingTest, + runInitiateWccomConnectionTest, }; diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-extensions-connect-wccom.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-extensions-connect-wccom.test.js new file mode 100644 index 00000000000..c43022d2024 --- /dev/null +++ b/tests/e2e/core-tests/specs/merchant/wp-admin-extensions-connect-wccom.test.js @@ -0,0 +1,47 @@ +/* eslint-disable jest/no-export, jest/no-disabled-tests */ +/** + * Internal dependencies + */ + const { + merchant, +} = require( '@woocommerce/e2e-utils' ); + +/** + * External dependencies + */ +const { + it, + describe, + beforeAll, +} = require( '@jest/globals' ); + +const runInitiateWccomConnectionTest = () => { + describe('Merchant > Initiate WCCOM Connection', () => { + beforeAll(async () => { + await merchant.login(); + }); + + it('can initiate WCCOM connection', async () => { + await merchant.openExtensions(); + + // Click on a tab to choose WooCommerce Subscriptions extension + await Promise.all([ + expect(page).toClick('a.nav-tab', {text: "WooCommerce.com Subscriptions"}), + page.waitForNavigation({waitUntil: 'networkidle0'}), + ]); + + // Click on Connect button to initiate a WCCOM connection + await Promise.all([ + expect(page).toClick('.button-helper-connect'), + page.waitForNavigation({waitUntil: 'networkidle0'}), + ]); + + // Verify that you see a login page for connecting WCCOM account + await expect(page).toMatchElement('div.login'); + await expect(page).toMatchElement('input#usernameOrEmail'); + await expect(page).toMatchElement('button.button', {text: "Continue"}); + }); + }); +} + +module.exports = runInitiateWccomConnectionTest; diff --git a/tests/e2e/specs/wp-admin/test-extensions-connect-wccom.js b/tests/e2e/specs/wp-admin/test-extensions-connect-wccom.js new file mode 100644 index 00000000000..a7b4cd8deed --- /dev/null +++ b/tests/e2e/specs/wp-admin/test-extensions-connect-wccom.js @@ -0,0 +1,6 @@ +/* + * Internal dependencies + */ +const { runInitiateWccomConnectionTest } = require( '@woocommerce/e2e-core-tests' ); + +runInitiateWccomConnectionTest(); diff --git a/tests/e2e/utils/README.md b/tests/e2e/utils/README.md index b7fdb4ec48a..9c7e6b4cf80 100644 --- a/tests/e2e/utils/README.md +++ b/tests/e2e/utils/README.md @@ -62,6 +62,7 @@ This package provides support for enabling retries in tests: - `WP_ADMIN_ANALYTICS_PAGES` - WooCommerce analytics page root - `WP_ADMIN_WC_SETTINGS` - WooCommerce settings page root - `WP_ADMIN_NEW_SHIPPING_ZONE` - WooCommerce new shipping zone +- `WP_ADMIN_WC_EXTENSIONS` - WooCommerce extensions page #### Front end @@ -100,6 +101,7 @@ This package provides support for enabling retries in tests: | `openAnalyticsPage` | | Open any Analytics page | | `openAllUsersView` | | Open the All Users page | | `openImportProducts` | | Open the Import Products page | +| `openExtensions` | | Go to WooCommerce -> Extensions | ### Shopper `shopper` diff --git a/tests/e2e/utils/src/flows/constants.js b/tests/e2e/utils/src/flows/constants.js index aefb87ec174..70e1e8f4fc3 100644 --- a/tests/e2e/utils/src/flows/constants.js +++ b/tests/e2e/utils/src/flows/constants.js @@ -36,6 +36,7 @@ export const WP_ADMIN_SETUP_WIZARD = WP_ADMIN_WC_HOME + '&path=%2Fsetup-wizard'; export const WP_ADMIN_ANALYTICS_PAGES = WP_ADMIN_WC_HOME + '&path=%2Fanalytics%2F'; export const WP_ADMIN_WC_SETTINGS = WP_ADMIN_PLUGIN_PAGE + 'wc-settings&tab='; export const WP_ADMIN_NEW_SHIPPING_ZONE = WP_ADMIN_WC_SETTINGS + 'shipping&zone_id=new'; +export const WP_ADMIN_WC_EXTENSIONS = WP_ADMIN_PLUGIN_PAGE + 'wc-addons'; /** * Shop pages. * @type {string} diff --git a/tests/e2e/utils/src/flows/merchant.js b/tests/e2e/utils/src/flows/merchant.js index 4e3add65a6e..dad590a4a63 100644 --- a/tests/e2e/utils/src/flows/merchant.js +++ b/tests/e2e/utils/src/flows/merchant.js @@ -20,6 +20,7 @@ const { WP_ADMIN_SETUP_WIZARD, WP_ADMIN_WC_HOME, WP_ADMIN_WC_SETTINGS, + WP_ADMIN_WC_EXTENSIONS, WP_ADMIN_NEW_SHIPPING_ZONE, WP_ADMIN_ANALYTICS_PAGES, WP_ADMIN_ALL_USERS_VIEW, @@ -121,6 +122,12 @@ const merchant = { } ); }, + openExtensions: async () => { + await page.goto( WP_ADMIN_WC_EXTENSIONS, { + waitUntil: 'networkidle0', + } ); + }, + runSetupWizard: async () => { const setupWizard = IS_RETEST_MODE ? WP_ADMIN_SETUP_WIZARD : WP_ADMIN_WC_HOME; await page.goto( setupWizard, { From e5ced9498cef1cd83ea0ffa5c1207fb7a7648c3d Mon Sep 17 00:00:00 2001 From: Veljko Date: Thu, 22 Apr 2021 14:39:21 +0200 Subject: [PATCH 017/249] Add missing merchant login --- tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js index 5ef7630151e..c1f7bb8707f 100644 --- a/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js +++ b/tests/e2e/core-tests/specs/merchant/wp-admin-product-new.test.js @@ -119,6 +119,7 @@ const runAddSimpleProductTest = () => { const runAddVariableProductTest = () => { describe('Add New Variable Product Page', () => { it('can create product with variations', async () => { + await merchant.login(); await openNewProductAndVerify(); // Set product data From 7105a7a17e64d56387571223aa1874be8942f349 Mon Sep 17 00:00:00 2001 From: roykho Date: Fri, 23 Apr 2021 12:14:51 -0700 Subject: [PATCH 018/249] Update restock logic during refunds closes #29502 --- .../class-wc-admin-list-table-orders.php | 1 + .../meta-boxes/views/html-order-item-meta.php | 1 + includes/admin/wc-admin-functions.php | 14 +++++++------- includes/wc-order-functions.php | 4 ++++ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/includes/admin/list-tables/class-wc-admin-list-table-orders.php b/includes/admin/list-tables/class-wc-admin-list-table-orders.php index b2a0e511886..417f2819f1a 100644 --- a/includes/admin/list-tables/class-wc-admin-list-table-orders.php +++ b/includes/admin/list-tables/class-wc-admin-list-table-orders.php @@ -454,6 +454,7 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table { 'method_id', 'cost', '_reduced_stock', + '_restock_refunded_items', ) ); diff --git a/includes/admin/meta-boxes/views/html-order-item-meta.php b/includes/admin/meta-boxes/views/html-order-item-meta.php index ceb33b450a5..9056a957668 100644 --- a/includes/admin/meta-boxes/views/html-order-item-meta.php +++ b/includes/admin/meta-boxes/views/html-order-item-meta.php @@ -17,6 +17,7 @@ $hidden_order_itemmeta = apply_filters( 'method_id', 'cost', '_reduced_stock', + '_restock_refunded_items', ) ); ?>
diff --git a/includes/admin/wc-admin-functions.php b/includes/admin/wc-admin-functions.php index 3131dd9ea05..3f9eb051285 100644 --- a/includes/admin/wc-admin-functions.php +++ b/includes/admin/wc-admin-functions.php @@ -206,17 +206,17 @@ function wc_maybe_adjust_line_item_product_stock( $item, $item_quantity = -1 ) { return false; } - $product = $item->get_product(); - $item_quantity = wc_stock_amount( $item_quantity >= 0 ? $item_quantity : $item->get_quantity() ); - $already_reduced_stock = wc_stock_amount( $item->get_meta( '_reduced_stock', true ) ); + $product = $item->get_product(); + $item_quantity = wc_stock_amount( $item_quantity >= 0 ? $item_quantity : $item->get_quantity() ); + $already_reduced_stock = wc_stock_amount( $item->get_meta( '_reduced_stock', true ) ); + $restock_refunded_items = wc_stock_amount( $item->get_meta( '_restock_refunded_items', true ) ); if ( ! $product || ! $product->managing_stock() ) { return false; } - $order = $item->get_order(); - $refunded_item_quantity = $order->get_qty_refunded_for_item( $item->get_id() ); - $diff = $item_quantity + $refunded_item_quantity - $already_reduced_stock; + $order = $item->get_order(); + $diff = $item_quantity - $restock_refunded_items - $already_reduced_stock; /* * 0 as $item_quantity usually indicates we're deleting the order item. @@ -238,7 +238,7 @@ function wc_maybe_adjust_line_item_product_stock( $item, $item_quantity = -1 ) { return $new_stock; } - $item->update_meta_data( '_reduced_stock', $item_quantity + $refunded_item_quantity ); + $item->update_meta_data( '_reduced_stock', $item_quantity - $restock_refunded_items ); $item->save(); if ( $item_quantity > 0 ) { diff --git a/includes/wc-order-functions.php b/includes/wc-order-functions.php index a17bae8244a..e8c905493f2 100644 --- a/includes/wc-order-functions.php +++ b/includes/wc-order-functions.php @@ -715,9 +715,13 @@ function wc_restock_refunded_items( $order, $refunded_line_items ) { $item_stock_reduced = $item_stock_reduced - $qty_to_refund; if ( 0 < $item_stock_reduced ) { + // Keeps track of total running tally of reduced stock. $item->update_meta_data( '_reduced_stock', $item_stock_reduced ); + // Keeps track of only refunded items that needs restock. + $item->update_meta_data( '_restock_refunded_items', $qty_to_refund ); } else { $item->delete_meta_data( '_reduced_stock' ); + $item->delete_meta_data( '_restock_refunded_items' ); } /* translators: 1: product ID 2: old stock level 3: new stock level */ From c315e37c1c52a2a658e2ee388c5f4aa3fd47f881 Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Mon, 26 Apr 2021 09:52:58 -0300 Subject: [PATCH 019/249] switch to individual test files --- .../activate-and-setup/{test-activation.js => activation.test.js} | 0 .../{test-onboarding-tasklist.js => onboarding-tasklist.test.js} | 0 .../{test-initial-settings.js => settings-initial.test.js} | 0 .../{setup-onboarding.test.js => setup-onboarding.js} | 0 ...cart-calculate-shipping.js => cart-calculate-shipping.test.js} | 0 .../front-end/{test-cart-coupons.js => cart-coupons.test.js} | 0 .../{test-cart-redirection.js => cart-redirection.cart.js} | 0 tests/e2e/specs/front-end/{test-cart.js => cart.test.js} | 0 .../{test-checkout-coupons.js => checkout-coupons.test.js} | 0 ...checkout-create-account.js => checkout-create-account.test.js} | 0 ...t-checkout-login-account.js => checkout-login-account.test.js} | 0 tests/e2e/specs/front-end/{test-checkout.js => checkout.test.js} | 0 ...ccount-create-account.js => my-account-create-account.test.js} | 0 ...{test-my-account-pay-order.js => my-account-pay-order.test.js} | 0 .../specs/front-end/{test-my-account.js => my-account.test.js} | 0 ...est-order-email-receiving.js => order-email-receiving.test.js} | 0 ...t-browse-search-sort.js => product-browse-search-sort.test.js} | 0 tests/e2e/specs/front-end/{shopper.test.js => shopper.js} | 0 .../{test-single-product-page.js => single-product-page.test.js} | 0 ...riable-product-updates.js => variable-product-updates.test.js} | 0 ...{test-analytics-page-loads.js => analytics-page-loads.test.js} | 0 .../wp-admin/{test-create-coupon.js => create-coupon.test.js} | 0 .../specs/wp-admin/{test-create-order.js => create-order.test.js} | 0 ...st-add-shipping-classes.js => create-shipping-classes.test.js} | 0 .../{test-add-shipping-zones.js => create-shipping-zones.test.js} | 0 .../{test-add-simple-product.js => create-simple-product.test.js} | 0 ...st-add-variable-product.js => create-variable-product.test.js} | 0 tests/e2e/specs/wp-admin/{merchant.test.js => merchant.js} | 0 .../wp-admin/{test-order-apply-coupon.js => order-coupon.test.js} | 0 ...stomer-payment-page.js => order-customer-payment-page.test.js} | 0 .../e2e/specs/wp-admin/{test-edit-order.js => order-edit.test.js} | 0 .../specs/wp-admin/{test-order-refund.js => order-refund.test.js} | 0 .../wp-admin/{test-order-searching.js => order-searching.test.js} | 0 ...{test-order-status-filters.js => order-status-filters.test.js} | 0 .../specs/wp-admin/{test-product-edit.js => product-edit.test.js} | 0 .../{test-product-import-csv.js => product-import-csv.test.js} | 0 .../wp-admin/{test-product-search.js => product-search.test.js} | 0 ...update-general-settings.js => update-general-settings.test.js} | 0 ...update-product-settings.js => update-product-settings.test.js} | 0 .../{test-update-tax-settings.js => update-tax-settings.test.js} | 0 40 files changed, 0 insertions(+), 0 deletions(-) rename tests/e2e/specs/activate-and-setup/{test-activation.js => activation.test.js} (100%) rename tests/e2e/specs/activate-and-setup/{test-onboarding-tasklist.js => onboarding-tasklist.test.js} (100%) rename tests/e2e/specs/activate-and-setup/{test-initial-settings.js => settings-initial.test.js} (100%) rename tests/e2e/specs/activate-and-setup/{setup-onboarding.test.js => setup-onboarding.js} (100%) rename tests/e2e/specs/front-end/{test-cart-calculate-shipping.js => cart-calculate-shipping.test.js} (100%) rename tests/e2e/specs/front-end/{test-cart-coupons.js => cart-coupons.test.js} (100%) rename tests/e2e/specs/front-end/{test-cart-redirection.js => cart-redirection.cart.js} (100%) rename tests/e2e/specs/front-end/{test-cart.js => cart.test.js} (100%) rename tests/e2e/specs/front-end/{test-checkout-coupons.js => checkout-coupons.test.js} (100%) rename tests/e2e/specs/front-end/{test-checkout-create-account.js => checkout-create-account.test.js} (100%) rename tests/e2e/specs/front-end/{test-checkout-login-account.js => checkout-login-account.test.js} (100%) rename tests/e2e/specs/front-end/{test-checkout.js => checkout.test.js} (100%) rename tests/e2e/specs/front-end/{test-my-account-create-account.js => my-account-create-account.test.js} (100%) rename tests/e2e/specs/front-end/{test-my-account-pay-order.js => my-account-pay-order.test.js} (100%) rename tests/e2e/specs/front-end/{test-my-account.js => my-account.test.js} (100%) rename tests/e2e/specs/front-end/{test-order-email-receiving.js => order-email-receiving.test.js} (100%) rename tests/e2e/specs/front-end/{test-product-browse-search-sort.js => product-browse-search-sort.test.js} (100%) rename tests/e2e/specs/front-end/{shopper.test.js => shopper.js} (100%) rename tests/e2e/specs/front-end/{test-single-product-page.js => single-product-page.test.js} (100%) rename tests/e2e/specs/front-end/{test-variable-product-updates.js => variable-product-updates.test.js} (100%) rename tests/e2e/specs/wp-admin/{test-analytics-page-loads.js => analytics-page-loads.test.js} (100%) rename tests/e2e/specs/wp-admin/{test-create-coupon.js => create-coupon.test.js} (100%) rename tests/e2e/specs/wp-admin/{test-create-order.js => create-order.test.js} (100%) rename tests/e2e/specs/wp-admin/{test-add-shipping-classes.js => create-shipping-classes.test.js} (100%) rename tests/e2e/specs/wp-admin/{test-add-shipping-zones.js => create-shipping-zones.test.js} (100%) rename tests/e2e/specs/wp-admin/{test-add-simple-product.js => create-simple-product.test.js} (100%) rename tests/e2e/specs/wp-admin/{test-add-variable-product.js => create-variable-product.test.js} (100%) rename tests/e2e/specs/wp-admin/{merchant.test.js => merchant.js} (100%) rename tests/e2e/specs/wp-admin/{test-order-apply-coupon.js => order-coupon.test.js} (100%) rename tests/e2e/specs/wp-admin/{test-order-customer-payment-page.js => order-customer-payment-page.test.js} (100%) rename tests/e2e/specs/wp-admin/{test-edit-order.js => order-edit.test.js} (100%) rename tests/e2e/specs/wp-admin/{test-order-refund.js => order-refund.test.js} (100%) rename tests/e2e/specs/wp-admin/{test-order-searching.js => order-searching.test.js} (100%) rename tests/e2e/specs/wp-admin/{test-order-status-filters.js => order-status-filters.test.js} (100%) rename tests/e2e/specs/wp-admin/{test-product-edit.js => product-edit.test.js} (100%) rename tests/e2e/specs/wp-admin/{test-product-import-csv.js => product-import-csv.test.js} (100%) rename tests/e2e/specs/wp-admin/{test-product-search.js => product-search.test.js} (100%) rename tests/e2e/specs/wp-admin/{test-update-general-settings.js => update-general-settings.test.js} (100%) rename tests/e2e/specs/wp-admin/{test-update-product-settings.js => update-product-settings.test.js} (100%) rename tests/e2e/specs/wp-admin/{test-update-tax-settings.js => update-tax-settings.test.js} (100%) diff --git a/tests/e2e/specs/activate-and-setup/test-activation.js b/tests/e2e/specs/activate-and-setup/activation.test.js similarity index 100% rename from tests/e2e/specs/activate-and-setup/test-activation.js rename to tests/e2e/specs/activate-and-setup/activation.test.js diff --git a/tests/e2e/specs/activate-and-setup/test-onboarding-tasklist.js b/tests/e2e/specs/activate-and-setup/onboarding-tasklist.test.js similarity index 100% rename from tests/e2e/specs/activate-and-setup/test-onboarding-tasklist.js rename to tests/e2e/specs/activate-and-setup/onboarding-tasklist.test.js diff --git a/tests/e2e/specs/activate-and-setup/test-initial-settings.js b/tests/e2e/specs/activate-and-setup/settings-initial.test.js similarity index 100% rename from tests/e2e/specs/activate-and-setup/test-initial-settings.js rename to tests/e2e/specs/activate-and-setup/settings-initial.test.js diff --git a/tests/e2e/specs/activate-and-setup/setup-onboarding.test.js b/tests/e2e/specs/activate-and-setup/setup-onboarding.js similarity index 100% rename from tests/e2e/specs/activate-and-setup/setup-onboarding.test.js rename to tests/e2e/specs/activate-and-setup/setup-onboarding.js diff --git a/tests/e2e/specs/front-end/test-cart-calculate-shipping.js b/tests/e2e/specs/front-end/cart-calculate-shipping.test.js similarity index 100% rename from tests/e2e/specs/front-end/test-cart-calculate-shipping.js rename to tests/e2e/specs/front-end/cart-calculate-shipping.test.js diff --git a/tests/e2e/specs/front-end/test-cart-coupons.js b/tests/e2e/specs/front-end/cart-coupons.test.js similarity index 100% rename from tests/e2e/specs/front-end/test-cart-coupons.js rename to tests/e2e/specs/front-end/cart-coupons.test.js diff --git a/tests/e2e/specs/front-end/test-cart-redirection.js b/tests/e2e/specs/front-end/cart-redirection.cart.js similarity index 100% rename from tests/e2e/specs/front-end/test-cart-redirection.js rename to tests/e2e/specs/front-end/cart-redirection.cart.js diff --git a/tests/e2e/specs/front-end/test-cart.js b/tests/e2e/specs/front-end/cart.test.js similarity index 100% rename from tests/e2e/specs/front-end/test-cart.js rename to tests/e2e/specs/front-end/cart.test.js diff --git a/tests/e2e/specs/front-end/test-checkout-coupons.js b/tests/e2e/specs/front-end/checkout-coupons.test.js similarity index 100% rename from tests/e2e/specs/front-end/test-checkout-coupons.js rename to tests/e2e/specs/front-end/checkout-coupons.test.js diff --git a/tests/e2e/specs/front-end/test-checkout-create-account.js b/tests/e2e/specs/front-end/checkout-create-account.test.js similarity index 100% rename from tests/e2e/specs/front-end/test-checkout-create-account.js rename to tests/e2e/specs/front-end/checkout-create-account.test.js diff --git a/tests/e2e/specs/front-end/test-checkout-login-account.js b/tests/e2e/specs/front-end/checkout-login-account.test.js similarity index 100% rename from tests/e2e/specs/front-end/test-checkout-login-account.js rename to tests/e2e/specs/front-end/checkout-login-account.test.js diff --git a/tests/e2e/specs/front-end/test-checkout.js b/tests/e2e/specs/front-end/checkout.test.js similarity index 100% rename from tests/e2e/specs/front-end/test-checkout.js rename to tests/e2e/specs/front-end/checkout.test.js diff --git a/tests/e2e/specs/front-end/test-my-account-create-account.js b/tests/e2e/specs/front-end/my-account-create-account.test.js similarity index 100% rename from tests/e2e/specs/front-end/test-my-account-create-account.js rename to tests/e2e/specs/front-end/my-account-create-account.test.js diff --git a/tests/e2e/specs/front-end/test-my-account-pay-order.js b/tests/e2e/specs/front-end/my-account-pay-order.test.js similarity index 100% rename from tests/e2e/specs/front-end/test-my-account-pay-order.js rename to tests/e2e/specs/front-end/my-account-pay-order.test.js diff --git a/tests/e2e/specs/front-end/test-my-account.js b/tests/e2e/specs/front-end/my-account.test.js similarity index 100% rename from tests/e2e/specs/front-end/test-my-account.js rename to tests/e2e/specs/front-end/my-account.test.js diff --git a/tests/e2e/specs/front-end/test-order-email-receiving.js b/tests/e2e/specs/front-end/order-email-receiving.test.js similarity index 100% rename from tests/e2e/specs/front-end/test-order-email-receiving.js rename to tests/e2e/specs/front-end/order-email-receiving.test.js diff --git a/tests/e2e/specs/front-end/test-product-browse-search-sort.js b/tests/e2e/specs/front-end/product-browse-search-sort.test.js similarity index 100% rename from tests/e2e/specs/front-end/test-product-browse-search-sort.js rename to tests/e2e/specs/front-end/product-browse-search-sort.test.js diff --git a/tests/e2e/specs/front-end/shopper.test.js b/tests/e2e/specs/front-end/shopper.js similarity index 100% rename from tests/e2e/specs/front-end/shopper.test.js rename to tests/e2e/specs/front-end/shopper.js diff --git a/tests/e2e/specs/front-end/test-single-product-page.js b/tests/e2e/specs/front-end/single-product-page.test.js similarity index 100% rename from tests/e2e/specs/front-end/test-single-product-page.js rename to tests/e2e/specs/front-end/single-product-page.test.js diff --git a/tests/e2e/specs/front-end/test-variable-product-updates.js b/tests/e2e/specs/front-end/variable-product-updates.test.js similarity index 100% rename from tests/e2e/specs/front-end/test-variable-product-updates.js rename to tests/e2e/specs/front-end/variable-product-updates.test.js diff --git a/tests/e2e/specs/wp-admin/test-analytics-page-loads.js b/tests/e2e/specs/wp-admin/analytics-page-loads.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-analytics-page-loads.js rename to tests/e2e/specs/wp-admin/analytics-page-loads.test.js diff --git a/tests/e2e/specs/wp-admin/test-create-coupon.js b/tests/e2e/specs/wp-admin/create-coupon.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-create-coupon.js rename to tests/e2e/specs/wp-admin/create-coupon.test.js diff --git a/tests/e2e/specs/wp-admin/test-create-order.js b/tests/e2e/specs/wp-admin/create-order.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-create-order.js rename to tests/e2e/specs/wp-admin/create-order.test.js diff --git a/tests/e2e/specs/wp-admin/test-add-shipping-classes.js b/tests/e2e/specs/wp-admin/create-shipping-classes.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-add-shipping-classes.js rename to tests/e2e/specs/wp-admin/create-shipping-classes.test.js diff --git a/tests/e2e/specs/wp-admin/test-add-shipping-zones.js b/tests/e2e/specs/wp-admin/create-shipping-zones.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-add-shipping-zones.js rename to tests/e2e/specs/wp-admin/create-shipping-zones.test.js diff --git a/tests/e2e/specs/wp-admin/test-add-simple-product.js b/tests/e2e/specs/wp-admin/create-simple-product.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-add-simple-product.js rename to tests/e2e/specs/wp-admin/create-simple-product.test.js diff --git a/tests/e2e/specs/wp-admin/test-add-variable-product.js b/tests/e2e/specs/wp-admin/create-variable-product.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-add-variable-product.js rename to tests/e2e/specs/wp-admin/create-variable-product.test.js diff --git a/tests/e2e/specs/wp-admin/merchant.test.js b/tests/e2e/specs/wp-admin/merchant.js similarity index 100% rename from tests/e2e/specs/wp-admin/merchant.test.js rename to tests/e2e/specs/wp-admin/merchant.js diff --git a/tests/e2e/specs/wp-admin/test-order-apply-coupon.js b/tests/e2e/specs/wp-admin/order-coupon.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-order-apply-coupon.js rename to tests/e2e/specs/wp-admin/order-coupon.test.js diff --git a/tests/e2e/specs/wp-admin/test-order-customer-payment-page.js b/tests/e2e/specs/wp-admin/order-customer-payment-page.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-order-customer-payment-page.js rename to tests/e2e/specs/wp-admin/order-customer-payment-page.test.js diff --git a/tests/e2e/specs/wp-admin/test-edit-order.js b/tests/e2e/specs/wp-admin/order-edit.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-edit-order.js rename to tests/e2e/specs/wp-admin/order-edit.test.js diff --git a/tests/e2e/specs/wp-admin/test-order-refund.js b/tests/e2e/specs/wp-admin/order-refund.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-order-refund.js rename to tests/e2e/specs/wp-admin/order-refund.test.js diff --git a/tests/e2e/specs/wp-admin/test-order-searching.js b/tests/e2e/specs/wp-admin/order-searching.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-order-searching.js rename to tests/e2e/specs/wp-admin/order-searching.test.js diff --git a/tests/e2e/specs/wp-admin/test-order-status-filters.js b/tests/e2e/specs/wp-admin/order-status-filters.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-order-status-filters.js rename to tests/e2e/specs/wp-admin/order-status-filters.test.js diff --git a/tests/e2e/specs/wp-admin/test-product-edit.js b/tests/e2e/specs/wp-admin/product-edit.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-product-edit.js rename to tests/e2e/specs/wp-admin/product-edit.test.js diff --git a/tests/e2e/specs/wp-admin/test-product-import-csv.js b/tests/e2e/specs/wp-admin/product-import-csv.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-product-import-csv.js rename to tests/e2e/specs/wp-admin/product-import-csv.test.js diff --git a/tests/e2e/specs/wp-admin/test-product-search.js b/tests/e2e/specs/wp-admin/product-search.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-product-search.js rename to tests/e2e/specs/wp-admin/product-search.test.js diff --git a/tests/e2e/specs/wp-admin/test-update-general-settings.js b/tests/e2e/specs/wp-admin/update-general-settings.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-update-general-settings.js rename to tests/e2e/specs/wp-admin/update-general-settings.test.js diff --git a/tests/e2e/specs/wp-admin/test-update-product-settings.js b/tests/e2e/specs/wp-admin/update-product-settings.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-update-product-settings.js rename to tests/e2e/specs/wp-admin/update-product-settings.test.js diff --git a/tests/e2e/specs/wp-admin/test-update-tax-settings.js b/tests/e2e/specs/wp-admin/update-tax-settings.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-update-tax-settings.js rename to tests/e2e/specs/wp-admin/update-tax-settings.test.js From 5ab690e2a06981acccb987ff2333a41d81793bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albert=20Juh=C3=A9=20Lluveras?= Date: Tue, 27 Apr 2021 15:09:33 +0200 Subject: [PATCH 020/249] Add item_link and item_link_description labels to Products, Categories and Tags --- includes/class-wc-post-types.php | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/includes/class-wc-post-types.php b/includes/class-wc-post-types.php index aabd27432c1..eed05fd1169 100644 --- a/includes/class-wc-post-types.php +++ b/includes/class-wc-post-types.php @@ -92,18 +92,20 @@ class WC_Post_Types { 'update_count_callback' => '_wc_term_recount', 'label' => __( 'Categories', 'woocommerce' ), 'labels' => array( - 'name' => __( 'Product categories', 'woocommerce' ), - 'singular_name' => __( 'Category', 'woocommerce' ), - 'menu_name' => _x( 'Categories', 'Admin menu name', 'woocommerce' ), - 'search_items' => __( 'Search categories', 'woocommerce' ), - 'all_items' => __( 'All categories', 'woocommerce' ), - 'parent_item' => __( 'Parent category', 'woocommerce' ), - 'parent_item_colon' => __( 'Parent category:', 'woocommerce' ), - 'edit_item' => __( 'Edit category', 'woocommerce' ), - 'update_item' => __( 'Update category', 'woocommerce' ), - 'add_new_item' => __( 'Add new category', 'woocommerce' ), - 'new_item_name' => __( 'New category name', 'woocommerce' ), - 'not_found' => __( 'No categories found', 'woocommerce' ), + 'name' => __( 'Product categories', 'woocommerce' ), + 'singular_name' => __( 'Category', 'woocommerce' ), + 'menu_name' => _x( 'Categories', 'Admin menu name', 'woocommerce' ), + 'search_items' => __( 'Search categories', 'woocommerce' ), + 'all_items' => __( 'All categories', 'woocommerce' ), + 'parent_item' => __( 'Parent category', 'woocommerce' ), + 'parent_item_colon' => __( 'Parent category:', 'woocommerce' ), + 'edit_item' => __( 'Edit category', 'woocommerce' ), + 'update_item' => __( 'Update category', 'woocommerce' ), + 'add_new_item' => __( 'Add new category', 'woocommerce' ), + 'new_item_name' => __( 'New category name', 'woocommerce' ), + 'not_found' => __( 'No categories found', 'woocommerce' ), + 'item_link' => __( 'Product Category Link', 'woocommerce' ), + 'item_link_description' => __( 'A link to a product category.', 'woocommerce' ), ), 'show_ui' => true, 'query_var' => true, @@ -146,6 +148,8 @@ class WC_Post_Types { 'add_or_remove_items' => __( 'Add or remove tags', 'woocommerce' ), 'choose_from_most_used' => __( 'Choose from the most used tags', 'woocommerce' ), 'not_found' => __( 'No tags found', 'woocommerce' ), + 'item_link' => __( 'Product Tag Link', 'woocommerce' ), + 'item_link_description' => __( 'A link to a product tag.', 'woocommerce' ), ), 'show_ui' => true, 'query_var' => true, @@ -335,6 +339,8 @@ class WC_Post_Types { 'filter_items_list' => __( 'Filter products', 'woocommerce' ), 'items_list_navigation' => __( 'Products navigation', 'woocommerce' ), 'items_list' => __( 'Products list', 'woocommerce' ), + 'item_link' => __( 'Product Link', 'woocommerce' ), + 'item_link_description' => __( 'A link to a product.', 'woocommerce' ), ), 'description' => __( 'This is where you can add new products to your store.', 'woocommerce' ), 'public' => true, From 9ae0b52afd7def588003e66a8eab1732270a0599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albert=20Juh=C3=A9=20Lluveras?= Date: Tue, 27 Apr 2021 15:09:54 +0200 Subject: [PATCH 021/249] Allow Product Categories and Products Tags to be shown in REST This way, they can be searched when adding the Product Category Link and Product Tag Link blocks. --- includes/class-wc-post-types.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/includes/class-wc-post-types.php b/includes/class-wc-post-types.php index eed05fd1169..4541c40c582 100644 --- a/includes/class-wc-post-types.php +++ b/includes/class-wc-post-types.php @@ -107,6 +107,7 @@ class WC_Post_Types { 'item_link' => __( 'Product Category Link', 'woocommerce' ), 'item_link_description' => __( 'A link to a product category.', 'woocommerce' ), ), + 'show_in_rest' => true, 'show_ui' => true, 'query_var' => true, 'capabilities' => array( @@ -151,6 +152,7 @@ class WC_Post_Types { 'item_link' => __( 'Product Tag Link', 'woocommerce' ), 'item_link_description' => __( 'A link to a product tag.', 'woocommerce' ), ), + 'show_in_rest' => true, 'show_ui' => true, 'query_var' => true, 'capabilities' => array( From 980fe7c75919dd5e4bc4c282ddf8205e2ded8c99 Mon Sep 17 00:00:00 2001 From: roykho Date: Tue, 27 Apr 2021 07:22:28 -0700 Subject: [PATCH 022/249] Add to the restock_refunded_items count instead of replacting --- includes/wc-order-functions.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/includes/wc-order-functions.php b/includes/wc-order-functions.php index e8c905493f2..10141d3a8a7 100644 --- a/includes/wc-order-functions.php +++ b/includes/wc-order-functions.php @@ -700,9 +700,10 @@ function wc_restock_refunded_items( $order, $refunded_line_items ) { if ( ! isset( $refunded_line_items[ $item_id ], $refunded_line_items[ $item_id ]['qty'] ) ) { continue; } - $product = $item->get_product(); - $item_stock_reduced = $item->get_meta( '_reduced_stock', true ); - $qty_to_refund = $refunded_line_items[ $item_id ]['qty']; + $product = $item->get_product(); + $item_stock_reduced = $item->get_meta( '_reduced_stock', true ); + $restock_refunded_items = (int) $item->get_meta( '_restock_refunded_items', true ); + $qty_to_refund = $refunded_line_items[ $item_id ]['qty']; if ( ! $item_stock_reduced || ! $qty_to_refund || ! $product || ! $product->managing_stock() ) { continue; @@ -717,8 +718,9 @@ function wc_restock_refunded_items( $order, $refunded_line_items ) { if ( 0 < $item_stock_reduced ) { // Keeps track of total running tally of reduced stock. $item->update_meta_data( '_reduced_stock', $item_stock_reduced ); + // Keeps track of only refunded items that needs restock. - $item->update_meta_data( '_restock_refunded_items', $qty_to_refund ); + $item->update_meta_data( '_restock_refunded_items', $qty_to_refund + $restock_refunded_items ); } else { $item->delete_meta_data( '_reduced_stock' ); $item->delete_meta_data( '_restock_refunded_items' ); From b69f46d7d2d7683700448f2ce39cd2e4f232fde0 Mon Sep 17 00:00:00 2001 From: roykho Date: Tue, 27 Apr 2021 09:29:24 -0700 Subject: [PATCH 023/249] Add unit tests --- .../admin/class-wc-admin-functions-test.php | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/tests/php/includes/admin/class-wc-admin-functions-test.php b/tests/php/includes/admin/class-wc-admin-functions-test.php index 18787eb02a7..d7eee561ee3 100644 --- a/tests/php/includes/admin/class-wc-admin-functions-test.php +++ b/tests/php/includes/admin/class-wc-admin-functions-test.php @@ -286,4 +286,104 @@ class WC_Admin_Functions_Test extends \WC_Unit_Test_Case { // Stocks should have been increased to orignal amount minus the partially refunded stock. $this->assertEquals( 95, $product->get_stock_quantity() ); } + + /** + * Test adjust line item function when order item is refunded with restock and then update order. + * + * @link https://github.com/woocommerce/woocommerce/issues/29502. + */ + public function test_admin_refund_with_restock_and_update_order() { + $product = WC_Helper_Product::create_simple_product(); + $product->set_manage_stock( true ); + $product->set_stock_quantity( 100 ); + $product->set_price( 100 ); + $product->set_regular_price( 100 ); + $product->save(); + + $order = WC_Helper_Order::create_order(); + $order->set_status( 'on-hold' ); + $order_item_id = $order->add_product( $product, 10 ); + $order_item = new WC_Order_Item_Product( $order_item_id ); + + // Stocks have not reduced yet. + $product = wc_get_product( $product->get_id() ); + $this->assertEquals( 100, $product->get_stock_quantity() ); + + wc_maybe_adjust_line_item_product_stock( $order_item ); + + $product = wc_get_product( $product->get_id() ); + $this->assertEquals( 90, $product->get_stock_quantity() ); + + $args = array( + 'amount' => 10, + 'order_id' => $order->get_id(), + 'line_items' => array( + $order_item_id => array( + 'qty' => 5, + 'refund_total' => 0, + ), + ), + 'refund_payment' => false, + 'restock_items' => true, + ); + + wc_create_refund( $args ); + + wc_maybe_adjust_line_item_product_stock( $order_item ); + + $product = wc_get_product( $product->get_id() ); + + // Stocks should remain unchanged from after restocking via refund operation. + $this->assertEquals( 95, $product->get_stock_quantity() ); + } + + /** + * Test adjust line item function when order item is refunded without restock and then update order. + * + * @link https://github.com/woocommerce/woocommerce/issues/29502. + */ + public function test_admin_refund_without_restock_and_update_order() { + $product = WC_Helper_Product::create_simple_product(); + $product->set_manage_stock( true ); + $product->set_stock_quantity( 100 ); + $product->set_price( 100 ); + $product->set_regular_price( 100 ); + $product->save(); + + $order = WC_Helper_Order::create_order(); + $order->set_status( 'on-hold' ); + $order_item_id = $order->add_product( $product, 10 ); + $order_item = new WC_Order_Item_Product( $order_item_id ); + + // Stocks have not reduced yet. + $product = wc_get_product( $product->get_id() ); + $this->assertEquals( 100, $product->get_stock_quantity() ); + + wc_maybe_adjust_line_item_product_stock( $order_item ); + + $product = wc_get_product( $product->get_id() ); + $this->assertEquals( 90, $product->get_stock_quantity() ); + + $args = array( + 'amount' => 10, + 'order_id' => $order->get_id(), + 'line_items' => array( + $order_item_id => array( + 'qty' => 5, + 'refund_total' => 0, + ), + ), + 'refund_payment' => false, + 'restock_items' => false, + ); + + wc_create_refund( $args ); + + wc_maybe_adjust_line_item_product_stock( $order_item ); + + $product = wc_get_product( $product->get_id() ); + + // Stocks should remain unchanged from the original order. + $this->assertEquals( 90, $product->get_stock_quantity() ); + } } From bad3df3e239d88f414c1bf37c12d3205b24eb0fa Mon Sep 17 00:00:00 2001 From: Nestor Soriano Date: Wed, 28 Apr 2021 09:36:10 +0200 Subject: [PATCH 024/249] Fix code sniffer errors --- includes/admin/views/html-admin-page-status-tools.php | 8 +++++--- ...class-wc-rest-system-status-tools-v2-controller.php | 10 +++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/includes/admin/views/html-admin-page-status-tools.php b/includes/admin/views/html-admin-page-status-tools.php index a1c5f72d9e5..b54559da8b6 100644 --- a/includes/admin/views/html-admin-page-status-tools.php +++ b/includes/admin/views/html-admin-page-status-tools.php @@ -1,6 +1,8 @@ - $tool ) : ?> - + $tool ) : ?> + diff --git a/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php b/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php index 19f212da2b6..d858c99a409 100644 --- a/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php +++ b/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php @@ -143,7 +143,7 @@ class WC_REST_System_Status_Tools_V2_Controller extends WC_REST_Controller { 'button' => __( 'Clean up download permissions', 'woocommerce' ), 'desc' => __( 'This tool will delete expired download permissions and permissions with 0 remaining downloads.', 'woocommerce' ), ), - 'regenerate_product_lookup_tables' => array( + 'regenerate_product_lookup_tables' => array( 'name' => __( 'Product lookup tables', 'woocommerce' ), 'button' => __( 'Regenerate', 'woocommerce' ), 'desc' => __( 'This tool will regenerate product lookup table data. This process may take a while.', 'woocommerce' ), @@ -552,14 +552,14 @@ class WC_REST_System_Status_Tools_V2_Controller extends WC_REST_Controller { $message = __( 'Template cache cleared.', 'woocommerce' ); } else { $message = __( 'The active version of WooCommerce does not support template cache clearing.', 'woocommerce' ); - $ran = false; + $ran = false; } break; case 'verify_db_tables': if ( ! method_exists( 'WC_Install', 'verify_base_tables' ) ) { $message = __( 'You need WooCommerce 4.2 or newer to run this tool.', 'woocommerce' ); - $ran = false; + $ran = false; break; } // Try to manually create table again. @@ -567,9 +567,9 @@ class WC_REST_System_Status_Tools_V2_Controller extends WC_REST_Controller { if ( 0 === count( $missing_tables ) ) { $message = __( 'Database verified successfully.', 'woocommerce' ); } else { - $message = __( 'Verifying database... One or more tables are still missing: ', 'woocommerce' ); + $message = __( 'Verifying database... One or more tables are still missing: ', 'woocommerce' ); $message .= implode( ', ', $missing_tables ); - $ran = false; + $ran = false; } break; From 10adec6b88b7d382763ce4d2d6183baa8da041db Mon Sep 17 00:00:00 2001 From: Nestor Soriano Date: Wed, 28 Apr 2021 09:47:31 +0200 Subject: [PATCH 025/249] Improvements in the engine behind the debug tools page. Two new optional keys have been added to the tool definition array: - 'disabled': when true the tool button will appear disabled. - 'needs_refresh': when running a tool, by default the tool definitions are retrieved first, then the selected tool is executed, then the definitions previously retrieved are rendered. When this key is true the tool definitions are retrieved again after execution, useful for cases where the tool description or button enable/disable state changes after the tool execution. Also now if a tool execution throws an exception a notice will be shown with the execption message, previously the exception was unhandled. --- includes/admin/class-wc-admin-status.php | 16 +++-- .../views/html-admin-page-status-tools.php | 4 +- ...rest-system-status-tools-v2-controller.php | 33 ++++++++- src/Utilities/ArrayUtil.php | 23 ++++++ tests/php/src/Utilities/ArrayUtilTest.php | 71 +++++++++++++++++++ 5 files changed, 139 insertions(+), 8 deletions(-) diff --git a/includes/admin/class-wc-admin-status.php b/includes/admin/class-wc-admin-status.php index 0092b8b4383..5c4aeafc70f 100644 --- a/includes/admin/class-wc-admin-status.php +++ b/includes/admin/class-wc-admin-status.php @@ -7,6 +7,7 @@ */ use Automattic\Jetpack\Constants; +use Automattic\WooCommerce\Utilities\ArrayUtil; defined( 'ABSPATH' ) || exit; @@ -37,7 +38,8 @@ class WC_Admin_Status { wp_die( 'Cannot load the REST API to access WC_REST_System_Status_Tools_Controller.' ); } - $tools = self::get_tools(); + $tools = self::get_tools(); + $tool_requires_refresh = false; if ( ! empty( $_GET['action'] ) && ! empty( $_REQUEST['_wpnonce'] ) && wp_verify_nonce( wp_unslash( $_REQUEST['_wpnonce'] ), 'debug_action' ) ) { // WPCS: input var ok, sanitization ok. $tools_controller = new WC_REST_System_Status_Tools_Controller(); @@ -46,14 +48,16 @@ class WC_Admin_Status { if ( array_key_exists( $action, $tools ) ) { $response = $tools_controller->execute_tool( $action ); - $tool = $tools[ $action ]; - $tool = array( + $tool = $tools[ $action ]; + $tool_requires_refresh = ArrayUtil::get_value_or_default( $tool, 'requires_refresh', false ); + $tool = array( 'id' => $action, 'name' => $tool['name'], 'action' => $tool['button'], 'description' => $tool['desc'], + 'disabled' => ArrayUtil::get_value_or_default( $tool, 'disabled', false ), ); - $tool = array_merge( $tool, $response ); + $tool = array_merge( $tool, $response ); /** * Fires after a WooCommerce system status tool has been executed. @@ -80,6 +84,10 @@ class WC_Admin_Status { echo '

' . esc_html__( 'Your changes have been saved.', 'woocommerce' ) . '

'; } + if ( $tool_requires_refresh ) { + $tools = self::get_tools(); + } + include_once __DIR__ . '/views/html-admin-page-status-tools.php'; } diff --git a/includes/admin/views/html-admin-page-status-tools.php b/includes/admin/views/html-admin-page-status-tools.php index b54559da8b6..b6d9dacaafc 100644 --- a/includes/admin/views/html-admin-page-status-tools.php +++ b/includes/admin/views/html-admin-page-status-tools.php @@ -5,6 +5,8 @@ * @package WooCommerce */ +use Automattic\WooCommerce\Utilities\ArrayUtil; + if ( ! defined( 'ABSPATH' ) ) { exit; } @@ -21,7 +23,7 @@ if ( ! defined( 'ABSPATH' ) ) {

diff --git a/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php b/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php index d858c99a409..bab123382cc 100644 --- a/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php +++ b/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php @@ -577,11 +577,20 @@ class WC_REST_System_Status_Tools_V2_Controller extends WC_REST_Controller { $tools = $this->get_tools(); if ( isset( $tools[ $tool ]['callback'] ) ) { $callback = $tools[ $tool ]['callback']; - $return = call_user_func( $callback ); - if ( is_string( $return ) ) { + try { + $return = call_user_func( $callback ); + } catch ( Exception $exception ) { + $return = $exception; + } + if ( is_a( $return, Exception::class ) ) { + $callback_string = $this->get_printable_callback_name( $callback, $tool ); + $ran = false; + /* translators: %1$s: callback string, %2$s: error message */ + $message = sprintf( __( 'There was an error calling %1$s: %2$s', 'woocommerce' ), $callback_string, $return->getMessage() ); + } elseif ( is_string( $return ) ) { $message = $return; } elseif ( false === $return ) { - $callback_string = is_array( $callback ) ? get_class( $callback[0] ) . '::' . $callback[1] : $callback; + $callback_string = $this->get_printable_callback_name( $callback, $tool ); $ran = false; /* translators: %s: callback string */ $message = sprintf( __( 'There was an error calling %s', 'woocommerce' ), $callback_string ); @@ -600,4 +609,22 @@ class WC_REST_System_Status_Tools_V2_Controller extends WC_REST_Controller { 'message' => $message, ); } + + /** + * Get a printable name for a callback. + * + * @param mixed $callback The callback to get a name for. + * @param string $default The default name, to be returned when the callback is an inline function. + * @return string A printable name for the callback. + */ + private function get_printable_callback_name( $callback, $default ) { + if ( is_array( $callback ) ) { + return get_class( $callback[0] ) . '::' . $callback[1]; + } + if ( is_string( $callback ) ) { + return $callback; + } + + return $default; + } } diff --git a/src/Utilities/ArrayUtil.php b/src/Utilities/ArrayUtil.php index b381dbef86a..8f63dbd5f89 100644 --- a/src/Utilities/ArrayUtil.php +++ b/src/Utilities/ArrayUtil.php @@ -44,5 +44,28 @@ class ArrayUtil { return $value; } + + /** + * Checks if a given key exists in an array and its value can be evaluated as 'true'. + * + * @param array $array The array to check. + * @param string $key The key for the value to check. + * @return bool True if the key exists in the array and the value can be evaluated as 'true'. + */ + public static function is_truthy( array $array, string $key ) { + return isset( $array[ $key ] ) && $array[ $key ]; + } + + /** + * Gets the value for a given key from an array, or a default value if the key doesn't exist in the array. + * + * @param array $array The array to get the value from. + * @param string $key The key to use to retrieve the value. + * @param null $default The default value to return if the key doesn't exist in the array. + * @return mixed|null The value for the key, or the default value passed. + */ + public static function get_value_or_default( array $array, string $key, $default = null ) { + return isset( $array[ $key ] ) ? $array[ $key ] : $default; + } } diff --git a/tests/php/src/Utilities/ArrayUtilTest.php b/tests/php/src/Utilities/ArrayUtilTest.php index 77f225942ac..f7bbc439089 100644 --- a/tests/php/src/Utilities/ArrayUtilTest.php +++ b/tests/php/src/Utilities/ArrayUtilTest.php @@ -8,6 +8,7 @@ use Automattic\WooCommerce\Utilities\ArrayUtil; * A collection of tests for the array utility class. */ class ArrayUtilTest extends \WC_Unit_Test_Case { + /** * @testdox `get_nested_value` should return null if the requested key doesn't exist and no default value is supplied. * @@ -63,4 +64,74 @@ class ArrayUtilTest extends \WC_Unit_Test_Case { $this->assertEquals( 'buzz', $actual ); } + + /** + * @testdox `is_truthy` returns false when the key does not exist in the array. + */ + public function test_is_truthy_returns_false_if_key_does_not_exist() { + $array = array( 'foo' => 'bar' ); + + $this->assertFalse( ArrayUtil::is_truthy( $array, 'fizz' ) ); + } + + /** + * @testdox `is_truthy` returns false for values that evaluate to false. + * + * @testWith [0] + * ["0"] + * [false] + * [""] + * [null] + * [[]] + * + * @param mixed $value Value to test. + */ + public function test_is_truthy_returns_false_if_value_evaluates_to_false( $value ) { + $array = array( 'foo' => $value ); + + $this->assertFalse( ArrayUtil::is_truthy( $array, 'foo' ) ); + } + + /** + * @testdox `is_truthy` returns true for values that evaluate to true. + * + * @testWith [1] + * ["foo"] + * [true] + * [[1]] + * + * @param mixed $value Value to test. + */ + public function test_is_truthy_returns_false_if_value_evaluates_to_true( $value ) { + $array = array( 'foo' => $value ); + + $this->assertTrue( ArrayUtil::is_truthy( $array, 'foo' ) ); + } + + /** + * @testdox `get_value_or_default` returns the correct value for an existing key. + */ + public function test_get_value_or_default_returns_value_if_key_exists() { + $array = array( 'foo' => 'bar' ); + + $this->assertEquals( 'bar', ArrayUtil::get_value_or_default( $array, 'foo' ) ); + } + + /** + * @testdox `get_value_or_default` returns null if the key does not exist and no default value is supplied. + */ + public function test_get_value_or_default_returns_null_if_key_not_exists_and_no_default_supplied() { + $array = array( 'foo' => 'bar' ); + + $this->assertNull( ArrayUtil::get_value_or_default( $array, 'fizz' ) ); + } + + /** + * @testdox `get_value_or_default` returns the supplied default value if the key does not exist. + */ + public function test_get_value_or_default_returns_supplied_default_value_if_key_not_exists() { + $array = array( 'foo' => 'bar' ); + + $this->assertEquals( 'buzz', ArrayUtil::get_value_or_default( $array, 'fizz', 'buzz' ) ); + } } From d1744ac99a24d66ce62e844240530568a5f6e291 Mon Sep 17 00:00:00 2001 From: Nestor Soriano Date: Wed, 28 Apr 2021 10:30:11 +0200 Subject: [PATCH 026/249] Add the ProductAttributesLookup\DataRegenerator class. This class creates and fills the product attributes lookup table from the existing products. It does so by in small chunks by using Action Scheduler; it handles all the batches and the scheduling by itself. It also adds two entries to the debug tools menu: - Initiate lookup table regeneration (deleting the existing table first) - Enable or disable the actual usage of the lookup table for product filtering The first one is the only way to generate the lookup table for now (there's no explicit data migration). The actual filling of the table is delegated to a LookupDataStore class that is not implemented yet, so for now the table isn't actually filled. Also enabling/disabling the lookup table usage has no real effect yet. --- includes/class-woocommerce.php | 2 + src/Container.php | 6 +- ...ProductAttributesLookupServiceProvider.php | 33 ++ .../DataRegenerator.php | 310 ++++++++++++++++++ .../LookupDataStore.php | 24 ++ 5 files changed, 373 insertions(+), 2 deletions(-) create mode 100644 src/Internal/DependencyManagement/ServiceProviders/ProductAttributesLookupServiceProvider.php create mode 100644 src/Internal/ProductAttributesLookup/DataRegenerator.php create mode 100644 src/Internal/ProductAttributesLookup/LookupDataStore.php diff --git a/includes/class-woocommerce.php b/includes/class-woocommerce.php index 8c74c11fd5b..82c56322fdc 100644 --- a/includes/class-woocommerce.php +++ b/includes/class-woocommerce.php @@ -10,6 +10,7 @@ defined( 'ABSPATH' ) || exit; use Automattic\WooCommerce\Internal\DownloadPermissionsAdjuster; use Automattic\WooCommerce\Internal\AssignDefaultCategory; +use Automattic\WooCommerce\Internal\ProductAttributesLookup\DataRegenerator; use Automattic\WooCommerce\Proxies\LegacyProxy; /** @@ -209,6 +210,7 @@ final class WooCommerce { // These classes set up hooks on instantiation. wc_get_container()->get( DownloadPermissionsAdjuster::class ); wc_get_container()->get( AssignDefaultCategory::class ); + wc_get_container()->get( DataRegenerator::class ); } /** diff --git a/src/Container.php b/src/Container.php index a9291a6de5a..dbfb4656f4d 100644 --- a/src/Container.php +++ b/src/Container.php @@ -8,6 +8,7 @@ namespace Automattic\WooCommerce; use Automattic\WooCommerce\Internal\DependencyManagement\ExtendedContainer; use Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders\DownloadPermissionsAdjusterServiceProvider; use Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders\AssignDefaultCategoryServiceProvider; +use Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders\ProductAttributesLookupServiceProvider; use Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders\ProxiesServiceProvider; use Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders\ThemeManagementServiceProvider; @@ -35,10 +36,11 @@ final class Container implements \Psr\Container\ContainerInterface { * @var string[] */ private $service_providers = array( + AssignDefaultCategoryServiceProvider::class, + DownloadPermissionsAdjusterServiceProvider::class, + ProductAttributesLookupServiceProvider::class, ProxiesServiceProvider::class, ThemeManagementServiceProvider::class, - DownloadPermissionsAdjusterServiceProvider::class, - AssignDefaultCategoryServiceProvider::class, ); /** diff --git a/src/Internal/DependencyManagement/ServiceProviders/ProductAttributesLookupServiceProvider.php b/src/Internal/DependencyManagement/ServiceProviders/ProductAttributesLookupServiceProvider.php new file mode 100644 index 00000000000..f1a818c25f0 --- /dev/null +++ b/src/Internal/DependencyManagement/ServiceProviders/ProductAttributesLookupServiceProvider.php @@ -0,0 +1,33 @@ +share( DataRegenerator::class )->addArgument( LookupDataStore::class ); + $this->share( LookupDataStore::class ); + } +} diff --git a/src/Internal/ProductAttributesLookup/DataRegenerator.php b/src/Internal/ProductAttributesLookup/DataRegenerator.php new file mode 100644 index 00000000000..3d286c697de --- /dev/null +++ b/src/Internal/ProductAttributesLookup/DataRegenerator.php @@ -0,0 +1,310 @@ +add_initiate_regeneration_entry_to_tools_array( $tools ); + }, + 1, + 999 + ); + + if ( $this->regeneration_is_in_progress() ) { + add_action( + 'woocommerce_run_product_attribute_lookup_update_callback', + function () { + $this->run_regeneration_step_callback(); + } + ); + } + } + + /** + * Class initialization, invoked by the DI container. + * + * @internal + * @param LookupDataStore $data_store The data store to use. + */ + final public function init( LookupDataStore $data_store ) { + $this->data_store = $data_store; + } + + /** + * Initialize the regeneration procedure: + * deletes the lookup table and related options if they exist, + * then it creates the table and runs the first step of the regeneration process. + * + * This is the method that should be used as a callback for a data regeneration in wc-update-functions, e.g.: + * + * function wc_update_XX_regenerate_product_attributes_lookup_table() { + * wc_get_container()->get(DataRegenerator::class)->initiate_regeneration(); + * return false; + * } + * + * (Note how we are returning "false" since the class handles the step scheduling by itself). + */ + public function initiate_regeneration() { + $this->delete_all_attributes_lookup_data(); + $products_exist = $this->initialize_table_and_data(); + if ( $products_exist ) { + $this->enqueue_regeneration_step_run(); + } else { + $this->finalize_regeneration(); + } + } + + /** + * Tells if a regeneration is already in progress. + * + * @return bool True if a regeneration is already in progress. + */ + public function regeneration_is_in_progress() { + return ! is_null( get_option( 'woocommerce_attribute_lookup__last_products_page_processed', null ) ); + } + + /** + * Delete all the existing data related to the lookup table, including the table itself. + */ + private function delete_all_attributes_lookup_data() { + global $wpdb; + + delete_option( 'woocommerce_attribute_lookup__enabled' ); + delete_option( 'woocommerce_attribute_lookup__last_product_id_to_process' ); + delete_option( 'woocommerce_attribute_lookup__last_products_page_processed' ); + + $wpdb->query( 'DROP TABLE IF EXISTS wp_wc_product_attributes_lookup' ); + } + + /** + * Create the lookup table and initialize the options that will be temporarily used + * while the regeneration is in progress. + * + * @return bool True if there's any product at all in the database, false otherwise. + */ + private function initialize_table_and_data() { + global $wpdb; + + $wpdb->query( + ' +CREATE TABLE wp_wc_product_attributes_lookup ( + product_id bigint(20) NOT NULL, + product_or_parent_id bigint(20) NOT NULL, + taxonomy varchar(32) NOT NULL, + term_id bigint(20) NOT NULL, + is_variation_attribute tinyint(1) NOT NULL, + in_stock tinyint(1) NOT NULL + ); + ' + ); + + $last_existing_product_id = current( + wc_get_products( + array( + 'return' => 'ids', + 'limit' => 1, + 'orderby' => 'id', + 'order' => 'DESC', + ) + ) + ); + if ( false === $last_existing_product_id ) { + // New shop, no products yet, nothing to regenerate. + return false; + } + + update_option( 'woocommerce_attribute_lookup__last_product_id_to_process', $last_existing_product_id ); + update_option( 'woocommerce_attribute_lookup__last_products_page_processed', 0 ); + + return true; + } + + /** + * Action scheduler callback, performs one regeneration step and then + * schedules the next step if necessary. + */ + private function run_regeneration_step_callback() { + if ( ! $this->regeneration_is_in_progress() ) { + return; + } + + $result = $this->do_regeneration_step(); + if ( $result ) { + $this->enqueue_regeneration_step_run(); + } else { + $this->finalize_regeneration(); + } + } + + /** + * Enqueue one regeneration step in action scheduler. + */ + private function enqueue_regeneration_step_run() { + WC()->queue()->schedule_single( + time() + 1, + 'woocommerce_run_product_attribute_lookup_update_callback', + array(), + 'woocommerce-db-updates' + ); + } + + /** + * Perform one regeneration step: grabs a chunk of products and creates + * the appropriate entries for them in the lookup table. + * + * @return bool True if more steps need to be run, false otherwise. + */ + private function do_regeneration_step() { + $last_products_page_processed = get_option( 'woocommerce_attribute_lookup__last_products_page_processed' ); + $current_products_page = (int) $last_products_page_processed + 1; + + $product_ids = wc_get_products( + array( + 'limit' => 10, + 'page' => $current_products_page, + 'orderby' => array( + 'ID' => 'ASC', + ), + 'return' => 'ids', + ) + ); + + foreach ( $product_ids as $id ) { + $this->data_store->update_data_for_product( $id ); + } + + update_option( 'woocommerce_attribute_lookup__last_products_page_processed', $current_products_page ); + $last_product_id_to_process = get_option( 'woocommerce_attribute_lookup__last_product_id_to_process' ); + return end( $product_ids ) < $last_product_id_to_process; + } + + /** + * Cleanup/final option setup after the regeneration has been completed. + */ + private function finalize_regeneration() { + delete_option( 'woocommerce_attribute_lookup__last_product_id_to_process' ); + delete_option( 'woocommerce_attribute_lookup__last_products_page_processed' ); + update_option( 'woocommerce_attribute_lookup__enabled', 'no' ); + } + + /** + * Add a 'Regenerate product attributes lookup table' entry to the Status - Tools page. + * + * @param array $tools_array The tool definitions array that is passed ro the woocommerce_debug_tools filter. + * @return array The tools array with the entry added. + */ + private function add_initiate_regeneration_entry_to_tools_array( $tools_array ) { + // Regenerate table entry. + + $entry = array( + 'name' => __( 'Regenerate product attributes lookup table', 'woocommerce' ), + 'desc' => __( 'This tool will regenerate the product attributes lookup table data. This process may take a while.', 'woocommerce' ), + 'requires_refresh' => true, + 'callback' => function() { + $this->initiate_regeneration_from_tools_page(); + return __( 'Product attributes lookup table is regenerating', 'woocommerce' ); + }, + ); + + if ( $this->regeneration_is_in_progress() ) { + $entry['button'] = __( 'Regeneration in progress', 'woocommerce' ); + $entry['disabled'] = true; + } else { + $entry['button'] = __( 'Regenerate', 'woocommerce' ); + } + + $tools_array['regenerate_product_attributes_lookup_table'] = $entry; + + // Enable or disable table usage entry. + + if ( 'yes' === get_option( 'woocommerce_attribute_lookup__enabled' ) ) { + $tools_array['disable_product_attributes_lookup_table_usage'] = array( + 'name' => __( 'Disable the product attributes lookup table usage', 'woocommerce' ), + 'desc' => __( 'The product attributes lookup table usage is currently enabled, use this tool to disable it.', 'woocommerce' ), + 'button' => __( 'Disable', 'woocommerce' ), + 'requires_refresh' => true, + 'callback' => function() { + $this->enable_or_disable_lookup_table_usage( false ); + return __( 'Product attributes lookup table usage has been disabled.', 'woocommerce' ); + }, + ); + } elseif ( 'no' === get_option( 'woocommerce_attribute_lookup__enabled' ) ) { + $tools_array['enable_product_attributes_lookup_table_usage'] = array( + 'name' => __( 'Enable the product attributes lookup table usage', 'woocommerce' ), + 'desc' => __( 'The product attributes lookup table usage is currently disabled, use this tool to enable it.', 'woocommerce' ), + 'button' => __( 'Enable', 'woocommerce' ), + 'requires_refresh' => true, + 'callback' => function() { + $this->enable_or_disable_lookup_table_usage( true ); + return __( 'Product attributes lookup table usage has been enabled.', 'woocommerce' ); + }, + ); + } + + return $tools_array; + } + + /** + * Callback to initiate the regeneration process from the Status - Tools page. + * + * @throws \Exception The regeneration is already in progress. + */ + private function initiate_regeneration_from_tools_page() { + if ( $this->regeneration_is_in_progress() ) { + throw new \Exception( 'Product attributes lookup table is already regenerating.' ); + } + + $this->initiate_regeneration(); + } + + /** + * Enable or disable the actual lookup table usage. + * + * @param bool $enable True to enable, false to disable. + * @throws \Exception A lookup table regeneration is currently in progress. + */ + private function enable_or_disable_lookup_table_usage( $enable ) { + if ( $this->regeneration_is_in_progress() ) { + throw new \Exception( "Can't enable or disable the attributes lookup table usage while it's regenerating." ); + } + + update_option( 'woocommerce_attribute_lookup__enabled', $enable ? 'yes' : 'no' ); + } +} diff --git a/src/Internal/ProductAttributesLookup/LookupDataStore.php b/src/Internal/ProductAttributesLookup/LookupDataStore.php new file mode 100644 index 00000000000..d1930222483 --- /dev/null +++ b/src/Internal/ProductAttributesLookup/LookupDataStore.php @@ -0,0 +1,24 @@ + Date: Wed, 28 Apr 2021 12:25:56 +0200 Subject: [PATCH 027/249] Partially implement LookupDataStore::update_data_for_product For now it only creates data for non-variable products. --- .../LookupDataStore.php | 146 +++++++++++++++++- 1 file changed, 145 insertions(+), 1 deletion(-) diff --git a/src/Internal/ProductAttributesLookup/LookupDataStore.php b/src/Internal/ProductAttributesLookup/LookupDataStore.php index d1930222483..cea0070d8dd 100644 --- a/src/Internal/ProductAttributesLookup/LookupDataStore.php +++ b/src/Internal/ProductAttributesLookup/LookupDataStore.php @@ -16,9 +16,153 @@ class LookupDataStore { * Insert or update the lookup data for a given product or variation. * If a variable product is passed the information is updated for all of its variations. * - * @param int|WC_Product|WC_Product_Variation $product Product or variation object or id. + * @param int|WC_Product $product Product object or id. + * @throws \Exception A variation object is passed. */ public function update_data_for_product( $product ) { + // TODO: For now data is always deleted and fully regenerated, existing data should be updated instead. + + if ( ! is_a( $product, \WC_Product::class ) ) { + $product = wc_get_product( $product ); + } + + if ( $this->is_variation( $product ) ) { + throw new \Exception( "LookupDataStore::update_data_for_product can't be called for variations." ); + } + + $this->delete_lookup_table_entries_for( $product->get_id() ); + + if ( $this->is_variable_product( $product ) ) { + $this->create_lookup_table_entries_for_variable_product( $product ); + } else { + $this->create_lookup_table_entries_for_simple_product( $product ); + } + } + + /** + * Delete all the lookup table entries for a given product + * (entries are identified by the "parent_or_product_id" field) + * + * @param int $product_id Simple product id, or main/parent product id for variable products. + */ + private function delete_lookup_table_entries_for( int $product_id ) { + global $wpdb; + + $wpdb->query( + $wpdb->prepare( + 'DELETE FROM wp_wc_product_attributes_lookup WHERE product_or_parent_id = %d', + $product_id + ) + ); + } + + /** + * Create lookup table entries for a simple (non variable) product. + * Assumes that no entries exist yet. + * + * @param \WC_Product $product The product to create the entries for. + */ + private function create_lookup_table_entries_for_simple_product( \WC_Product $product ) { + $product_attributes_data = $this->get_attribute_taxonomies( $product ); + $has_stock = $product->is_in_stock(); + $product_id = $product->get_id(); + foreach ( $product_attributes_data as $taxonomy => $data ) { + $term_ids = $data['term_ids']; + foreach ( $term_ids as $term_id ) { + $this->insert_lookup_table_data( $product_id, $product_id, $taxonomy, $term_id, false, $has_stock ); + } + } + } + + /** + * Create lookup table entries for a variable product. + * Assumes that no entries exist yet. + * + * @param \WC_Product_Variable $product The product to create the entries for. + */ + private function create_lookup_table_entries_for_variable_product( \WC_Product_Variable $product ) { // TODO: Implement. } + + /** + * Check if a given product is a variable product. + * + * @param \WC_Product $product The product to check. + * @return bool True if it's a variable product, false otherwise. + */ + private function is_variable_product( \WC_Product $product ) { + return is_a( $product, \WC_Product_Variable::class ); + } + + /** + * Check if a given product is a variation. + * + * @param \WC_Product $product The product to check. + * @return bool True if it's a variation, false otherwise. + */ + private function is_variation( \WC_Product $product ) { + return is_a( $product, \WC_Product_Variation::class ); + } + + /** + * Return the list of taxonomies used for variations on a product together with + * the associated term ids, with the following format: + * + * [ + * 'taxonomy_name' => + * [ + * 'term_ids' => [id, id, ...], + * 'used_for_variations' => true|false + * ], ... + * ] + * + * @param \WC_Product $product The product to get the attribute taxonomies for. + * @return array Information about the attribute taxonomies of the product. + */ + private function get_attribute_taxonomies( \WC_Product $product ) { + $product_attributes = $product->get_attributes(); + $result = array(); + foreach ( $product_attributes as $taxonomy_name => $attribute_data ) { + $result[ $taxonomy_name ] = array( + 'term_ids' => $attribute_data->get_options(), + 'used_for_variations' => $attribute_data->get_variation(), + ); + } + + return $result; + } + + /** + * Insert one entry in the lookup table. + * + * @param int $product_id The product id. + * @param int $product_or_parent_id The product id for non-variable products, the main/parent product id for variations. + * @param string $taxonomy Taxonomy name. + * @param int $term_id Term id. + * @param bool $is_variation_attribute True if the taxonomy corresponds to an attribute used to define variations. + * @param bool $has_stock True if the product is in stock. + */ + private function insert_lookup_table_data( int $product_id, int $product_or_parent_id, string $taxonomy, int $term_id, bool $is_variation_attribute, bool $has_stock ) { + global $wpdb; + + $wpdb->query( + $wpdb->prepare( + 'INSERT INTO wp_wc_product_attributes_lookup ( + product_id, + product_or_parent_id, + taxonomy, + term_id, + is_variation_attribute, + in_stock) + VALUES + ( %d, %d, %s, %d, %d, %d )', + $product_id, + $product_or_parent_id, + $taxonomy, + $term_id, + $is_variation_attribute ? 1 : 0, + $has_stock ? 1 : 0 + ) + ); + } } From 44493149d50a9e2cd2c62d10715b1aa3f492c79e Mon Sep 17 00:00:00 2001 From: gilesholder <40209785+gilesholder@users.noreply.github.com> Date: Wed, 28 Apr 2021 12:36:45 +0100 Subject: [PATCH 028/249] Update settings-paypal.php Makes IPN notification title consistent with the other titles (no capital letter starts on new words) --- includes/gateways/paypal/includes/settings-paypal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/gateways/paypal/includes/settings-paypal.php b/includes/gateways/paypal/includes/settings-paypal.php index d9d56ddaadf..53729429e8e 100644 --- a/includes/gateways/paypal/includes/settings-paypal.php +++ b/includes/gateways/paypal/includes/settings-paypal.php @@ -58,7 +58,7 @@ return array( 'description' => sprintf( __( 'Log PayPal events, such as IPN requests, inside %s Note: this may log personal information. We recommend using this for debugging purposes only and deleting the logs when finished.', 'woocommerce' ), '' . WC_Log_Handler_File::get_log_file_path( 'paypal' ) . '' ), ), 'ipn_notification' => array( - 'title' => __( 'IPN Email Notifications', 'woocommerce' ), + 'title' => __( 'IPN email notifications', 'woocommerce' ), 'type' => 'checkbox', 'label' => __( 'Enable IPN email notifications', 'woocommerce' ), 'default' => 'yes', From 6432e06e7dd01d15a23f906bdce7a5c991ce3505 Mon Sep 17 00:00:00 2001 From: roykho Date: Wed, 28 Apr 2021 06:14:57 -0700 Subject: [PATCH 029/249] Update value of to take refunded item quantity when is not set --- includes/admin/wc-admin-functions.php | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/includes/admin/wc-admin-functions.php b/includes/admin/wc-admin-functions.php index 3f9eb051285..b5ceb8c2707 100644 --- a/includes/admin/wc-admin-functions.php +++ b/includes/admin/wc-admin-functions.php @@ -206,17 +206,24 @@ function wc_maybe_adjust_line_item_product_stock( $item, $item_quantity = -1 ) { return false; } - $product = $item->get_product(); - $item_quantity = wc_stock_amount( $item_quantity >= 0 ? $item_quantity : $item->get_quantity() ); - $already_reduced_stock = wc_stock_amount( $item->get_meta( '_reduced_stock', true ) ); - $restock_refunded_items = wc_stock_amount( $item->get_meta( '_restock_refunded_items', true ) ); + $product = $item->get_product(); if ( ! $product || ! $product->managing_stock() ) { return false; } - $order = $item->get_order(); - $diff = $item_quantity - $restock_refunded_items - $already_reduced_stock; + $item_quantity = wc_stock_amount( $item_quantity >= 0 ? $item_quantity : $item->get_quantity() ); + $already_reduced_stock = wc_stock_amount( $item->get_meta( '_reduced_stock', true ) ); + $restock_refunded_items = wc_stock_amount( $item->get_meta( '_restock_refunded_items', true ) ); + $order = $item->get_order(); + $refunded_item_quantity = $order->get_qty_refunded_for_item( $item->get_id() ); + $diff = $item_quantity - $restock_refunded_items - $already_reduced_stock; + $_new_reduced_stock = $item_quantity - $restock_refunded_items; + + if ( 0 === $restock_refunded_items ) { + $diff = $item_quantity + $refunded_item_quantity - $already_reduced_stock; + $_new_reduced_stock = $item_quantity - $refunded_item_quantity; + } /* * 0 as $item_quantity usually indicates we're deleting the order item. @@ -238,7 +245,7 @@ function wc_maybe_adjust_line_item_product_stock( $item, $item_quantity = -1 ) { return $new_stock; } - $item->update_meta_data( '_reduced_stock', $item_quantity - $restock_refunded_items ); + $item->update_meta_data( '_reduced_stock', $_new_reduced_stock ); $item->save(); if ( $item_quantity > 0 ) { From 94f5dfaa11254a6ada33170725b85b42a11c7859 Mon Sep 17 00:00:00 2001 From: Nestor Soriano Date: Wed, 28 Apr 2021 16:56:29 +0200 Subject: [PATCH 030/249] Make the DataRegenerator::delete_all_attributes_lookup_data method public. --- src/Internal/ProductAttributesLookup/DataRegenerator.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Internal/ProductAttributesLookup/DataRegenerator.php b/src/Internal/ProductAttributesLookup/DataRegenerator.php index 3d286c697de..a031844ffdb 100644 --- a/src/Internal/ProductAttributesLookup/DataRegenerator.php +++ b/src/Internal/ProductAttributesLookup/DataRegenerator.php @@ -102,8 +102,13 @@ class DataRegenerator { /** * Delete all the existing data related to the lookup table, including the table itself. + * + * There's no UI to delete the lookup table and the related options, but wp cli can be used + * as follows for that purpose: + * + * wp eval "wc_get_container()->get(Automattic\WooCommerce\Internal\ProductAttributesLookup\DataRegenerator::class)->delete_all_attributes_lookup_data();" */ - private function delete_all_attributes_lookup_data() { + public function delete_all_attributes_lookup_data() { global $wpdb; delete_option( 'woocommerce_attribute_lookup__enabled' ); From 83fed1eab5ce8816725d124d21175a6cc920acd9 Mon Sep 17 00:00:00 2001 From: Nestor Soriano Date: Wed, 28 Apr 2021 16:57:47 +0200 Subject: [PATCH 031/249] Implement the LookupDataStore::create_lookup_table_entries_for_variable_product method. --- .../LookupDataStore.php | 109 +++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/src/Internal/ProductAttributesLookup/LookupDataStore.php b/src/Internal/ProductAttributesLookup/LookupDataStore.php index cea0070d8dd..05d133fcdd5 100644 --- a/src/Internal/ProductAttributesLookup/LookupDataStore.php +++ b/src/Internal/ProductAttributesLookup/LookupDataStore.php @@ -5,6 +5,8 @@ namespace Automattic\WooCommerce\Internal\ProductAttributesLookup; +use Automattic\WooCommerce\Utilities\ArrayUtil; + defined( 'ABSPATH' ) || exit; /** @@ -81,7 +83,107 @@ class LookupDataStore { * @param \WC_Product_Variable $product The product to create the entries for. */ private function create_lookup_table_entries_for_variable_product( \WC_Product_Variable $product ) { - // TODO: Implement. + $product_attributes_data = $this->get_attribute_taxonomies( $product ); + $variation_attributes_data = array_filter( + $product_attributes_data, + function( $item ) { + return $item['used_for_variations']; + } + ); + $non_variation_attributes_data = array_filter( + $product_attributes_data, + function( $item ) { + return ! $item['used_for_variations']; + } + ); + + $main_product_has_stock = $product->is_in_stock(); + $main_product_id = $product->get_id(); + + foreach ( $non_variation_attributes_data as $taxonomy => $data ) { + $term_ids = $data['term_ids']; + foreach ( $term_ids as $term_id ) { + $this->insert_lookup_table_data( $main_product_id, $main_product_id, $taxonomy, $term_id, false, $main_product_has_stock ); + } + } + + $term_ids_by_slug_cache = $this->get_term_ids_by_slug_cache( array_keys( $variation_attributes_data ) ); + $variations = $this->get_variations_of( $product ); + + foreach ( $variation_attributes_data as $taxonomy => $data ) { + foreach ( $variations as $variation ) { + $variation_id = $variation->get_id(); + $variation_has_stock = $variation->is_in_stock(); + $variation_definition_term_id = $this->get_variation_definition_term_id( $variation, $taxonomy, $term_ids_by_slug_cache ); + if ( $variation_definition_term_id ) { + $this->insert_lookup_table_data( $variation_id, $main_product_id, $taxonomy, $variation_definition_term_id, true, $variation_has_stock ); + } else { + $term_ids_for_taxonomy = $data['term_ids']; + foreach ( $term_ids_for_taxonomy as $term_id ) { + $this->insert_lookup_table_data( $variation_id, $main_product_id, $taxonomy, $term_id, true, $variation_has_stock ); + } + } + } + } + } + + /** + * Get a cache of term ids by slug for a set of taxonomies, with this format: + * + * [ + * 'taxonomy' => [ + * 'slug_1' => id_1, + * 'slug_2' => id_2, + * ... + * ], ... + * ] + * + * @param array $taxonomies List of taxonomies to build the cache for. + * @return array A dictionary of taxonomies => dictionary of term slug => term id. + */ + private function get_term_ids_by_slug_cache( $taxonomies ) { + $result = array(); + foreach ( $taxonomies as $taxonomy ) { + $terms = get_terms( + array( + 'taxonomy' => $taxonomy, + 'hide_empty' => false, + 'fields' => 'id=>slug', + ) + ); + $result[ $taxonomy ] = array_flip( $terms ); + } + return $result; + } + + /** + * Get the id of the term that defines a variation for a given taxonomy, + * or null if there's no such defining id (for variations having "Any " as the definition) + * + * @param \WC_Product_Variation $variation The variation to get the defining term id for. + * @param string $taxonomy The taxonomy to get the defining term id for. + * @param array $term_ids_by_slug_cache A term ids by slug as generated by get_term_ids_by_slug_cache. + * @return int|null The term id, or null if there's no defining id for that taxonomy in that variation. + */ + private function get_variation_definition_term_id( \WC_Product_Variation $variation, string $taxonomy, array $term_ids_by_slug_cache ) { + $variation_attributes = $variation->get_attributes(); + $term_slug = ArrayUtil::get_value_or_default( $variation_attributes, $taxonomy ); + if ( $term_slug ) { + return $term_ids_by_slug_cache[ $taxonomy ][ $term_slug ]; + } else { + return null; + } + } + + /** + * Get the variations of a given variable product. + * + * @param \WC_Product_Variable $product The product to get the variations for. + * @return array An array of WC_Product_Variation objects. + */ + private function get_variations_of( \WC_Product_Variable $product ) { + $variation_ids = $product->get_children(); + return array_map( 'wc_get_product', $variation_ids ); } /** @@ -123,6 +225,11 @@ class LookupDataStore { $product_attributes = $product->get_attributes(); $result = array(); foreach ( $product_attributes as $taxonomy_name => $attribute_data ) { + if ( ! $attribute_data->get_id() ) { + // Custom product attribute, not suitable for attribute-based filtering. + continue; + } + $result[ $taxonomy_name ] = array( 'term_ids' => $attribute_data->get_options(), 'used_for_variations' => $attribute_data->get_variation(), From 971f41a89e79009be910a5c4df59ef93d0f21c4e Mon Sep 17 00:00:00 2001 From: Marcos <13187467+macr1408@users.noreply.github.com> Date: Wed, 28 Apr 2021 14:04:47 -0300 Subject: [PATCH 032/249] Check for WP Error when uploading placeholder --- includes/class-wc-install.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/includes/class-wc-install.php b/includes/class-wc-install.php index 93ab40b0278..c050d37dca3 100644 --- a/includes/class-wc-install.php +++ b/includes/class-wc-install.php @@ -1333,6 +1333,10 @@ CREATE TABLE {$wpdb->prefix}wc_reserved_stock ( 'post_status' => 'inherit', ); $attach_id = wp_insert_attachment( $attachment, $filename ); + if ( is_wp_error( $attach_id ) ) { + update_option( 'woocommerce_placeholder_image', 0 ); + return; + } update_option( 'woocommerce_placeholder_image', $attach_id ); From ef572483d8c71732018d11d00a03b103c9167fa1 Mon Sep 17 00:00:00 2001 From: roykho Date: Tue, 2 Feb 2021 15:00:27 -0800 Subject: [PATCH 033/249] Update deprecated jQuery functions for jquery.payment.js closes #28284 --- assets/js/jquery-payment/jquery.payment.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/js/jquery-payment/jquery.payment.js b/assets/js/jquery-payment/jquery.payment.js index fec33d4ed68..7c2f63d833d 100644 --- a/assets/js/jquery-payment/jquery.payment.js +++ b/assets/js/jquery-payment/jquery.payment.js @@ -554,8 +554,8 @@ jQuery( function( $ ) { if (!(month && year)) { return false; } - month = $.trim(month); - year = $.trim(year); + month = 'string' === typeof month ? month.trim() : ''; + year = 'string' === typeof year ? year.trim() : ''; if (!/^\d+$/.test(month)) { return false; } @@ -584,7 +584,7 @@ jQuery( function( $ ) { $.payment.validateCardCVC = function(cvc, type) { var card, _ref; - cvc = $.trim(cvc); + cvc = 'string' === typeof cvc ? cvc.trim() : ''; if (!/^\d+$/.test(cvc)) { return false; } From c4c02a20bb80860890a010ae6afa888b437ad917 Mon Sep 17 00:00:00 2001 From: roykho Date: Tue, 2 Feb 2021 15:26:23 -0800 Subject: [PATCH 034/249] Update deprecated jQuery functions for jquery.flot.js --- assets/js/jquery-flot/jquery.flot.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/assets/js/jquery-flot/jquery.flot.js b/assets/js/jquery-flot/jquery.flot.js index aa7e362ae1e..e56d1fb8964 100644 --- a/assets/js/jquery-flot/jquery.flot.js +++ b/assets/js/jquery-flot/jquery.flot.js @@ -29,7 +29,7 @@ Licensed under the MIT license. * V. 1.1: Fix error handling so e.g. parsing an empty string does * produce a color rather than just crashing. */ -(function(B){B.color={};B.color.make=function(F,E,C,D){var G={};G.r=F||0;G.g=E||0;G.b=C||0;G.a=D!=null?D:1;G.add=function(J,I){for(var H=0;H=1){return"rgb("+[G.r,G.g,G.b].join(",")+")"}else{return"rgba("+[G.r,G.g,G.b,G.a].join(",")+")"}};G.normalize=function(){function H(J,K,I){return KI?I:K)}G.r=H(0,parseInt(G.r),255);G.g=H(0,parseInt(G.g),255);G.b=H(0,parseInt(G.b),255);G.a=H(0,G.a,1);return G};G.clone=function(){return B.color.make(G.r,G.b,G.g,G.a)};return G.normalize()};B.color.extract=function(D,C){var E;do{E=D.css(C).toLowerCase();if(E!=""&&E!="transparent"){break}D=D.parent()}while(!B.nodeName(D.get(0),"body"));if(E=="rgba(0, 0, 0, 0)"){E="transparent"}return B.color.parse(E)};B.color.parse=function(F){var E,C=B.color.make;if(E=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(F)){return C(parseInt(E[1],10),parseInt(E[2],10),parseInt(E[3],10))}if(E=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(F)){return C(parseInt(E[1],10),parseInt(E[2],10),parseInt(E[3],10),parseFloat(E[4]))}if(E=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(F)){return C(parseFloat(E[1])*2.55,parseFloat(E[2])*2.55,parseFloat(E[3])*2.55)}if(E=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(F)){return C(parseFloat(E[1])*2.55,parseFloat(E[2])*2.55,parseFloat(E[3])*2.55,parseFloat(E[4]))}if(E=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(F)){return C(parseInt(E[1],16),parseInt(E[2],16),parseInt(E[3],16))}if(E=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(F)){return C(parseInt(E[1]+E[1],16),parseInt(E[2]+E[2],16),parseInt(E[3]+E[3],16))}var D=B.trim(F).toLowerCase();if(D=="transparent"){return C(255,255,255,0)}else{E=A[D]||[0,0,0];return C(E[0],E[1],E[2])}};var A={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery); +(function(B){B.color={};B.color.make=function(F,E,C,D){var G={};G.r=F||0;G.g=E||0;G.b=C||0;G.a=D!=null?D:1;G.add=function(J,I){for(var H=0;H=1){return"rgb("+[G.r,G.g,G.b].join(",")+")"}else{return"rgba("+[G.r,G.g,G.b,G.a].join(",")+")"}};G.normalize=function(){function H(J,K,I){return KI?I:K)}G.r=H(0,parseInt(G.r),255);G.g=H(0,parseInt(G.g),255);G.b=H(0,parseInt(G.b),255);G.a=H(0,G.a,1);return G};G.clone=function(){return B.color.make(G.r,G.b,G.g,G.a)};return G.normalize()};B.color.extract=function(D,C){var E;do{E=D.css(C).toLowerCase();if(E!=""&&E!="transparent"){break}D=D.parent()}while(!B.nodeName(D.get(0),"body"));if(E=="rgba(0, 0, 0, 0)"){E="transparent"}return B.color.parse(E)};B.color.parse=function(F){var E,C=B.color.make;if(E=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(F)){return C(parseInt(E[1],10),parseInt(E[2],10),parseInt(E[3],10))}if(E=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(F)){return C(parseInt(E[1],10),parseInt(E[2],10),parseInt(E[3],10),parseFloat(E[4]))}if(E=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(F)){return C(parseFloat(E[1])*2.55,parseFloat(E[2])*2.55,parseFloat(E[3])*2.55)}if(E=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(F)){return C(parseFloat(E[1])*2.55,parseFloat(E[2])*2.55,parseFloat(E[3])*2.55,parseFloat(E[4]))}if(E=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(F)){return C(parseInt(E[1],16),parseInt(E[2],16),parseInt(E[3],16))}if(E=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(F)){return C(parseInt(E[1]+E[1],16),parseInt(E[2]+E[2],16),parseInt(E[3]+E[3],16))}if('string'===typeof F){var D=F.trim().toLowerCase()}else{var D=''};if(D=="transparent"){return C(255,255,255,0)}else{E=A[D]||[0,0,0];return C(E[0],E[1],E[2])}};var A={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery); // the actual Flot code (function($) { @@ -1265,7 +1265,7 @@ Licensed under the MIT license. octx = overlay.context; // define which element we're listening for events on - eventHolder = $(overlay.element).unbind(); + eventHolder = $(overlay.element).off(); // If we're re-using a plot object, shut down the old one @@ -1291,11 +1291,11 @@ Licensed under the MIT license. // was fixed somewhere around 1.3.x. We can return to using // .mouseleave when we drop support for 1.2.6. - eventHolder.bind("mouseleave", onMouseLeave); + eventHolder.on("mouseleave", onMouseLeave); } if (options.grid.clickable) - eventHolder.click(onClick); + eventHolder.on( 'click', onClick ); executeHooks(hooks.bindEvents, [eventHolder]); } @@ -1304,9 +1304,9 @@ Licensed under the MIT license. if (redrawTimeout) clearTimeout(redrawTimeout); - eventHolder.unbind("mousemove", onMouseMove); - eventHolder.unbind("mouseleave", onMouseLeave); - eventHolder.unbind("click", onClick); + eventHolder.off("mousemove", onMouseMove); + eventHolder.off("mouseleave", onMouseLeave); + eventHolder.off("click", onClick); executeHooks(hooks.shutdown, [eventHolder]); } @@ -1704,7 +1704,7 @@ Licensed under the MIT license. }; } - if ($.isFunction(opts.tickFormatter)) + if ( 'function' === typeof opts.tickFormatter ) axis.tickFormatter = function (v, axis) { return "" + opts.tickFormatter(v, axis); }; if (opts.alignTicksWithAxis != null) { @@ -1751,7 +1751,7 @@ Licensed under the MIT license. if (oticks == null || (typeof oticks == "number" && oticks > 0)) ticks = axis.tickGenerator(axis); else if (oticks) { - if ($.isFunction(oticks)) + if ( 'function' === typeof oticks ) // generate the ticks ticks = oticks(axis); else @@ -1875,7 +1875,7 @@ Licensed under the MIT license. // draw markings var markings = options.grid.markings; if (markings) { - if ($.isFunction(markings)) { + if ( 'function' === typeof markings ) { axes = plot.getAxes(); // xmin etc. is backwards compatibility, to be // removed in the future @@ -2439,9 +2439,9 @@ Licensed under the MIT license. radius = series.points.radius, symbol = series.points.symbol; - // If the user sets the line width to 0, we change it to a very + // If the user sets the line width to 0, we change it to a very // small value. A line width of 0 seems to force the default of 1. - // Doing the conditional here allows the shadow setting to still be + // Doing the conditional here allows the shadow setting to still be // optional even with a lineWidth of 0. if( lw == 0 ) @@ -2659,7 +2659,7 @@ Licensed under the MIT license. // Sort the legend using either the default or a custom comparator if (options.legend.sorted) { - if ($.isFunction(options.legend.sorted)) { + if ( 'function' === typeof options.legend.sorted ) { entries.sort(options.legend.sorted); } else if (options.legend.sorted == "reverse") { entries.reverse(); From e4bfbe7597272a6d97aaf720358b9b38716c7971 Mon Sep 17 00:00:00 2001 From: roykho Date: Tue, 2 Feb 2021 15:35:20 -0800 Subject: [PATCH 035/249] Update deprecated jQuery functions for jquery.float.resize.js --- assets/js/jquery-flot/jquery.flot.resize.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/js/jquery-flot/jquery.flot.resize.js b/assets/js/jquery-flot/jquery.flot.resize.js index 6b2c5d402b1..df6bd37e927 100644 --- a/assets/js/jquery-flot/jquery.flot.resize.js +++ b/assets/js/jquery-flot/jquery.flot.resize.js @@ -20,7 +20,7 @@ can just fix the size of their placeholders. * http://benalman.com/about/license/ */ -(function($,h,c){var a=$([]),e=$.resize=$.extend($.resize,{}),i,k="setTimeout",j="resize",d=j+"-special-event",b="delay",f="throttleWindow";e[b]=250;e[f]=true;$.event.special[j]={setup:function(){if(!e[f]&&this[k]){return false}var l=$(this);a=a.add(l);$.data(this,d,{w:l.width(),h:l.height()});if(a.length===1){g()}},teardown:function(){if(!e[f]&&this[k]){return false}var l=$(this);a=a.not(l);l.removeData(d);if(!a.length){clearTimeout(i)}},add:function(l){if(!e[f]&&this[k]){return false}var n;function m(s,o,p){var q=$(this),r=$.data(this,d);r.w=o!==c?o:q.width();r.h=p!==c?p:q.height();n.apply(this,arguments)}if($.isFunction(l)){n=l;return m}else{n=l.handler;l.handler=m}}};function g(){i=h[k](function(){a.each(function(){var n=$(this),m=n.width(),l=n.height(),o=$.data(this,d);if(m!==o.w||l!==o.h){n.trigger(j,[o.w=m,o.h=l])}});g()},e[b])}})(jQuery,this); +(function($,h,c){var a=$([]),e=$.resize=$.extend($.resize,{}),i,k="setTimeout",j="resize",d=j+"-special-event",b="delay",f="throttleWindow";e[b]=250;e[f]=true;$.event.special[j]={setup:function(){if(!e[f]&&this[k]){return false}var l=$(this);a=a.add(l);$.data(this,d,{w:l.width(),h:l.height()});if(a.length===1){g()}},teardown:function(){if(!e[f]&&this[k]){return false}var l=$(this);a=a.not(l);l.removeData(d);if(!a.length){clearTimeout(i)}},add:function(l){if(!e[f]&&this[k]){return false}var n;function m(s,o,p){var q=$(this),r=$.data(this,d);r.w=o!==c?o:q.width();r.h=p!==c?p:q.height();n.apply(this,arguments)}if('function'===typeof l){n=l;return m}else{n=l.handler;l.handler=m}}};function g(){i=h[k](function(){a.each(function(){var n=$(this),m=n.width(),l=n.height(),o=$.data(this,d);if(m!==o.w||l!==o.h){n.trigger(j,[o.w=m,o.h=l])}});g()},e[b])}})(jQuery,this); (function ($) { var options = { }; // no options @@ -38,19 +38,19 @@ can just fix the size of their placeholders. plot.setupGrid(); plot.draw(); } - + function bindEvents(plot, eventHolder) { plot.getPlaceholder().resize(onResize); } function shutdown(plot, eventHolder) { - plot.getPlaceholder().unbind("resize", onResize); + plot.getPlaceholder().off("resize", onResize); } - + plot.hooks.bindEvents.push(bindEvents); plot.hooks.shutdown.push(shutdown); } - + $.plot.plugins.push({ init: init, options: options, From dddd0d65884e4af6d2fcb5be881a42abf93af843 Mon Sep 17 00:00:00 2001 From: roykho Date: Tue, 2 Feb 2021 15:47:18 -0800 Subject: [PATCH 036/249] Update deprecated jQuery functions for jquery.serializejson.js --- .../js/jquery-serializejson/jquery.serializejson.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/js/jquery-serializejson/jquery.serializejson.js b/assets/js/jquery-serializejson/jquery.serializejson.js index e4259ac91e6..0c885348f0b 100644 --- a/assets/js/jquery-serializejson/jquery.serializejson.js +++ b/assets/js/jquery-serializejson/jquery.serializejson.js @@ -131,7 +131,7 @@ if (opts.typeFunctions && type && opts.typeFunctions[type]) { // use a type if available parsedVal = opts.typeFunctions[type](valStr); - } else if (opts.parseNumbers && f.isNumeric(valStr)) { // auto: number + } else if (opts.parseNumbers && (! isNaN(valStr) && isFinite(valStr))) { // auto: number parsedVal = Number(valStr); } else if (opts.parseBooleans && (valStr === "true" || valStr === "false")) { // auto: boolean parsedVal = (valStr === "true"); @@ -201,17 +201,17 @@ // depending on the options to skip values by name or type, and the data-skip-falsy attribute. shouldSkipFalsy: function($form, name, nameWithNoType, type, opts) { var f = $.serializeJSON; - + var skipFromDataAttr = f.attrFromInputWithName($form, name, 'data-skip-falsy'); if (skipFromDataAttr != null) { - return skipFromDataAttr !== 'false'; // any value is true, except if explicitly using 'false' + return skipFromDataAttr !== 'false'; // any value is true, except if explicitly using 'false' } var optForFields = opts.skipFalsyValuesForFields; if (optForFields && (optForFields.indexOf(nameWithNoType) !== -1 || optForFields.indexOf(name) !== -1)) { return true; } - + var optForTypes = opts.skipFalsyValuesForTypes; if (type == null) type = 'string'; // assume fields with no type are targeted as string if (optForTypes && optForTypes.indexOf(type) !== -1) { @@ -314,12 +314,12 @@ // '' is used to push values into the array "array[]" if (nextKey === '') { - if (f.isUndefined(o[key]) || !$.isArray(o[key])) { + if (f.isUndefined(o[key]) || !Array.isArray(o[key])) { o[key] = []; // define (or override) as array to push values } } else { if (opts.useIntKeysAsArrayIndex && f.isValidArrayIndex(nextKey)) { // if 1, 2, 3 ... then use an array, where nextKey is the index - if (f.isUndefined(o[key]) || !$.isArray(o[key])) { + if (f.isUndefined(o[key]) || !Array.isArray(o[key])) { o[key] = []; // define (or override) as array, to insert values using int keys as array indexes } } else { // for anything else, use an object, where nextKey is going to be the attribute name From 176cd16278fe94379c730f6bb4acc849b003dc48 Mon Sep 17 00:00:00 2001 From: roykho Date: Tue, 2 Feb 2021 15:52:17 -0800 Subject: [PATCH 037/249] Update deprecated jQuery functions for jquery.flexslider.js --- assets/js/flexslider/jquery.flexslider.js | 34 +++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/assets/js/flexslider/jquery.flexslider.js b/assets/js/flexslider/jquery.flexslider.js index d0068f8967f..f97007c7107 100755 --- a/assets/js/flexslider/jquery.flexslider.js +++ b/assets/js/flexslider/jquery.flexslider.js @@ -104,7 +104,7 @@ // KEYBOARD: if (slider.vars.keyboard && ($(slider.containerSelector).length === 1 || slider.vars.multipleKeyboard)) { - $(document).bind('keyup', function(event) { + $(document).on('keyup', function(event) { var keycode = event.keyCode; if (!slider.animating && (keycode === 39 || keycode === 37)) { var target = (slider.vars.rtl? @@ -121,7 +121,7 @@ } // MOUSEWHEEL: if (slider.vars.mousewheel) { - slider.bind('mousewheel', function(event, delta, deltaX, deltaY) { + slider.on('mousewheel', function(event, delta, deltaX, deltaY) { event.preventDefault(); var target = (delta < 0) ? slider.getTarget('next') : slider.getTarget('prev'); slider.flexAnimate(target, slider.vars.pauseOnAction); @@ -157,7 +157,7 @@ if (touch && slider.vars.touch) { methods.touch(); } // FADE&&SMOOTHHEIGHT || SLIDE: - if (!fade || (fade && slider.vars.smoothHeight)) { $(window).bind("resize orientationchange focus", methods.resize); } + if (!fade || (fade && slider.vars.smoothHeight)) { $(window).on("resize orientationchange focus", methods.resize); } slider.find("img").attr("draggable", "false"); @@ -237,27 +237,27 @@ for (var i = 0; i < slider.pagingCount; i++) { slide = slider.slides.eq(i); - if ( undefined === slide.attr( 'data-thumb-alt' ) ) { - slide.attr( 'data-thumb-alt', '' ); + if ( undefined === slide.attr( 'data-thumb-alt' ) ) { + slide.attr( 'data-thumb-alt', '' ); } - + item = $( '' ).attr( 'href', '#' ).text( j ); if ( slider.vars.controlNav === "thumbnails" ) { item = $( '' ).attr( 'src', slide.attr( 'data-thumb' ) ); } - + if ( '' !== slide.attr( 'data-thumb-alt' ) ) { item.attr( 'alt', slide.attr( 'data-thumb-alt' ) ); } if ( 'thumbnails' === slider.vars.controlNav && true === slider.vars.thumbCaptions ) { var captn = slide.attr( 'data-thumbcaption' ); - if ( '' !== captn && undefined !== captn ) { + if ( '' !== captn && undefined !== captn ) { var caption = $('' ).addClass( namespace + 'caption' ).text( captn ); item.append( caption ); } } - + var liElement = $( '
  • ' ); item.appendTo( liElement ); liElement.append( '
    • ' ); @@ -274,7 +274,7 @@ methods.controlNav.active(); - slider.controlNavScaffold.delegate('a, img', eventType, function(event) { + slider.controlNavScaffold.on(eventType, 'a, img', function(event) { event.preventDefault(); if (watchedEvent === "" || watchedEvent === event.type) { @@ -299,7 +299,7 @@ slider.controlNav = slider.manualControls; methods.controlNav.active(); - slider.controlNav.bind(eventType, function(event) { + slider.controlNav.on(eventType, function(event) { event.preventDefault(); if (watchedEvent === "" || watchedEvent === event.type) { @@ -356,7 +356,7 @@ methods.directionNav.update(); - slider.directionNav.bind(eventType, function(event) { + slider.directionNav.on(eventType, function(event) { event.preventDefault(); var target; @@ -404,7 +404,7 @@ methods.pausePlay.update((slider.vars.slideshow) ? namespace + 'pause' : namespace + 'play'); - slider.pausePlay.bind(eventType, function(event) { + slider.pausePlay.on(eventType, function(event) { event.preventDefault(); if (watchedEvent === "" || watchedEvent === event.type) { @@ -794,8 +794,8 @@ } // Unbind previous transitionEnd events and re-bind new transitionEnd event - slider.container.unbind("webkitTransitionEnd transitionend"); - slider.container.bind("webkitTransitionEnd transitionend", function() { + slider.container.off("webkitTransitionEnd transitionend"); + slider.container.on("webkitTransitionEnd transitionend", function() { clearTimeout(slider.ensureAnimationEnd); slider.wrapup(dimension); }); @@ -1133,9 +1133,9 @@ }; // Ensure the slider isn't focussed if the window loses focus. - $( window ).blur( function ( e ) { + $( window ).on( 'blur', function ( e ) { focused = false; - }).focus( function ( e ) { + }).on( 'focus', function ( e ) { focused = true; }); From ac445e058cc62550103c047684ae1f26ecf0bd16 Mon Sep 17 00:00:00 2001 From: roykho Date: Wed, 3 Feb 2021 09:24:02 -0800 Subject: [PATCH 038/249] Update deprecated jQuery functions for jquery.flot --- assets/js/jquery-flot/jquery.flot.pie.js | 10 +++++----- assets/js/jquery-flot/jquery.flot.resize.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/js/jquery-flot/jquery.flot.pie.js b/assets/js/jquery-flot/jquery.flot.pie.js index 07ae3fe5512..adfa7fc6593 100644 --- a/assets/js/jquery-flot/jquery.flot.pie.js +++ b/assets/js/jquery-flot/jquery.flot.pie.js @@ -120,10 +120,10 @@ More detail and specific examples can be found in the included HTML file. var options = plot.getOptions(); if (options.series.pie.show) { if (options.grid.hoverable) { - eventHolder.unbind("mousemove").mousemove(onMouseMove); + eventHolder.off("mousemove").on( 'mousemove', onMouseMove ); } if (options.grid.clickable) { - eventHolder.unbind("click").click(onClick); + eventHolder.off("click").on( 'click', onClick ); } } }); @@ -180,11 +180,11 @@ More detail and specific examples can be found in the included HTML file. // new one; this is more efficient and preserves any extra data // that the user may have stored in higher indexes. - if ($.isArray(value) && value.length == 1) { + if (Array.isArray(value) && value.length == 1) { value = value[0]; } - if ($.isArray(value)) { + if (Array.isArray(value)) { // Equivalent to $.isNumeric() but compatible with jQuery < 1.7 if (!isNaN(parseFloat(value[1])) && isFinite(value[1])) { value[1] = +value[1]; @@ -814,4 +814,4 @@ More detail and specific examples can be found in the included HTML file. version: "1.1" }); -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/assets/js/jquery-flot/jquery.flot.resize.js b/assets/js/jquery-flot/jquery.flot.resize.js index df6bd37e927..ab6fe0df386 100644 --- a/assets/js/jquery-flot/jquery.flot.resize.js +++ b/assets/js/jquery-flot/jquery.flot.resize.js @@ -40,7 +40,7 @@ can just fix the size of their placeholders. } function bindEvents(plot, eventHolder) { - plot.getPlaceholder().resize(onResize); + plot.getPlaceholder().on( 'resize', onResize ); } function shutdown(plot, eventHolder) { From 6b7b8d7b8e88ad51360d1876191f393d7871bcbe Mon Sep 17 00:00:00 2001 From: roykho Date: Wed, 3 Feb 2021 10:16:04 -0800 Subject: [PATCH 039/249] Update deprecated jQuery functions for jquery.flexslider.js --- assets/js/flexslider/jquery.flexslider.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/js/flexslider/jquery.flexslider.js b/assets/js/flexslider/jquery.flexslider.js index f97007c7107..71eb32d5d3f 100755 --- a/assets/js/flexslider/jquery.flexslider.js +++ b/assets/js/flexslider/jquery.flexslider.js @@ -372,7 +372,7 @@ methods.setToClearWatchedEvent(); }); }, - update: function() { + update: function() {console.log('updating...'); var disabledClass = namespace + 'disabled'; if (slider.pagingCount === 1) { slider.directionNav.addClass(disabledClass).attr('tabindex', '-1'); @@ -382,10 +382,10 @@ } else if (slider.animatingTo === slider.last) { slider.directionNav.removeClass(disabledClass).filter('.' + namespace + "next").addClass(disabledClass).attr('tabindex', '-1'); } else { - slider.directionNav.removeClass(disabledClass).removeAttr('tabindex'); + slider.directionNav.removeClass(disabledClass).prop( 'tabindex', '-1' ); } } else { - slider.directionNav.removeClass(disabledClass).removeAttr('tabindex'); + slider.directionNav.removeClass(disabledClass).prop( 'tabindex', '-1' ); } } }, From ebdaaa3f0862e60acc08f9633b7d354db5ea6501 Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Feb 2021 07:26:10 -0800 Subject: [PATCH 040/249] Update deprecated jQuery functions for jquery.cookie.js --- assets/js/jquery-cookie/jquery.cookie.js | 6 +++--- assets/js/zeroclipboard/jquery.zeroclipboard.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/js/jquery-cookie/jquery.cookie.js b/assets/js/jquery-cookie/jquery.cookie.js index 5ff7fef9d6b..c0a20a07ec1 100644 --- a/assets/js/jquery-cookie/jquery.cookie.js +++ b/assets/js/jquery-cookie/jquery.cookie.js @@ -49,14 +49,14 @@ function read(s, converter) { var value = config.raw ? s : parseCookieValue(s); - return $.isFunction(converter) ? converter(value) : value; + return 'function' === typeof converter ? converter(value) : value; } var config = $.cookie = function (key, value, options) { // Write - if (value !== undefined && !$.isFunction(value)) { + if (value !== undefined && 'function' !== typeof value) { options = $.extend({}, config.defaults, options); if (typeof options.expires === 'number') { @@ -114,4 +114,4 @@ return !$.cookie(key); }; -})); \ No newline at end of file +})); diff --git a/assets/js/zeroclipboard/jquery.zeroclipboard.js b/assets/js/zeroclipboard/jquery.zeroclipboard.js index a8f1a1e7f21..dcf333e2856 100644 --- a/assets/js/zeroclipboard/jquery.zeroclipboard.js +++ b/assets/js/zeroclipboard/jquery.zeroclipboard.js @@ -1,7 +1,7 @@ /*! * jquery.zeroclipboard * Bind to the `beforecopy`, `copy`, `aftercopy`, and `copy-error` events, custom DOM-like events for clipboard injection generated using jQuery's Special Events API and ZeroClipboard's Core module. - * Copyright (c) 2014 + * Copyright (c) 2014 * Licensed MIT * https://github.com/zeroclipboard/jquery.zeroclipboard * v0.2.0 @@ -474,7 +474,7 @@ * The underlying implementation of `ZeroClipboard.destroy`. * @private */ - var _destroy = function() { + var _destroy = function() {console.log('zero', ZeroClipboard); ZeroClipboard.clearData(); ZeroClipboard.blur(); ZeroClipboard.emit("destroy"); @@ -1878,4 +1878,4 @@ } })(jQuery, function() { return this || window; -}()); \ No newline at end of file +}()); From a5543fd79f56ce341dd2110108b6326f2c064a2a Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Feb 2021 07:33:49 -0800 Subject: [PATCH 041/249] Update deprecated jQuery functions for jquery.tiptip.js --- assets/js/jquery-tiptip/jquery.tipTip.js | 15 ++++++++------- assets/js/zeroclipboard/jquery.zeroclipboard.js | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/assets/js/jquery-tiptip/jquery.tipTip.js b/assets/js/jquery-tiptip/jquery.tipTip.js index 699335067d1..cd03271ba30 100644 --- a/assets/js/jquery-tiptip/jquery.tipTip.js +++ b/assets/js/jquery-tiptip/jquery.tipTip.js @@ -58,7 +58,7 @@ } if(org_title != ""){ if(!opts.content){ - org_elem.removeAttr(opts.attribute); //remove original Attribute + org_elem[0].removeAttribute(opts.attribute); //remove original Attribute } var timeout = false; @@ -76,16 +76,16 @@ }); } } else if(opts.activation == "focus"){ - org_elem.focus(function(){ + org_elem.on( 'focus', function(){ active_tiptip(); - }).blur(function(){ + }).on( 'blur', function(){ deactive_tiptip(); }); } else if(opts.activation == "click"){ - org_elem.click(function(){ + org_elem.on( 'click', function(){ active_tiptip(); return false; - }).hover(function(){},function(){ + }).on( 'hover', function(){},function(){ if(!opts.keepAlive){ deactive_tiptip(); } @@ -100,8 +100,9 @@ function active_tiptip(){ opts.enter.call(this); tiptip_content.html(org_title); - tiptip_holder.hide().removeAttr("class").css("margin","0"); - tiptip_arrow.removeAttr("style"); + tiptip_holder.hide().css("margin","0"); + tiptip_holder[0].removeAttribute('class'); + tiptip_arrow[0].removeAttribute("style"); var top = parseInt(org_elem.offset()['top']); var left = parseInt(org_elem.offset()['left']); diff --git a/assets/js/zeroclipboard/jquery.zeroclipboard.js b/assets/js/zeroclipboard/jquery.zeroclipboard.js index dcf333e2856..5f64fe299df 100644 --- a/assets/js/zeroclipboard/jquery.zeroclipboard.js +++ b/assets/js/zeroclipboard/jquery.zeroclipboard.js @@ -474,7 +474,7 @@ * The underlying implementation of `ZeroClipboard.destroy`. * @private */ - var _destroy = function() {console.log('zero', ZeroClipboard); + var _destroy = function() { ZeroClipboard.clearData(); ZeroClipboard.blur(); ZeroClipboard.emit("destroy"); From 3d1391f6bdf00be7006ec61052a8a44a0f7fd2ad Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Feb 2021 07:42:17 -0800 Subject: [PATCH 042/249] Update deprecated jQuery functions for jquery.zoom.js --- assets/js/zoom/jquery.zoom.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/js/zoom/jquery.zoom.js b/assets/js/zoom/jquery.zoom.js index d9cf35361e7..45ddbce029a 100755 --- a/assets/js/zoom/jquery.zoom.js +++ b/assets/js/zoom/jquery.zoom.js @@ -125,12 +125,12 @@ // Skip the fade-in for IE8 and lower since it chokes on fading-in // and changing position based on mousemovement at the same time. $img.stop() - .fadeTo($.support.opacity ? settings.duration : 0, 1, $.isFunction(settings.onZoomIn) ? settings.onZoomIn.call(img) : false); + .fadeTo($.support.opacity ? settings.duration : 0, 1, 'function' === typeof settings.onZoomIn ? settings.onZoomIn.call(img) : false); } function stop() { $img.stop() - .fadeTo(settings.duration, 0, $.isFunction(settings.onZoomOut) ? settings.onZoomOut.call(img) : false); + .fadeTo(settings.duration, 0, 'function' === typeof settings.onZoomOut ? settings.onZoomOut.call(img) : false); } // Mouse events @@ -221,8 +221,8 @@ } }); } - - if ($.isFunction(settings.callback)) { + + if ('function' === typeof settings.callback) { settings.callback.call(img); } }; From 08aa9e32ebf1f7d66e5adc33662d489b5307b1ec Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Feb 2021 08:04:38 -0800 Subject: [PATCH 043/249] Update deprecated jQuery functions for jquery.blockui.js --- assets/js/jquery-blockui/jquery.blockUI.js | 14 ++++----- assets/js/prettyPhoto/jquery.prettyPhoto.js | 34 ++++++++++----------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/assets/js/jquery-blockui/jquery.blockUI.js b/assets/js/jquery-blockui/jquery.blockUI.js index 561c50a0825..b2cba9e0678 100644 --- a/assets/js/jquery-blockui/jquery.blockUI.js +++ b/assets/js/jquery-blockui/jquery.blockUI.js @@ -25,7 +25,7 @@ var msie = /MSIE/.test(navigator.userAgent); var ie6 = /MSIE 6.0/.test(navigator.userAgent) && ! /MSIE 8.0/.test(navigator.userAgent); var mode = document.documentMode || 0; - var setExpr = $.isFunction( document.createElement('div').style.setExpression ); + var setExpr = 'function' === typeof document.createElement('div').style.setExpression ? document.createElement('div').style.setExpression : false; // global $ methods for blocking/unblocking the entire page $.blockUI = function(opts) { install(window, opts); }; @@ -56,7 +56,7 @@ callBlock(); var nonmousedOpacity = $m.css('opacity'); - $m.mouseover(function() { + $m.on( 'mouseover', function() { callBlock({ fadeIn: 0, timeout: 30000 @@ -65,7 +65,7 @@ var displayBlock = $('.blockMsg'); displayBlock.stop(); // cancel fadeout if it has started displayBlock.fadeTo(300, 1); // make it easier to read the message by removing transparency - }).mouseout(function() { + }).on( 'mouseout', function() { $('.blockMsg').fadeOut(1000); }); // End konapun additions @@ -550,9 +550,9 @@ // bind anchors and inputs for mouse and key events var events = 'mousedown mouseup keydown keypress keyup touchstart touchend touchmove'; if (b) - $(document).bind(events, opts, handler); + $(document).on(events, opts, handler); else - $(document).unbind(events, handler); + $(document).off(events, handler); // former impl... // var $e = $('a,:input'); @@ -591,7 +591,7 @@ return; var e = pageBlockEls[back===true ? pageBlockEls.length-1 : 0]; if (e) - e.focus(); + e.trigger( 'focus' ); } function center(el, x, y) { @@ -616,4 +616,4 @@ setup(jQuery); } -})(); \ No newline at end of file +})(); diff --git a/assets/js/prettyPhoto/jquery.prettyPhoto.js b/assets/js/prettyPhoto/jquery.prettyPhoto.js index 2eb2b86b786..59334d51396 100644 --- a/assets/js/prettyPhoto/jquery.prettyPhoto.js +++ b/assets/js/prettyPhoto/jquery.prettyPhoto.js @@ -108,10 +108,10 @@ doresize = true, scroll_pos = _get_scroll(); // Window/Keyboard events - $(window).unbind('resize.prettyphoto').bind('resize.prettyphoto',function(){ _center_overlay(); _resize_overlay(); }); + $(window).off('resize.prettyphoto').on('resize.prettyphoto',function(){ _center_overlay(); _resize_overlay(); }); if(pp_settings.keyboard_shortcuts) { - $(document).unbind('keydown.prettyphoto').bind('keydown.prettyphoto',function(e){ + $(document).off('keydown.prettyphoto').on('keydown.prettyphoto',function(e){ if(typeof $pp_pic_holder != 'undefined'){ if($pp_pic_holder.is(':visible')){ switch(e.keyCode){ @@ -162,7 +162,7 @@ _build_overlay(this); // Build the overlay {this} being the caller if(settings.allow_resize) - $(window).bind('scroll.prettyphoto',function(){ _center_overlay(); }); + $(window).on('scroll.prettyphoto',function(){ _center_overlay(); }); $.prettyPhoto.open(); @@ -431,7 +431,7 @@ */ $.prettyPhoto.startSlideshow = function(){ if(typeof pp_slideshow == 'undefined'){ - $pp_pic_holder.find('.pp_play').unbind('click').removeClass('pp_play').addClass('pp_pause').click(function(){ + $pp_pic_holder.find('.pp_play').off('click').removeClass('pp_play').addClass('pp_pause').on( 'click', function(){ $.prettyPhoto.stopSlideshow(); return false; }); @@ -446,7 +446,7 @@ * Stop the slideshow... */ $.prettyPhoto.stopSlideshow = function(){ - $pp_pic_holder.find('.pp_pause').unbind('click').removeClass('pp_pause').addClass('pp_play').click(function(){ + $pp_pic_holder.find('.pp_pause').off('click').removeClass('pp_pause').addClass('pp_play').on( 'click', function(){ $.prettyPhoto.startSlideshow(); return false; }); @@ -473,7 +473,7 @@ $(this).remove(); // No more need for the prettyPhoto markup - $(window).unbind('scroll.prettyphoto'); + $(window).off('scroll.prettyphoto'); clearHashtag(); @@ -739,7 +739,7 @@ $pp_gallery_li.filter(':eq('+set_position+')').addClass('selected'); }else{ - $pp_pic_holder.find('.pp_content').unbind('mouseenter mouseleave'); + $pp_pic_holder.find('.pp_content').off('mouseenter mouseleave'); // $pp_gallery.hide(); } } @@ -776,13 +776,13 @@ $pp_gallery = $('.pp_pic_holder .pp_gallery'), $pp_gallery_li = $pp_gallery.find('li'); // Set the gallery selectors - $pp_gallery.find('.pp_arrow_next').click(function(){ + $pp_gallery.find('.pp_arrow_next').on( 'click', function(){ $.prettyPhoto.changeGalleryPage('next'); $.prettyPhoto.stopSlideshow(); return false; }); - $pp_gallery.find('.pp_arrow_previous').click(function(){ + $pp_gallery.find('.pp_arrow_previous').on( 'click', function(){ $.prettyPhoto.changeGalleryPage('previous'); $.prettyPhoto.stopSlideshow(); return false; @@ -800,7 +800,7 @@ $pp_gallery_li.each(function(i){ $(this) .find('a') - .click(function(){ + .on( 'click', function(){ $.prettyPhoto.changePage(i); $.prettyPhoto.stopSlideshow(); return false; @@ -812,7 +812,7 @@ // Inject the play/pause if it's a slideshow if(settings.slideshow){ $pp_pic_holder.find('.pp_nav').prepend('Play') - $pp_pic_holder.find('.pp_nav .pp_play').click(function(){ + $pp_pic_holder.find('.pp_nav .pp_play').on( 'click', function(){ $.prettyPhoto.startSlideshow(); return false; }); @@ -826,15 +826,15 @@ 'height':$(document).height(), 'width':$(window).width() }) - .bind('click',function(){ + .on('click',function(){ if(!settings.modal) $.prettyPhoto.close(); }); - $('a.pp_close').bind('click',function(){ $.prettyPhoto.close(); return false; }); + $('a.pp_close').on('click',function(){ $.prettyPhoto.close(); return false; }); if(settings.allow_expand) { - $('a.pp_expand').bind('click',function(e){ + $('a.pp_expand').on('click',function(e){ // Expand the image if($(this).hasClass('pp_expand')){ $(this).removeClass('pp_expand').addClass('pp_contract'); @@ -850,13 +850,13 @@ }); } - $pp_pic_holder.find('.pp_previous, .pp_nav .pp_arrow_previous').bind('click',function(){ + $pp_pic_holder.find('.pp_previous, .pp_nav .pp_arrow_previous').on('click',function(){ $.prettyPhoto.changePage('previous'); $.prettyPhoto.stopSlideshow(); return false; }); - $pp_pic_holder.find('.pp_next, .pp_nav .pp_arrow_next').bind('click',function(){ + $pp_pic_holder.find('.pp_next, .pp_nav .pp_arrow_next').on('click',function(){ $.prettyPhoto.changePage('next'); $.prettyPhoto.stopSlideshow(); return false; @@ -879,7 +879,7 @@ setTimeout(function(){ $("a["+pp_settings.hook+"^='"+hashRel+"']:eq("+hashIndex+")").trigger('click'); },50); } - return this.unbind('click.prettyphoto').bind('click.prettyphoto',$.prettyPhoto.initialize); // Return the jQuery object for chaining. The unbind method is used to avoid click conflict when the plugin is called more than once + return this.off('click.prettyphoto').on('click.prettyphoto',$.prettyPhoto.initialize); // Return the jQuery object for chaining. The unbind method is used to avoid click conflict when the plugin is called more than once }; function getHashtag(){ From 37f7ccc1f22e1d6f75fe27fbfd58f268c09cfac4 Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Feb 2021 08:08:25 -0800 Subject: [PATCH 044/249] Update deprecated jQuery functions for api-keys.js --- assets/js/admin/api-keys.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/js/admin/api-keys.js b/assets/js/admin/api-keys.js index f51a2cf7e0d..5c22ef3640e 100644 --- a/assets/js/admin/api-keys.js +++ b/assets/js/admin/api-keys.js @@ -53,7 +53,7 @@ .on( 'click', css_class, function( evt ) { evt.preventDefault(); if ( ! document.queryCommandSupported( 'copy' ) ) { - $( css_class ).parent().find( 'input' ).focus().select(); + $( css_class ).parent().find( 'input' ).trigger( 'focus' ).trigger( 'select' ); $( '#copy-error' ).text( woocommerce_admin_api_keys.clipboard_failed ); } else { $( '#copy-error' ).text( '' ); @@ -69,10 +69,10 @@ 'fadeIn': 50, 'fadeOut': 50, 'delay': 0 - } ).focus(); + } ).trigger( 'focus' ); } ) .on( 'aftercopyerror', css_class, function() { - $( css_class ).parent().find( 'input' ).focus().select(); + $( css_class ).parent().find( 'input' ).trigger( 'focus' ).trigger( 'select' ); $( '#copy-error' ).text( woocommerce_admin_api_keys.clipboard_failed ); } ); }, From 13a9dbb422d3e6a5595484457a623f1de92054c9 Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Feb 2021 08:10:23 -0800 Subject: [PATCH 045/249] Update deprecated jQuery functions for backbone-modal.js --- assets/js/admin/backbone-modal.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/admin/backbone-modal.js b/assets/js/admin/backbone-modal.js index 63cca56422a..061a37c8bae 100644 --- a/assets/js/admin/backbone-modal.js +++ b/assets/js/admin/backbone-modal.js @@ -72,7 +72,7 @@ _.bindAll( this, 'render' ); this.render(); - $( window ).resize(function() { + $( window ).on( 'resize', function() { view.resizeContent(); }); }, @@ -88,7 +88,7 @@ }).append( this.$el ); this.resizeContent(); - this.$( '.wc-backbone-modal-content' ).attr( 'tabindex' , '0' ).focus(); + this.$( '.wc-backbone-modal-content' ).attr( 'tabindex' , '0' ).trigger( 'focus' ); $( document.body ).trigger( 'init_tooltips' ); From 6e50fc0cf1b53b68b22f92237ee8ae49b8d04443 Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Feb 2021 08:11:44 -0800 Subject: [PATCH 046/249] Update deprecated jQuery functions for meta-boxes-coupon.js --- assets/js/admin/meta-boxes-coupon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/admin/meta-boxes-coupon.js b/assets/js/admin/meta-boxes-coupon.js index c4327f33644..594726739c0 100644 --- a/assets/js/admin/meta-boxes-coupon.js +++ b/assets/js/admin/meta-boxes-coupon.js @@ -61,7 +61,7 @@ jQuery(function( $ ) { ); } $result = woocommerce_admin_meta_boxes_coupon.prefix + $result + woocommerce_admin_meta_boxes_coupon.suffix; - $coupon_code_field.focus().val( $result ); + $coupon_code_field.trigger( 'focus' ).val( $result ); $coupon_code_label.addClass( 'screen-reader-text' ); } }; From 18797493b303d05813d3b2344ec63e6a64c30459 Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Feb 2021 08:17:41 -0800 Subject: [PATCH 047/249] Update deprecated jQuery functions for meta-boxes-order.js --- assets/js/admin/meta-boxes-order.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/js/admin/meta-boxes-order.js b/assets/js/admin/meta-boxes-order.js index 2267afe26ed..bca2a3b49a2 100644 --- a/assets/js/admin/meta-boxes-order.js +++ b/assets/js/admin/meta-boxes-order.js @@ -22,7 +22,7 @@ jQuery( function ( $ ) { this.states = JSON.parse( woocommerce_admin_meta_boxes_order.countries.replace( /"/g, '"' ) ); } - $( '.js_field-country' ).selectWoo().change( this.change_country ); + $( '.js_field-country' ).selectWoo().on( 'change', this.change_country ); $( '.js_field-country' ).trigger( 'change', [ true ] ); $( document.body ).on( 'change', 'select.js_field-state', this.change_state ); $( '#woocommerce-order-actions input, #woocommerce-order-actions a' ).on( 'click', function() { @@ -117,8 +117,8 @@ jQuery( function ( $ ) { }, init_tiptip: function() { - $( '#tiptip_holder' ).removeAttr( 'style' ); - $( '#tiptip_arrow' ).removeAttr( 'style' ); + $( '#tiptip_holder' )[0].removeAttribute( 'style' ); + $( '#tiptip_arrow' )[0].removeAttribute( 'style' ); $( '.tips' ).tipTip({ 'attribute': 'data-tip', 'fadeIn': 50, @@ -140,7 +140,7 @@ jQuery( function ( $ ) { is_billing = Boolean( $edit_address.find( 'input[name^="_billing_"]' ).length ); $address.hide(); - $this.parent().find( 'a' ).toggle(); + $this.parent().find( 'a' ).trigger( 'toggle' ); if ( ! $country_input.val() ) { $country_input.val( woocommerce_admin_meta_boxes_order.default_country ).trigger( 'change' ); From afb96565619b33dc706211dbbb21986f2d7c5ec7 Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Feb 2021 08:40:24 -0800 Subject: [PATCH 048/249] Update deprecated jQuery functions for meta-boxes-product-variation.js --- assets/js/admin/meta-boxes-product-variation.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/js/admin/meta-boxes-product-variation.js b/assets/js/admin/meta-boxes-product-variation.js index 551ad33a114..b34461cff86 100644 --- a/assets/js/admin/meta-boxes-product-variation.js +++ b/assets/js/admin/meta-boxes-product-variation.js @@ -116,8 +116,8 @@ jQuery( function( $ ) { } // Init TipTip - $( '#tiptip_holder' ).removeAttr( 'style' ); - $( '#tiptip_arrow' ).removeAttr( 'style' ); + $( '#tiptip_holder' )[0].removeAttribute( 'style' ); + $( '#tiptip_arrow' )[0].removeAttribute( 'style' ); $( '.woocommerce_variations .tips, .woocommerce_variations .help_tip, .woocommerce_variations .woocommerce-help-tip', wrapper ) .tipTip({ 'attribute': 'data-tip', @@ -594,7 +594,7 @@ jQuery( function( $ ) { $( '.woocommerce-notice-invalid-variation' ).remove(); $( '#variable_product_options' ).find( '.woocommerce_variations' ).prepend( variation ); - $( 'button.cancel-variation-changes, button.save-variation-changes' ).removeAttr( 'disabled' ); + $( 'button.cancel-variation-changes, button.save-variation-changes' )[0].removeAttribute( 'disabled' ); $( '#variable_product_options' ).trigger( 'woocommerce_variations_added', 1 ); wc_meta_boxes_product_variations_ajax.unblock(); }); @@ -700,7 +700,7 @@ jQuery( function( $ ) { .closest( '.woocommerce_variation' ) .addClass( 'variation-needs-update' ); - $( 'button.cancel-variation-changes, button.save-variation-changes' ).removeAttr( 'disabled' ); + $( 'button.cancel-variation-changes, button.save-variation-changes' )[0].removeAttribute( 'disabled' ); $( '#variable_product_options' ).trigger( 'woocommerce_variations_input_changed' ); }, @@ -714,7 +714,7 @@ jQuery( function( $ ) { .find( '.woocommerce_variation:first' ) .addClass( 'variation-needs-update' ); - $( 'button.cancel-variation-changes, button.save-variation-changes' ).removeAttr( 'disabled' ); + $( 'button.cancel-variation-changes, button.save-variation-changes' )[0].removeAttribute( 'disabled' ); $( '#variable_product_options' ).trigger( 'woocommerce_variations_defaults_changed' ); }, From f59c7772e5173d70afc05143da539faacfd91d18 Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Feb 2021 08:47:13 -0800 Subject: [PATCH 049/249] Update deprecated jQuery functions for meta-boxes-product.js --- assets/js/admin/meta-boxes-product.js | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/assets/js/admin/meta-boxes-product.js b/assets/js/admin/meta-boxes-product.js index 6d00cbc7a7b..3a4e7286a9a 100644 --- a/assets/js/admin/meta-boxes-product.js +++ b/assets/js/admin/meta-boxes-product.js @@ -35,7 +35,7 @@ jQuery( function( $ ) { $( function() { // Prevent inputs in meta box headings opening/closing contents. - $( '#woocommerce-product-data' ).find( '.hndle' ).unbind( 'click.postboxes' ); + $( '#woocommerce-product-data' ).find( '.hndle' ).off( 'click.postboxes' ); $( '#woocommerce-product-data' ).on( 'click', '.hndle', function( event ) { @@ -77,7 +77,7 @@ jQuery( function( $ ) { var current_visibility = $( '#current_visibility' ).val(); var current_featured = $( '#current_featured' ).val(); - $( 'input[name=_visibility]' ).removeAttr( 'checked' ); + $( 'input[name=_visibility]' )[0].removeAttribute( 'checked' ); $( 'input[name=_visibility][value=' + current_visibility + ']' ).attr( 'checked', 'checked' ); var label = $( 'input[name=_visibility]:checked' ).attr( 'data-label' ); @@ -86,7 +86,7 @@ jQuery( function( $ ) { label = label + ', ' + woocommerce_admin_meta_boxes.featured_label; $( 'input[name=_featured]' ).attr( 'checked', 'checked' ); } else { - $( 'input[name=_featured]' ).removeAttr( 'checked' ); + $( 'input[name=_featured]' )[0].removeAttribute( 'checked' ); } $( '#catalog-visibility-display' ).text( label ); @@ -94,7 +94,7 @@ jQuery( function( $ ) { }); // Product type specific options. - $( 'select#product-type' ).change( function() { + $( 'select#product-type' ).on( 'change', function() { // Get value. var select_val = $( this ).val(); @@ -102,13 +102,13 @@ jQuery( function( $ ) { if ( 'variable' === select_val ) { $( 'input#_manage_stock' ).trigger( 'change' ); $( 'input#_downloadable' ).prop( 'checked', false ); - $( 'input#_virtual' ).removeAttr( 'checked' ); + $( 'input#_virtual' )[0].removeAttribute( 'checked' ); } else if ( 'grouped' === select_val ) { $( 'input#_downloadable' ).prop( 'checked', false ); - $( 'input#_virtual' ).removeAttr( 'checked' ); + $( 'input#_virtual' )[0].removeAttribute( 'checked' ); } else if ( 'external' === select_val ) { $( 'input#_downloadable' ).prop( 'checked', false ); - $( 'input#_virtual' ).removeAttr( 'checked' ); + $( 'input#_virtual' )[0].removeAttribute( 'checked' ); } show_and_hide_panels(); @@ -119,7 +119,7 @@ jQuery( function( $ ) { }).trigger( 'change' ); - $( 'input#_downloadable, input#_virtual' ).change( function() { + $( 'input#_downloadable, input#_virtual' ).on( 'change', function() { show_and_hide_panels(); }); @@ -239,7 +239,7 @@ jQuery( function( $ ) { }); // Stock options. - $( 'input#_manage_stock' ).change( function() { + $( 'input#_manage_stock' ).on( 'change', function() { if ( $( this ).is( ':checked' ) ) { $( 'div.stock_fields' ).show(); $( 'p.stock_status_field' ).hide(); @@ -361,7 +361,7 @@ jQuery( function( $ ) { }); $( '.product_attributes' ).on( 'click', 'button.select_no_attributes', function() { - $( this ).closest( 'td' ).find( 'select option' ).removeAttr( 'selected' ); + $( this ).closest( 'td' ).find( 'select option' )[0].removeAttribute( 'selected' ); $( this ).closest( 'td' ).find( 'select' ).trigger( 'change' ); return false; }); @@ -373,7 +373,7 @@ jQuery( function( $ ) { if ( $parent.is( '.taxonomy' ) ) { $parent.find( 'select, input[type=text]' ).val( '' ); $parent.hide(); - $( 'select.attribute_taxonomy' ).find( 'option[value="' + $parent.data( 'taxonomy' ) + '"]' ).removeAttr( 'disabled' ); + $( 'select.attribute_taxonomy' ).find( 'option[value="' + $parent.data( 'taxonomy' ) + '"]' )[0].removeAttribute( 'disabled' ); } else { $parent.find( 'select, input[type=text]' ).val( '' ); $parent.hide(); @@ -398,7 +398,7 @@ jQuery( function( $ ) { ui.item.css( 'background-color', '#f6f6f6' ); }, stop: function( event, ui ) { - ui.item.removeAttr( 'style' ); + ui.item[0].removeAttribute( 'style' ); attribute_row_indexes(); } }); @@ -495,7 +495,7 @@ jQuery( function( $ ) { var this_page = window.location.toString(); this_page = this_page.replace( 'post-new.php?', 'post.php?post=' + woocommerce_admin_meta_boxes.post_id + '&action=edit&' ); - $( '#variable_product_options' ).load( this_page + ' #variable_product_options_inner', function() { + $( '#variable_product_options' ).on( 'load', this_page + ' #variable_product_options_inner', function() { $( '#variable_product_options' ).trigger( 'reload' ); } ); } @@ -655,7 +655,7 @@ jQuery( function( $ ) { ui.item.css( 'background-color', '#f6f6f6' ); }, stop: function( event, ui ) { - ui.item.removeAttr( 'style' ); + ui.item[0].removeAttribute( 'style' ); }, update: function() { var attachment_ids = ''; @@ -683,8 +683,8 @@ jQuery( function( $ ) { $image_gallery_ids.val( attachment_ids ); // Remove any lingering tooltips. - $( '#tiptip_holder' ).removeAttr( 'style' ); - $( '#tiptip_arrow' ).removeAttr( 'style' ); + $( '#tiptip_holder' )[0].removeAttribute( 'style' ); + $( '#tiptip_arrow' )[0].removeAttribute( 'style' ); return false; }); From 4d0df8d341a5f9980dedccd8fe205d33a6478a0a Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Feb 2021 09:04:39 -0800 Subject: [PATCH 050/249] Update deprecated jQuery functions for meta-boxes-product.js --- assets/js/admin/meta-boxes-product.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/assets/js/admin/meta-boxes-product.js b/assets/js/admin/meta-boxes-product.js index 3a4e7286a9a..44a0c842472 100644 --- a/assets/js/admin/meta-boxes-product.js +++ b/assets/js/admin/meta-boxes-product.js @@ -77,7 +77,7 @@ jQuery( function( $ ) { var current_visibility = $( '#current_visibility' ).val(); var current_featured = $( '#current_featured' ).val(); - $( 'input[name=_visibility]' )[0].removeAttribute( 'checked' ); + $( 'input[name=_visibility]' ).prop( 'checked', false ); $( 'input[name=_visibility][value=' + current_visibility + ']' ).attr( 'checked', 'checked' ); var label = $( 'input[name=_visibility]:checked' ).attr( 'data-label' ); @@ -86,7 +86,7 @@ jQuery( function( $ ) { label = label + ', ' + woocommerce_admin_meta_boxes.featured_label; $( 'input[name=_featured]' ).attr( 'checked', 'checked' ); } else { - $( 'input[name=_featured]' )[0].removeAttribute( 'checked' ); + $( 'input[name=_featured]' ).prop( 'checked', false ); } $( '#catalog-visibility-display' ).text( label ); @@ -102,13 +102,13 @@ jQuery( function( $ ) { if ( 'variable' === select_val ) { $( 'input#_manage_stock' ).trigger( 'change' ); $( 'input#_downloadable' ).prop( 'checked', false ); - $( 'input#_virtual' )[0].removeAttribute( 'checked' ); + $( 'input#_virtual' ).prop( 'checked', false ); } else if ( 'grouped' === select_val ) { $( 'input#_downloadable' ).prop( 'checked', false ); - $( 'input#_virtual' )[0].removeAttribute( 'checked' ); + $( 'input#_virtual' ).prop( 'checked', false ); } else if ( 'external' === select_val ) { $( 'input#_downloadable' ).prop( 'checked', false ); - $( 'input#_virtual' )[0].removeAttribute( 'checked' ); + $( 'input#_virtual' ).prop( 'checked', false ); } show_and_hide_panels(); @@ -361,7 +361,7 @@ jQuery( function( $ ) { }); $( '.product_attributes' ).on( 'click', 'button.select_no_attributes', function() { - $( this ).closest( 'td' ).find( 'select option' )[0].removeAttribute( 'selected' ); + $( this ).closest( 'td' ).find( 'select option' ).prop( 'selected', false ); $( this ).closest( 'td' ).find( 'select' ).trigger( 'change' ); return false; }); @@ -373,7 +373,7 @@ jQuery( function( $ ) { if ( $parent.is( '.taxonomy' ) ) { $parent.find( 'select, input[type=text]' ).val( '' ); $parent.hide(); - $( 'select.attribute_taxonomy' ).find( 'option[value="' + $parent.data( 'taxonomy' ) + '"]' )[0].removeAttribute( 'disabled' ); + $( 'select.attribute_taxonomy' ).find( 'option[value="' + $parent.data( 'taxonomy' ) + '"]' ).prop( 'disabled', false ); } else { $parent.find( 'select, input[type=text]' ).val( '' ); $parent.hide(); @@ -398,7 +398,7 @@ jQuery( function( $ ) { ui.item.css( 'background-color', '#f6f6f6' ); }, stop: function( event, ui ) { - ui.item[0].removeAttribute( 'style' ); + ui.item.removeAttr( 'style' ); attribute_row_indexes(); } }); @@ -655,7 +655,7 @@ jQuery( function( $ ) { ui.item.css( 'background-color', '#f6f6f6' ); }, stop: function( event, ui ) { - ui.item[0].removeAttribute( 'style' ); + ui.item.removeAttr( 'style' ); }, update: function() { var attachment_ids = ''; @@ -683,8 +683,8 @@ jQuery( function( $ ) { $image_gallery_ids.val( attachment_ids ); // Remove any lingering tooltips. - $( '#tiptip_holder' )[0].removeAttribute( 'style' ); - $( '#tiptip_arrow' )[0].removeAttribute( 'style' ); + $( '#tiptip_holder' ).removeAttr( 'style' ); + $( '#tiptip_arrow' ).removeAttr( 'style' ); return false; }); From 58cfd4c0c2d77157e5a6594eb058046f8cdcc7ec Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Feb 2021 09:07:26 -0800 Subject: [PATCH 051/249] Fixed removeAttribute replacements --- assets/js/admin/meta-boxes-order.js | 4 ++-- assets/js/admin/meta-boxes-product-variation.js | 10 +++++----- assets/js/jquery-tiptip/jquery.tipTip.js | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/assets/js/admin/meta-boxes-order.js b/assets/js/admin/meta-boxes-order.js index bca2a3b49a2..692b2d926be 100644 --- a/assets/js/admin/meta-boxes-order.js +++ b/assets/js/admin/meta-boxes-order.js @@ -117,8 +117,8 @@ jQuery( function ( $ ) { }, init_tiptip: function() { - $( '#tiptip_holder' )[0].removeAttribute( 'style' ); - $( '#tiptip_arrow' )[0].removeAttribute( 'style' ); + $( '#tiptip_holder' ).removeAttr( 'style' ); + $( '#tiptip_arrow' ).removeAttr( 'style' ); $( '.tips' ).tipTip({ 'attribute': 'data-tip', 'fadeIn': 50, diff --git a/assets/js/admin/meta-boxes-product-variation.js b/assets/js/admin/meta-boxes-product-variation.js index b34461cff86..fbb9701f04d 100644 --- a/assets/js/admin/meta-boxes-product-variation.js +++ b/assets/js/admin/meta-boxes-product-variation.js @@ -116,8 +116,8 @@ jQuery( function( $ ) { } // Init TipTip - $( '#tiptip_holder' )[0].removeAttribute( 'style' ); - $( '#tiptip_arrow' )[0].removeAttribute( 'style' ); + $( '#tiptip_holder' ).removeAttr( 'style' ); + $( '#tiptip_arrow' ).removeAttr( 'style' ); $( '.woocommerce_variations .tips, .woocommerce_variations .help_tip, .woocommerce_variations .woocommerce-help-tip', wrapper ) .tipTip({ 'attribute': 'data-tip', @@ -594,7 +594,7 @@ jQuery( function( $ ) { $( '.woocommerce-notice-invalid-variation' ).remove(); $( '#variable_product_options' ).find( '.woocommerce_variations' ).prepend( variation ); - $( 'button.cancel-variation-changes, button.save-variation-changes' )[0].removeAttribute( 'disabled' ); + $( 'button.cancel-variation-changes, button.save-variation-changes' ).prop( 'disabled', false ); $( '#variable_product_options' ).trigger( 'woocommerce_variations_added', 1 ); wc_meta_boxes_product_variations_ajax.unblock(); }); @@ -700,7 +700,7 @@ jQuery( function( $ ) { .closest( '.woocommerce_variation' ) .addClass( 'variation-needs-update' ); - $( 'button.cancel-variation-changes, button.save-variation-changes' )[0].removeAttribute( 'disabled' ); + $( 'button.cancel-variation-changes, button.save-variation-changes' ).prop( 'disabled', false ); $( '#variable_product_options' ).trigger( 'woocommerce_variations_input_changed' ); }, @@ -714,7 +714,7 @@ jQuery( function( $ ) { .find( '.woocommerce_variation:first' ) .addClass( 'variation-needs-update' ); - $( 'button.cancel-variation-changes, button.save-variation-changes' )[0].removeAttribute( 'disabled' ); + $( 'button.cancel-variation-changes, button.save-variation-changes' ).prop( 'disabled', false ); $( '#variable_product_options' ).trigger( 'woocommerce_variations_defaults_changed' ); }, diff --git a/assets/js/jquery-tiptip/jquery.tipTip.js b/assets/js/jquery-tiptip/jquery.tipTip.js index cd03271ba30..3aa2c639e74 100644 --- a/assets/js/jquery-tiptip/jquery.tipTip.js +++ b/assets/js/jquery-tiptip/jquery.tipTip.js @@ -58,7 +58,7 @@ } if(org_title != ""){ if(!opts.content){ - org_elem[0].removeAttribute(opts.attribute); //remove original Attribute + org_elem.prop(opts.attribute, false); //remove original Attribute } var timeout = false; @@ -101,8 +101,8 @@ opts.enter.call(this); tiptip_content.html(org_title); tiptip_holder.hide().css("margin","0"); - tiptip_holder[0].removeAttribute('class'); - tiptip_arrow[0].removeAttribute("style"); + tiptip_holder.removeAttr('class'); + tiptip_arrow.removeAttr("style"); var top = parseInt(org_elem.offset()['top']); var left = parseInt(org_elem.offset()['left']); From 81d6e50bbd26e8127ecd57e60884ab9208feb5b8 Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Feb 2021 09:10:39 -0800 Subject: [PATCH 052/249] Update deprecated jQuery functions for quick-edit.js --- assets/js/admin/quick-edit.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/admin/quick-edit.js b/assets/js/admin/quick-edit.js index 8c64a049f33..c15b76f580d 100644 --- a/assets/js/admin/quick-edit.js +++ b/assets/js/admin/quick-edit.js @@ -57,7 +57,7 @@ jQuery( 'select[name="_visibility"] option, ' + 'select[name="_stock_status"] option, ' + 'select[name="_backorders"] option' - ).removeAttr( 'selected' ); + ).prop( 'selected', false ); var is_variable_product = 'variable' === product_type; $( 'select[name="_stock_status"] ~ .wc-quick-edit-warning', '.inline-edit-row' ).toggle( is_variable_product ); @@ -72,7 +72,7 @@ jQuery( if ( 'yes' === featured ) { $( 'input[name="_featured"]', '.inline-edit-row' ).attr( 'checked', 'checked' ); } else { - $( 'input[name="_featured"]', '.inline-edit-row' ).removeAttr( 'checked' ); + $( 'input[name="_featured"]', '.inline-edit-row' ).prop( 'checked', false ); } // Conditional display. From d84eb2d6bb24f06f6795b14717af3ae1a18babc8 Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Feb 2021 09:11:27 -0800 Subject: [PATCH 053/249] Update deprecated jQuery functions for settings-views-html-settings-tax.js --- assets/js/admin/settings-views-html-settings-tax.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/admin/settings-views-html-settings-tax.js b/assets/js/admin/settings-views-html-settings-tax.js index 061c2bd1af7..f7c79fe01c1 100644 --- a/assets/js/admin/settings-views-html-settings-tax.js +++ b/assets/js/admin/settings-views-html-settings-tax.js @@ -167,7 +167,7 @@ // Postcode and city don't have `name` values by default. // They're only created if the contents changes, to save on database queries (I think) - this.$el.find( 'td.postcode input, td.city input' ).change( function() { + this.$el.find( 'td.postcode input, td.city input' ).on( 'change', function() { $( this ).attr( 'name', $( this ).data( 'name' ) ); }); From 142aad6a441d48a4f925bb947cf3c665cfe1e9a8 Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Feb 2021 09:13:46 -0800 Subject: [PATCH 054/249] Update deprecated jQuery functions for settings.js --- assets/js/admin/settings.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/js/admin/settings.js b/assets/js/admin/settings.js index de5931fd25d..d85af6f1951 100644 --- a/assets/js/admin/settings.js +++ b/assets/js/admin/settings.js @@ -2,7 +2,7 @@ ( function( $, params, wp ) { $( function() { // Sell Countries - $( 'select#woocommerce_allowed_countries' ).change( function() { + $( 'select#woocommerce_allowed_countries' ).on( 'change', function() { if ( 'specific' === $( this ).val() ) { $( this ).closest('tr').next( 'tr' ).hide(); $( this ).closest('tr').next().next( 'tr' ).show(); @@ -16,7 +16,7 @@ }).trigger( 'change' ); // Ship Countries - $( 'select#woocommerce_ship_to_countries' ).change( function() { + $( 'select#woocommerce_ship_to_countries' ).on( 'change', function() { if ( 'specific' === $( this ).val() ) { $( this ).closest('tr').next( 'tr' ).show(); } else { @@ -25,7 +25,7 @@ }).trigger( 'change' ); // Stock management - $( 'input#woocommerce_manage_stock' ).change( function() { + $( 'input#woocommerce_manage_stock' ).on( 'change', function() { if ( $( this ).is(':checked') ) { $( this ).closest('tbody').find( '.manage_stock_field' ).closest( 'tr' ).show(); } else { @@ -71,7 +71,7 @@ $( function() { var changed = false; - $( 'input, textarea, select, checkbox' ).change( function() { + $( 'input, textarea, select, checkbox' ).on( 'change', function() { if ( ! changed ) { window.onbeforeunload = function() { return params.i18n_nav_warning; @@ -116,7 +116,7 @@ }); $( '.woocommerce' ).on( 'click', '.select_none', function() { - $( this ).closest( 'td' ).find( 'select option' ).removeAttr( 'selected' ); + $( this ).closest( 'td' ).find( 'select option' ).prop( 'selected', false ); $( this ).closest( 'td' ).find( 'select' ).trigger( 'change' ); return false; }); @@ -126,7 +126,7 @@ var moveBtn = $( this ), $row = moveBtn.closest( 'tr' ); - moveBtn.focus(); + moveBtn.trigger( 'focus' ); var isMoveUp = moveBtn.is( '.wc-move-up' ), isMoveDown = moveBtn.is( '.wc-move-down' ); @@ -147,7 +147,7 @@ } } - moveBtn.focus(); // Re-focus after the container was moved. + moveBtn.trigger( 'focus' ); // Re-focus after the container was moved. moveBtn.closest( 'table' ).trigger( 'updateMoveButtons' ); } ); From b924230b41b96dcaa1173acda63c55b61c4e8f98 Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Feb 2021 09:17:18 -0800 Subject: [PATCH 055/249] Update deprecated jQuery functions for system-status.js --- assets/js/admin/system-status.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/js/admin/system-status.js b/assets/js/admin/system-status.js index cb84c875444..6cdb54d14cf 100644 --- a/assets/js/admin/system-status.js +++ b/assets/js/admin/system-status.js @@ -68,7 +68,7 @@ jQuery( function ( $ ) { try { $( '#debug-report' ).slideDown(); - $( '#debug-report' ).find( 'textarea' ).val( '`' + report + '`' ).focus().select(); + $( '#debug-report' ).find( 'textarea' ).val( '`' + report + '`' ).trigger( 'focus' ).trigger( 'select' ); $( this ).fadeOut(); return false; } catch ( e ) { @@ -100,7 +100,7 @@ jQuery( function ( $ ) { 'fadeIn': 50, 'fadeOut': 50, 'delay': 0 - }).focus(); + }).trigger( 'focus' ); }, /** @@ -108,7 +108,7 @@ jQuery( function ( $ ) { */ copyFail: function() { $( '.copy-error' ).removeClass( 'hidden' ); - $( '#debug-report' ).find( 'textarea' ).focus().select(); + $( '#debug-report' ).find( 'textarea' ).trigger( 'focus' ).trigger( 'select' ); } }; From 76762a08f8329ed84eeee4ea16bb99507216851c Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Feb 2021 09:17:52 -0800 Subject: [PATCH 056/249] Update deprecated jQuery functions for users.js --- assets/js/admin/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/admin/users.js b/assets/js/admin/users.js index cb2b816604e..2d6c1fa7138 100644 --- a/assets/js/admin/users.js +++ b/assets/js/admin/users.js @@ -12,7 +12,7 @@ jQuery( function ( $ ) { this.states = JSON.parse( wc_users_params.countries.replace( /"/g, '"' ) ); } - $( '.js_field-country' ).selectWoo().change( this.change_country ); + $( '.js_field-country' ).selectWoo().on( 'change', this.change_country ); $( '.js_field-country' ).trigger( 'change', [ true ] ); $( document.body ).on( 'change', 'select.js_field-state', this.change_state ); From eee6c96871aea6e6bfa74484d152fcde99eab682 Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Feb 2021 09:18:15 -0800 Subject: [PATCH 057/249] Update deprecated jQuery functions for wc-clipboard.js --- assets/js/admin/wc-clipboard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/admin/wc-clipboard.js b/assets/js/admin/wc-clipboard.js index fc009d02041..8a2391213ae 100644 --- a/assets/js/admin/wc-clipboard.js +++ b/assets/js/admin/wc-clipboard.js @@ -17,7 +17,7 @@ function wcSetClipboard( data, $el ) { } var $temp_input = jQuery( '

    		 - +
    - + href="" class="button button-large ">