Luis Ramos
983bed3c4e
Merge branch 'master' into 3-0-stable-jun-2
2020-06-11 19:50:56 +01:00
Luis Ramos
88896b7730
Merge branch 'master' into 3-0-stable-jun-2
2020-06-08 19:17:11 +01:00
Matt-Yorkley
78fc6b7138
Rename "Geo" service to "GmapsGeo" for clarity.
...
This service directly calls methods in the google maps javascript included in the darkswarm layout. If we're moving away from it, we should clarify where it's used.
2020-06-05 08:35:15 +02:00
Luis Ramos
6e842212ea
Always throw back error even if there is an error loading the flash for example translating the error message
2020-05-29 14:45:22 +01:00
Luis Ramos
f34f693620
Merge branch 'master' into 3-0-stable-may-22
2020-05-22 22:54:19 +01:00
Matt-Yorkley
f9f76f9082
Move reused available stock logic to service
2020-05-18 16:19:49 +02:00
Luis Ramos
19da0ba969
Merge branch 'master' into 3-0-stable-may13
2020-05-13 19:50:32 +01:00
Luis Ramos
5f7c1474a2
Merge pull request #5377 from manvil/1782_enterprise_at_same_address
...
Handling multiple enterprises at the same location
2020-05-13 19:31:14 +01:00
Manvil George
63a1a6fefa
More optimsations: removing unwanted code
2020-05-07 22:58:09 +10:00
Manvil George
a629e1ecb7
Remove incorrect commenting
2020-05-07 11:46:49 +10:00
Manvil George
585a754b18
Missed out on inverting the boolean expression
2020-05-07 11:31:27 +10:00
Manvil George
7847c4ed9e
Removing unwanted blank lines
2020-05-07 09:37:35 +10:00
Manvil George
5b009f606a
More optimizations around coding standards
2020-05-07 09:07:32 +10:00
Manvil George
bf3bb4fb63
Review Comments incorporation
2020-05-07 00:54:01 +10:00
Manvil George
19b5f6a562
Handling multiple enterprises at the same location
...
Changes:
* Introduced a cluster marker to denote multiple points of interest at
the same location
* Seperated out a plain enterprise modal into 2 parts
* A modal called EnterpriseModal for showing a list of enterprises at
the same location
* A box called EnterpriseBox(which by the way is also a technically a
modal) that shows the details of that particular enterprise selected
* If at a location there exists only a single enterprise then only the
box is shown
2020-05-06 12:54:42 +10:00
Matt-Yorkley
13e4411b89
Add error message on cart populate failure and don't keep re-sending the data to the server.
...
This was triggering many requests to be continuously re-sent in a very problematic way (server-melting), and with no user feedback.
2020-05-05 17:22:10 +02:00
Matt-Yorkley
9a7807b134
Don't continuously re-post data on cart error
2020-05-05 16:04:05 +02:00
Luis Ramos
839b373b5c
Merge branch 'master' into 3-0-stable-Apr28
2020-04-28 13:40:19 +01:00
Luis Ramos
23f4faf192
Merge pull request #4841 from luisramos0/kill_rabl
...
Hide broken product taxons field, remove last rabl template and rabl itself
2020-04-21 18:49:12 +01:00
Luis Ramos
cedf1b26f2
If no flash is sent from the server, show the generic error
2020-04-14 14:31:34 +01:00
Luis Ramos
47a93568dc
Make code simpler by extracting methods
2020-04-14 13:55:20 +01:00
Luis Ramos
62471bf2ab
Clear Loading spinner when exception is caught
2020-04-14 13:50:38 +01:00
Luis Ramos
cdf5bcb7eb
Improve unexpected error handling and add test cases for it
2020-04-14 13:44:58 +01:00
Luis Ramos
7414047b92
Switch from old success/error to modern then/catch structure
...
Catch() will get a few more errors then errors()
Also, add try/catch inside catch to detect any errors parsing the
response error payload
2020-04-14 13:04:28 +01:00
Matt-Yorkley
bc859cf9f7
Add api/shops_controller and refactor
2020-04-04 17:02:27 +02:00
Matt-Yorkley
af48cac140
Load closed shops in a separate request on /shops page
2020-04-04 14:06:10 +02:00
Luis Ramos
384ca310a3
Merge branch 'master' into 3-0-stable-apr3
2020-04-03 18:26:26 +01:00
Luis Ramos
445eb9f287
Merge pull request #5121 from Matt-Yorkley/flaky-maps-js
...
Update vendor/assets/angular-google-maps.min.js
2020-04-02 22:13:51 +01:00
Matt-Yorkley
18ee5254f9
Make Geo service calls more resilient in /shops page
...
The Geo service is used heavily in the /shops page and especially in the search function. If the google maps js library has failed to load it was throwing a lot of fatal errors, so this change ensures the /shops page can at least: a) load, b) show some shops, and c) search for shops by name (but not location)
2020-04-02 13:56:25 +02:00
Luis Ramos
0e268a171f
Switch to console.error so we get a bugsnag alert everytime a user has a problem with their card
...
Add paymentMethodsAPI specific mapping function, we had some errors in production with mastercards probably caused by ActiveMerchant not handling the card type correctly
2020-04-01 18:58:43 +01:00
Luis Ramos
73c4eedd06
Translate credit card brand so that active merchant code handles the payment correctly
...
Adds a simple console.log statement in case there is an error adding the
card
2020-04-01 18:58:10 +01:00
Luis Ramos
957b398a54
Add call to $evalAsync() after Loading and FlashLoader are updated so
...
that a angular digest is triggered
This is required so that Loading.clear triggers a refresh and makes its placeholder to be cleared
2020-04-01 12:08:55 +01:00
Luis Ramos
da2598282b
Can be object or {}, it's what the injector is doing, not related to rabl any more
2020-03-17 15:51:26 +00:00
Luis Ramos
0815068050
Merge branch 'master' into 3-0-stable-mar6
2020-03-06 09:20:03 +00:00
Matt-Yorkley
53645517af
Update deprecated #find_by_* methods
2020-02-22 11:06:51 +00:00
luisramos0
c773cde191
Add admin payment template for stripe sca and respective js code to make it work
2020-02-21 10:52:29 +00:00
luisramos0
f691d1aafd
Add new payment method StripeSCA that will use the Stripe Payment Intents API instead of the Stripe Charges API that the current StripeConnect gatreway uses
2020-02-21 10:52:29 +00:00
Matt-Yorkley
c54cff10d4
Adjust API endpoint params
2019-10-18 21:15:13 +01:00
Matt-Yorkley
06e1f56ae9
Extract filter list fetching into a separate endpoint
2019-10-08 10:11:24 +01:00
Matt-Yorkley
fe0de98821
Add pagination in Angular and views
2019-10-08 10:11:22 +01:00
Matt-Yorkley
a1a5c3b7fe
Add new Angular OrderCycleResource
2019-10-04 10:38:41 +01:00
Matt-Yorkley
785595a951
Reduce initial queries on shop page by ~95%
2019-06-12 09:47:01 +01:00
Matt-Yorkley
a91ae8947b
Only query visible enterprises
2019-06-12 09:47:01 +01:00
Matt-Yorkley
4ec46c2db6
Fix groups index page
2019-06-12 09:47:01 +01:00
Matt-Yorkley
45d65baf8e
Improve shops performance
2019-06-12 09:47:01 +01:00
Matt-Yorkley
6bdc5d4438
Fix maps performance
2019-05-07 00:36:08 +01:00
luisramos0
8ee14ccb4b
Make variants_stock_levels return variants on_demand values
2019-02-19 11:56:02 +00:00
luisramos0
f0842fcbe5
Convert all calls to variant.count_on_hand to variant.on_hand
2019-02-18 21:54:07 +00:00
Maikel
1b88edea1f
Merge pull request #2420 from stveep/stripe-admin-2
...
Stripe admin 2
2018-08-30 15:48:49 +10:00
luisramos0
6caa361354
Moved Spree::OrderController.populate to new CartController.
...
This was done to make order populate independent of Spree::OrdersController
2018-08-23 12:37:52 +01:00
