chore: Merge master to develop (#3653)
This commit is contained in:
committed by
GitHub
parent
b2e2eddcea
commit
809ab2e0eb
@@ -342,6 +342,7 @@ Object {
|
||||
"original_tax_total": 200,
|
||||
"original_total": 1200,
|
||||
"quantity": 1,
|
||||
"raw_discount_total": 0,
|
||||
"subtotal": 1000,
|
||||
"tax_lines": Array [
|
||||
Object {
|
||||
@@ -457,6 +458,7 @@ Object {
|
||||
"original_tax_total": 400,
|
||||
"original_total": 2400,
|
||||
"quantity": 2,
|
||||
"raw_discount_total": 0,
|
||||
"returned_quantity": 1,
|
||||
"shipped_quantity": 2,
|
||||
"should_merge": true,
|
||||
@@ -809,6 +811,7 @@ Object {
|
||||
"original_total": 2400,
|
||||
"price": "10.00 USD",
|
||||
"quantity": 2,
|
||||
"raw_discount_total": 0,
|
||||
"returned_quantity": null,
|
||||
"shipped_quantity": null,
|
||||
"should_merge": true,
|
||||
@@ -1043,6 +1046,7 @@ Object {
|
||||
"original_total": 2400,
|
||||
"price": "12.00 USD",
|
||||
"quantity": 2,
|
||||
"raw_discount_total": 0,
|
||||
"returned_quantity": null,
|
||||
"shipped_quantity": 2,
|
||||
"should_merge": true,
|
||||
@@ -1069,6 +1073,7 @@ Object {
|
||||
"original_tax_total": 400,
|
||||
"original_total": 2400,
|
||||
"quantity": 2,
|
||||
"raw_discount_total": 0,
|
||||
"subtotal": 2000,
|
||||
"tax_lines": Array [
|
||||
Object {
|
||||
@@ -1320,6 +1325,7 @@ Object {
|
||||
"original_tax_total": 400,
|
||||
"original_total": 2400,
|
||||
"quantity": 2,
|
||||
"raw_discount_total": 0,
|
||||
"returned_quantity": null,
|
||||
"shipped_quantity": 2,
|
||||
"should_merge": true,
|
||||
@@ -1539,6 +1545,7 @@ Object {
|
||||
"original_tax_total": 200,
|
||||
"original_total": 1200,
|
||||
"quantity": 1,
|
||||
"raw_discount_total": 0,
|
||||
"subtotal": 1000,
|
||||
"tax_lines": Array [
|
||||
Object {
|
||||
@@ -1654,6 +1661,7 @@ Object {
|
||||
"original_tax_total": 400,
|
||||
"original_total": 2400,
|
||||
"quantity": 2,
|
||||
"raw_discount_total": 0,
|
||||
"returned_quantity": null,
|
||||
"shipped_quantity": 2,
|
||||
"should_merge": true,
|
||||
|
||||
Reference in New Issue
Block a user