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
838ffdbf00
Add code comment for dependency
2020-04-02 17:33:10 +02: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
Matt-Yorkley
40f8cf660c
Update vendor/assets/angular-google-maps.min.js
...
Fixes an issue where if the js library from maps.googleapis.com failed to load in the <head>, all of our subsequent Angular would completely break.
See: https://github.com/angular-ui/angular-google-maps
Note: `bluebird.js` is a new dependency of `angular-google-maps.js`.
2020-04-02 13:32:55 +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
Maikel Linke
5a9b5660f1
Simplify logic in PageSelectionCtrl
2020-03-19 15:38:00 +11:00
Maikel Linke
1d42ce885b
Stay on shop page when opening login modal
...
The login modal changes the URL to `#/login` which interfers with our
shop pages. In order to show the right shop page, we need to know which
pages are valid and where we have been before we clicked on Login.
2020-03-19 15:38:00 +11:00
Maikel Linke
17751c448f
Rename PageSelectionCtrl for clarity
2020-03-19 15:37:13 +11:00
Maikel Linke
4b8d9d18d7
Simplify PagesetCtrl
2020-03-19 15:37:13 +11:00
Maikel Linke
ea80ae3832
Enable page navigation via URL fragment
...
The broadcasting of notifications didn't update properly and I couldn't
find a way to listen to $location updates. I replaced the three
intertwined directives with one controller and a bit more HTML code. Now
we have only one scope that listens to $location and all browser actions
like the back button is reflected in the page.
As nice side-effect, the menu links have now the right destination so
that you can copy the link and paste it into another browser window.
40 lines less code.
2020-03-19 15:37:13 +11:00
Maikel Linke
bf26a26743
Reduce complexity by removing unused code branch
2020-03-19 15:36:24 +11:00
Maikel Linke
e3f840f48c
Remove dependency to Tabsets
2020-03-19 15:36:23 +11:00
Maikel Linke
42ca7888c0
Simplify by reducing unused options
2020-03-19 15:36:23 +11:00
Maikel Linke
8aa892136e
Duplicate shop tab code for rewrite
...
The old code is still used on the user page.
2020-03-19 15:36:23 +11: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
Maikel Linke
b63042236d
Activate Foundation's dropdowns after tab switch
...
If the dropdown doesn't exist during page load, Foundation misses it. We
need to initialise it again.
2020-01-30 17:02:23 +11:00
Matt-Yorkley
d508e7772c
Fix angular templates bug
...
Angular controller data was being partially preserved when switching back and forth between tab templates, causing the ProductsCtrl to hold duplicate datasets when it is re-initialized after going from the shop tab to another tab, then back again.
2020-01-13 17:05:28 +01:00
Matt-Yorkley
17cf099f99
Always keep one shop tab open (don't toggle closed)
2020-01-13 17:05:28 +01:00
Matt-Yorkley
7b0c55e15a
Ensure producer properties are included in properties results
2019-10-18 21:15:13 +01:00
Matt-Yorkley
cbe2477d04
Fix property filters and improve test coverage
2019-10-18 21:15:13 +01:00
Matt-Yorkley
37e5e1923c
Improve filter buttons UX
2019-10-18 21:15:13 +01:00
Matt-Yorkley
bf8c632fce
Refactor ProductsCtrl request params
2019-10-18 21:15:13 +01:00
Matt-Yorkley
573a69477f
Fix filters not updating on OC change
2019-10-18 21:15:13 +01:00
Matt-Yorkley
2539b84b33
Fix product.meta_keywords not searchable
2019-10-18 21:15:13 +01: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
Kristina Lim
1516069888
Specify API date format when converting date to string in JS
2019-08-29 02:44:14 +08:00
Matt-Yorkley
8a069787d1
Cart dropdown now closes when clicking outside it.
2019-08-05 21:48:37 +01:00
Kristina Lim
dae23d3c3b
Remove unused inclusion of $window in OffcanvasCtrl
2019-07-25 20:22:51 +08:00
Kristina Lim
def2693afc
Move offcanvas JS to Angular controller
2019-07-25 17:01:46 +08:00
Kristina Lim
d42da8737e
Improve readability of selectors in page alert JS directive
2019-07-24 12:44:42 +08:00
Kristina Lim
6419edcb1f
Integrate styles/animations for page alert, top bar, tab bar, off canvas
2019-07-24 12:44:42 +08:00
Kristina Lim
ca0f746cf1
Fix animation and layout for offcanvas menu
...
Uses strategy from this forum comment:
http://foundation.zurb.com/forum/posts/547#comment_8840
2019-07-24 12:43:44 +08:00
luisramos0
7e2bead54d
Make finalizedquantity optional in the ofn-on-hand directive and extract avaiable quantity to a separate method for clarity
2019-06-25 14:50:03 +01:00
luisramos0
567196fe0e
Fix line item verification of stock on the browser side by adding logic to handle completed orders with some reserved stock
...
The shopping/orders_spec is now validating this edge case by using all stock available in one of the line items
2019-06-25 14:50:03 +01:00
Matt-Yorkley
785595a951
Reduce initial queries on shop page by ~95%
2019-06-12 09:47:01 +01:00
Matt-Yorkley
874fb884b8
Refactor Angular controllers further
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
11e83af0b6
Remove duplication of enterprise angular controllers
...
We can re-use the enterprise and producers controllers here in their respective groups tabs, no need for a third controller
2019-06-12 09:47:01 +01:00
Matt-Yorkley
d5bd058754
Fix groups show page
...
It can definitely be cleaned up more in the future, but this should get us around a 90% reduction in page load times.
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
1b8dfaf049
Fix HashNavigation reload bug
2019-06-12 09:47:01 +01:00
Matt-Yorkley
ed97400a23
Improve producers performance
2019-06-12 09:47:01 +01:00
Matt-Yorkley
45d65baf8e
Improve shops performance
2019-06-12 09:47:01 +01:00
Luis Ramos
12282ad906
Merge pull request #3794 from m-budryte/replace_&_with_OR
...
& replaced by OR when multiple property filters are selected
2019-05-23 14:35:51 +01:00