Skip to content

Commit

Permalink
Merge branch 'trunk' into gutenberg/galleryWithImageBlocks-check-WP-v…
Browse files Browse the repository at this point in the history 
…ersion
  • Loading branch information
@derekblank
derekblank authored May 30, 2023
2 parents 458c041 + c7bf2d3 commit a9b862c
Show file tree
Hide file tree
Showing 109 changed files with 2,942 additions and 509 deletions.
2 changes: 1 addition & 1 deletion API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/dashboard/dashboard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"matches": "(.*)"
},
"cards": {
"equalTo": "todays_stats,posts,pages"
"equalTo": "todays_stats,posts"
}
}
},
Expand Down
75 changes: 75 additions & 0 deletions ...cks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/domains/rest_v11_suggestions.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"request": {
"urlPath": "/rest/v1.1/domains/suggestions",
"method": "GET"
},
"response": {
"status": 200,
"jsonBody": [
{
"domain_name": "domainexample.com",
"relevance": 1,
"supports_privacy": true,
"vendor": "donuts",
"match_reasons": ["tld-common"],
"product_id": 6,
"product_slug": "domain_reg",
"cost": "19,00\u00a0\u20ac",
"raw_price": 19,
"currency_code": "EUR"
},
{
"domain_name": "domainexample.ink",
"relevance": 1,
"supports_privacy": true,
"vendor": "donuts",
"product_id": 359,
"product_slug": "dotink_domain",
"cost": "26,00\u00a0\u20ac",
"raw_price": 26,
"currency_code": "EUR"
},
{
"domain_name": "domainexample.blog",
"relevance": 0.99,
"supports_privacy": true,
"vendor": "donuts",
"match_reasons": ["tld-common"],
"product_id": 76,
"product_slug": "dotblog_domain",
"cost": "22,00\u00a0\u20ac",
"raw_price": 22,
"currency_code": "EUR",
"sale_cost": 4.84
},
{
"domain_name": "domainexample.org",
"relevance": 0.98,
"supports_privacy": true,
"vendor": "donuts",
"match_reasons": ["tld-common"],
"product_id": 6,
"product_slug": "domain_reg",
"cost": "19,00\u00a0\u20ac",
"raw_price": 19,
"currency_code": "EUR"
},
{
"domain_name": "domainexample.maison",
"relevance": 0.93,
"supports_privacy": true,
"vendor": "donuts",
"product_id": 200,
"product_slug": "dotmaison_domain",
"cost": "49,00\u00a0\u20ac",
"raw_price": 49,
"currency_code": "EUR"
}
],
"headers": {
"Content-Type": "application/json",
"Connection": "keep-alive",
"Cache-Control": "no-cache, must-revalidate, max-age=0"
}
}
}
3 changes: 2 additions & 1 deletion API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/feature-flags.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"response": {
"status": 200,
"jsonBody": {
"dashboard_card_domain": true
"dashboard_card_domain": false,
"dashboard_card_free_to_paid_plans": true
}
}
}
265 changes: 265 additions & 0 deletions ...ordPressMocks/src/main/assets/mocks/mappings/wpcom/me/rest_v11_me_shopping_cart_post.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,265 @@
{
"request": {
"urlPattern": "/rest/v1.1/me/shopping-cart/.*",
"method": "POST"
},
"response": {
"status": 200,
"jsonBody": {
"cart_generated_at_timestamp": 1684777767,
"blog_id": 218645783,
"cart_key": 218645783,
"coupon": "",
"coupon_discounts": [],
"coupon_discounts_integer": [],
"coupon_discounts_display": [],
"is_coupon_applied": false,
"next_domain_is_free": false,
"next_domain_condition": "",
"products": [{
"product_id": 76,
"billing_plan_id": "1562",
"product_name": ".blog Domain Registration",
"product_name_en": ".blog Domain Registration",
"product_slug": "dotblog_domain",
"product_cost": 22,
"product_cost_display": "22\u00a0\u20ac",
"product_cost_integer": 2200,
"meta": "domainexample.blog",
"cost": 4.84,
"currency": "EUR",
"volume": 1,
"quantity": null,
"current_quantity": null,
"price_tier_minimum_units": null,
"price_tier_maximum_units": null,
"price_tier_transform_quantity_divide_by": null,
"price_tier_transform_quantity_round": null,
"free_trial": false,
"introductory_offer_terms": null,
"cost_before_coupon": 22,
"coupon_savings": 0,
"coupon_savings_integer": 0,
"coupon_savings_display": "0\u00a0\u20ac",
"is_sale_coupon_applied": true,
"extra": {
"privacy": true,
"added_from_shopping_cart": true,
"registrar": "KS_RAM",
"domain_registration_agreement_url": "https:\/\/wordpress.com\/automattic-domain-name-registration-agreement\/",
"privacy_available": true,
"premium": false
},
"bill_period": "365",
"months_per_bill_period": 12,
"is_domain_registration": true,
"time_added_to_cart": 1684777766,
"is_bundled": false,
"item_original_cost": 22,
"item_original_cost_integer": 2200,
"item_original_cost_display": "22\u00a0\u20ac",
"item_original_monthly_cost_integer": 183,
"item_original_monthly_cost_display": "1,83\u00a0\u20ac",
"item_original_cost_for_quantity_one_integer": 900,
"item_original_cost_for_quantity_one_display": "9\u00a0\u20ac",
"item_subtotal_monthly_cost_integer": 17,
"item_subtotal_monthly_cost_display": "0,17\u00a0\u20ac",
"item_original_subtotal": 22,
"item_original_subtotal_integer": 2200,
"item_original_subtotal_display": "22\u00a0\u20ac",
"item_subtotal": 4.84,
"item_subtotal_integer": 484,
"item_subtotal_display": "4,84\u00a0\u20ac",
"item_tax": 0,
"item_tax_rate": 0,
"item_tax_breakdown": [],
"item_total": 4.84,
"item_total_integer": 484,
"subscription_id": 0,
"is_renewal": false,
"domain_post_renewal_expiration_date": null,
"cost_overrides": [{
"old_price": 9,
"new_price": 1.98,
"reason": "Sale_Coupon->apply_sale_discount"
}],
"is_gift_purchase": false,
"product_variants": []
}],
"unmerged_products": [{
"product_id": 76,
"billing_plan_id": "1562",
"product_name": ".blog Domain Registration",
"product_name_en": ".blog Domain Registration",
"product_slug": "dotblog_domain",
"product_cost": 9,
"product_cost_display": "9\u00a0\u20ac",
"product_cost_integer": 900,
"meta": "domainexample.blog",
"cost": 1.98,
"currency": "EUR",
"volume": 1,
"quantity": null,
"current_quantity": null,
"price_tier_minimum_units": null,
"price_tier_maximum_units": null,
"price_tier_transform_quantity_divide_by": null,
"price_tier_transform_quantity_round": null,
"free_trial": false,
"introductory_offer_terms": null,
"cost_before_coupon": 9,
"coupon_savings": 0,
"coupon_savings_integer": 0,
"coupon_savings_display": "0\u00a0\u20ac",
"is_sale_coupon_applied": true,
"extra": {
"privacy": true,
"added_from_shopping_cart": true,
"registrar": "KS_RAM",
"domain_registration_agreement_url": "https:\/\/wordpress.com\/automattic-domain-name-registration-agreement\/",
"privacy_available": true,
"premium": false
},
"bill_period": "365",
"months_per_bill_period": 12,
"is_domain_registration": true,
"time_added_to_cart": 1684777766,
"is_bundled": false,
"item_original_cost": 9,
"item_original_cost_integer": 900,
"item_original_cost_display": "9\u00a0\u20ac",
"item_original_monthly_cost_integer": 75,
"item_original_monthly_cost_display": "0,75\u00a0\u20ac",
"item_original_cost_for_quantity_one_integer": 900,
"item_original_cost_for_quantity_one_display": "9\u00a0\u20ac",
"item_subtotal_monthly_cost_integer": 17,
"item_subtotal_monthly_cost_display": "0,17\u00a0\u20ac",
"item_original_subtotal": 9,
"item_original_subtotal_integer": 900,
"item_original_subtotal_display": "9\u00a0\u20ac",
"item_subtotal": 1.98,
"item_subtotal_integer": 198,
"item_subtotal_display": "1,98\u00a0\u20ac",
"item_tax": 0,
"item_tax_rate": 0,
"item_tax_breakdown": [],
"item_total": 1.98,
"item_total_integer": 198,
"subscription_id": 0,
"is_renewal": false,
"domain_post_renewal_expiration_date": null,
"cost_overrides": [{
"old_price": 9,
"new_price": 1.98,
"reason": "Sale_Coupon->apply_sale_discount"
}],
"is_gift_purchase": false,
"product_variants": []
}, {
"product_id": 5,
"billing_plan_id": "912",
"product_name": "Domain Connection",
"product_name_en": "Domain Connection",
"product_slug": "domain_map",
"product_cost": 13,
"product_cost_display": "13\u00a0\u20ac",
"product_cost_integer": 1300,
"meta": "domainexample.com",
"cost": 2.86,
"currency": "EUR",
"volume": 1,
"quantity": null,
"current_quantity": null,
"price_tier_minimum_units": null,
"price_tier_maximum_units": null,
"price_tier_transform_quantity_divide_by": null,
"price_tier_transform_quantity_round": null,
"free_trial": false,
"introductory_offer_terms": null,
"cost_before_coupon": 13,
"coupon_savings": 0,
"coupon_savings_integer": 0,
"coupon_savings_display": "0\u00a0\u20ac",
"is_sale_coupon_applied": true,
"extra": {
"privacy": true,
"added_from_shopping_cart": true
},
"bill_period": "365",
"months_per_bill_period": 12,
"is_domain_registration": false,
"time_added_to_cart": 1684777767,
"is_bundled": false,
"item_original_cost": 13,
"item_original_cost_integer": 1300,
"item_original_cost_display": "13\u00a0\u20ac",
"item_original_monthly_cost_integer": 108,
"item_original_monthly_cost_display": "1,08\u00a0\u20ac",
"item_original_cost_for_quantity_one_integer": 1300,
"item_original_cost_for_quantity_one_display": "13\u00a0\u20ac",
"item_subtotal_monthly_cost_integer": 24,
"item_subtotal_monthly_cost_display": "0,24\u00a0\u20ac",
"item_original_subtotal": 13,
"item_original_subtotal_integer": 1300,
"item_original_subtotal_display": "13\u00a0\u20ac",
"item_subtotal": 2.86,
"item_subtotal_integer": 286,
"item_subtotal_display": "2,86\u00a0\u20ac",
"item_tax": 0,
"item_tax_rate": 0,
"item_tax_breakdown": [],
"item_total": 2.86,
"item_total_integer": 286,
"subscription_id": 0,
"is_renewal": false,
"domain_post_renewal_expiration_date": null,
"cost_overrides": [{
"old_price": 13,
"new_price": 2.86,
"reason": "Sale_Coupon->apply_sale_discount"
}],
"is_gift_purchase": false,
"product_variants": []
}],
"total_cost": 4.84,
"currency": "EUR",
"total_cost_display": "4,84\u00a0\u20ac",
"total_cost_integer": 484,
"temporary": false,
"tax": {
"location": {},
"display_taxes": false
},
"coupon_savings_total": 0,
"coupon_savings_total_display": "0\u00a0\u20ac",
"coupon_savings_total_integer": 0,
"sub_total_with_taxes_display": "4,84\u00a0\u20ac",
"sub_total_with_taxes_integer": 484,
"sub_total": 4.84,
"sub_total_display": "4,84\u00a0\u20ac",
"sub_total_integer": 484,
"total_tax": 0,
"total_tax_display": "0\u00a0\u20ac",
"total_tax_integer": 0,
"total_tax_breakdown": [],
"credits": 0,
"credits_display": "0\u00a0\u20ac",
"credits_integer": 0,
"allowed_payment_methods": ["WPCOM_Billing_MoneyPress_Paygate", "WPCOM_Billing_PayPal_Express", "WPCOM_Billing_Stripe_Payment_Method", "WPCOM_Billing_MoneyPress_Stored", "WPCOM_Billing_Web_Payment"],
"terms_of_service": [],
"did_use_cached_taxes": false,
"is_gift_purchase": false,
"gift_details": null,
"messages": {
"errors": [],
"success": [],
"persistent_errors": []
}
},
"headers": {
"Content-Type": "application/json",
"Connection": "keep-alive",
"Cache-Control": "no-cache, must-revalidate, max-age=0"
}
}
}
Loading

0 comments on commit a9b862c

Please sign in to comment.