Commit Graph

4525 Commits

Author SHA1 Message Date
nicolas.dorier
f28a898053
Fix building error 2020-09-30 20:54:17 +09:00
Nicolas Dorier
a66578c46d
Merge pull request #1871 from xpayserver/feat/payment-method-criteria
Add Value Criteria For Payment Method
2020-09-30 20:40:31 +09:00
Nicolas Dorier
e45dcf61c4
Merge pull request #1831 from btcpayserver/add-btc-index
Show index of payment address for onchain payments
2020-09-30 18:35:51 +09:00
Nicolas Dorier
40bfc9b368
Merge pull request #1768 from sotblad/MonetaryUnit
Add MonetaryUnit (MUE) support
2020-09-30 18:33:41 +09:00
Nicolas Dorier
73684d11c8
Merge pull request #1908 from btcpayserver/feat/shopify-mark-paid
Shopify registering paid transactions, marking orders paid, finishing integration
2020-09-30 11:23:56 +09:00
rockstardev
0d4ca4520b Ensuring matching of keywords only on first transaction 2020-09-29 17:23:42 -05:00
rockstardev
f1c1846c66 Restoring BtcPay keywords 2020-09-29 16:54:33 -05:00
Kukks
d59295688e Handle edge cases around partial payments and when txs are not registered on Shopify because of unexpected outage 2020-09-29 16:52:17 -05:00
Kukks
c1808164f2 Log Shopify registration better 2020-09-29 16:51:22 -05:00
Kukks
8f8562705a Pass due amount from shopify UI in case of partial payments 2020-09-29 16:51:00 -05:00
Kukks
6da6723c72 Be sure to match transaction gateway in Shopify registration 2020-09-29 16:50:17 -05:00
Kukks
0a726d598c Make sure shopify var is set in the UI 2020-09-29 16:47:54 -05:00
Kukks
4ffd2265ea Reduce unused branching in UI 2020-09-29 16:47:29 -05:00
Kukks
3ce6269212 Remove unused imports 2020-09-29 16:47:18 -05:00
Kukks
dc0cf26f51 Fix build 2020-09-29 16:47:14 -05:00
Kukks
713a1f03e9 Fix warnings 2020-09-29 16:47:05 -05:00
Kukks
c07952629c Commenting OrderTransactionRegisterLogic 2020-09-29 16:46:28 -05:00
Andrew Camilleri
d958b1808c
Make Sync Modal remember collapsed state (#1929)
* Make Sync Modal remeber collapsed state

This makes the sync modal use the bootstrap collapse component instead of animatecss. It also removed animatecss as it seemed to be only used there.  Also, it will now remember if you collapsed it between page loads which since the new eth stuff keeps asking to configure it on my dev env.

* Sync modal improvements

- Use chevron icon and indicate toggle state
- Smooth opening animation by toggling element without padding
- Better modal content padding
- Run JS immediately to prevent flickering

Co-authored-by: Dennis Reimann <mail@dennisreimann.de>
2020-09-29 14:13:39 +02:00
Kukks
4a596c7373 Remove leftover shopify API calls and script creation 2020-09-28 07:58:49 +02:00
rockstardev
bf7c8d5a5c Bugfixing references to shop, correcting them to be dynamic 2020-09-26 13:27:18 -05:00
rockstardev
84f9ee3765 Word breaking on all chars for better display of additional script 2020-09-26 13:17:11 -05:00
rockstardev
c22536ce67 Tweaking display order and style of alerts 2020-09-26 12:55:26 -05:00
rockstardev
c14fd69a0e Disabling automatic creation of Script in Shopify 2020-09-26 12:51:29 -05:00
rockstardev
0812596929 Adding another string for integration check 2020-09-26 12:22:16 -05:00
rockstardev
d33a449332 Changing page title during before and after payment 2020-09-25 16:55:42 -05:00
rockstardev
02b99d2b06 Injecting payment button, wasn't displaying when invoice already present
Also button was not getting refresh on modal close
2020-09-25 16:55:28 -05:00
rockstardev
b4f0cf510d Ensuring that elements on page are refreshed as soon as possible
Waiting on `load` is way too long, results in bad UX
2020-09-25 16:06:29 -05:00
rockstardev
eb6b1b431c Removing duplicate FromServices import 2020-09-25 14:13:57 -05:00
rockstardev
e955ddb9f1 Changing button text to better signal operation 2020-09-25 13:58:52 -05:00
rockstardev
48acd101a5 Handling errors with registering store script 2020-09-25 13:55:34 -05:00
rockstardev
694cedb89a Handling scenario where user provides invalid Shopify credentials 2020-09-25 13:50:23 -05:00
rockstardev
47e9f820e4 Switching the flow to exclusively use Example Url 2020-09-25 13:50:04 -05:00
Kukks
a7d7b5abc3 set order id of shopify invoice and serch by order id + storeId 2020-09-24 18:18:17 +02:00
Kukks
03d6c86899 Revert "Make Invoices save internal tags in the text search"
This reverts commit f352399428.
2020-09-24 17:33:15 +02:00
rockstardev
e9bd1bad67 Removing reference to Nethereum, Bitcoin only build 2020-09-24 16:25:36 +02:00
Kukks
c9f0295516 Make Shopify transaction register system handle marked payments slightly more 2020-09-24 16:25:36 +02:00
Kukks
42df6d58b1 Simplify Shopify integration
Added dedicated endpoint that generates an invoice or returns an existing one as needed for a shopify order
Added rate limiter to shopify endpoint to prevent abuse
Reduce shopify js to a small file
Use events from btcpay modal to reduce constant pinging to btcpay server
Register invoice payment failures on the shopify backend.
2020-09-24 16:25:35 +02:00
Kukks
078a2d7e39 Reduce Shopify integration steps and make sure checks work. 2020-09-24 16:25:35 +02:00
Kukks
f352399428 Make Invoices save internal tags in the text search 2020-09-24 16:25:35 +02:00
Kukks
0b2f115b73 Fix issue with new Invoice API ignoring internal tags 2020-09-24 16:25:35 +02:00
Kukks
9aed4b0e87 Allow receiving events from the BTCPay modal library 2020-09-24 16:25:35 +02:00
Kukks
3054f91fe7 Fix typo in Invoice method param 2020-09-24 16:25:35 +02:00
Kukks
91da129abc Include missing Shopify API models 2020-09-24 16:25:35 +02:00
Kukks
f77c27ca71 Make BTCPay Modal refer to mattermost instead of slack 2020-09-24 16:25:35 +02:00
Kukks
19cc93daae Reduce steps to 1 when integrating Shopify and start adding more API calls for Shopify to reduce JS logic 2020-09-24 16:25:35 +02:00
Kukks
4516bbdadd Fix and Cache Shopify JS 2020-09-24 16:25:35 +02:00
Kukks
0cf9b20328 Kukks Shopify Enhancement Suite Commit 2020-09-24 16:25:35 +02:00
rockstardev
1c510d45f0 Commenting code to elaborate on decisions made 2020-09-24 16:25:34 +02:00
rockstardev
5b958d7ff6 Ensuring that Shopify transaction registrations are not done in parallel 2020-09-24 16:25:34 +02:00
rockstardev
d9872bc94d Making sure we don't register same invoice multiple times 2020-09-24 16:25:34 +02:00