Skip to content

Commit

Permalink
Merge branch 'master' into link-blitz-reb
Browse files Browse the repository at this point in the history
# Conflicts:
#	wix-groups-backend/wix-groups-backend/CreateRequests/CreateRequestsQueryResult.service.json
#	wix-groups-backend/wix-groups-backend/Members/GroupMembersQueryResult.service.json
  • Loading branch information
rebeccask committed Jul 4, 2024
2 parents ef400eb + 37c5b4a commit b02fb0f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
11 changes: 5 additions & 6 deletions wix-application/wix-application.service.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ "name": "wix-application",
"mixes": [],
"labels":
[ "changed" ],
"labels": [],
"location":
{ "lineno": 1,
"filename": "application.js" },
Expand Down Expand Up @@ -153,7 +152,7 @@
"",
"// ...",
"",
"wixApplication.openLightbox(\"lightboxId\");" ],
"wixApplication.openAppLightbox(\"lightboxId\");" ],
"extra":
{ } },
{ "title": "Open a lightbox and send it data",
Expand All @@ -163,7 +162,7 @@
"// ...",
"",
"const dataObj = {title: \"Widget Title\"};",
"wixApplication.openLightbox(\"lightboxId\", dataObj);" ],
"wixApplication.openAppLightbox(\"lightboxId\", dataObj);" ],
"extra":
{ } },
{ "title": "Open a lightbox and receive data when it closes",
Expand All @@ -172,7 +171,7 @@
"",
"// ...",
"",
"wixApplication.openLightbox(\"lightboxId\")",
"wixApplication.openAppLightbox(\"lightboxId\")",
" .then( (data) => { ",
" let receivedData = data; // When the lightbox is closed, it returns this data",
" } );" ],
Expand All @@ -185,7 +184,7 @@
"// ...",
"",
"const dataObj = {title: \"My Title\"};",
"wixApplication.openLightbox(\"ligthboxId\", dataObj)",
"wixApplication.openAppLightbox(\"ligthboxId\", dataObj)",
" .then( (data) => {",
" let receivedData = data; // When the lightbox is closed, it returns this data. ",
" } );" ],
Expand Down
8 changes: 4 additions & 4 deletions wix-billing-backend/wix-billing-backend.service.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"and [create and manage price quotes](https://support.wix.com/en/article/wix-price-quotes-creating-and-sending-price-quotes-to-clients).",
"",
" With the Wix billing APIs, you can:",
" - Manage [invoices](wix-billing-backend/invoices).",
" - Manage [price quotes](wix-billing-backend/pricequotes).",
" - Manage [invoices](/invoices/introduction).",
" - Manage [price quotes](/price-quotes/introduction).",
" - Create custom handling in response to backend [invoice events](wix-billing-backend/events/introduction).",
" - Create custom handling in response to backend [price quote events](wix-billing-backend/events/introduction).",
" ",
Expand All @@ -29,7 +29,7 @@
" It’s important to note the following points before starting to code: ",
"",
" Invoices is an online payment request system and not an accounting service. ",
" In order to accept payments from customers in Wix Invoices, you must set up a [payment method](https://support.wix.com/en/article/setting-up-payment-methods-in-wix-invoices).",
" In order to accept payments from customers in Wix Invoices, you must set up a [payment method](https://support.wix.com/en/article/accepting-payments-an-overview).",
" ",
"## Terminology",
"",
Expand Down Expand Up @@ -91,4 +91,4 @@
"messages": [],
"extra":
{ "scopes":
[ "backend" ] } }
[ "backend" ] } }

0 comments on commit b02fb0f

Please sign in to comment.