raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-31 21:37:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 18 Branches 452 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

2229 Commits

Author SHA1 Message Date
Luis Ramos
8bd3062b16 Fix rubocop issues 2020-04-17 18:17:54 +01:00
Luis Ramos
c7fb85a715 Replace background with members with before with let statements 2020-04-17 17:34:36 +01:00
Luis Ramos
e901615b61 Make spec simpler 2020-04-17 16:56:56 +01:00
Luis Ramos
c455dfb609 Make some specs faster by going directly to the order edit page and move incomplete order spec to a specific context 2020-04-17 16:28:27 +01:00
Luis Ramos
d96d6b2337 Split orders_spec in two: tests for orders list page and tests for orders edit page 2020-04-17 15:21:03 +01:00
Luis Ramos
b5ba2acb21 Merge pull request #5169 from jeduardo824/enhancement/5102-make-shop-names-links 
make shop name a link on /account
 2020-04-09 22:01:34 +01:00
Matt-Yorkley
3aff7f62e3 Don't query distributed properties on enterprises that aren't active distributors 
Cuts page load on /shops by ~75% (with production data) and removes ~300 expensive and superfluous queries.
 2020-04-08 20:08:12 +02:00
Eduardo
e7b780f963 make shop name a link on /account 2020-04-06 08:34:24 -03:00
Matt-Yorkley
375b4648dc Add pagination to Bulk Order Management 2020-03-29 19:54:47 +02:00
Luis Ramos
bddfa95eb5 Fix broken new property button in properties page 2020-03-24 21:50:49 +00:00
Matt-Yorkley
62a00b17a2 Merge pull request #5026 from Matt-Yorkley/checkout_display 
Temporarily hide OC selector in checkout page
 2020-03-20 18:33:47 +01:00
Matt-Yorkley
e8692fec4c Temporarily hide OC selector in checkout page 2020-03-20 12:08:58 +01:00
Luis Ramos
3f5a964dec Move enterprise_fee_summaries_spec to order_management engine, moving 
translation keys for the views and adapting some routes
 2020-03-20 11:07:23 +00:00
Luis Ramos
0b05312f19 Move cookies spec to web engine and adapt routes to the fact they are now normal main apps routes 2020-03-20 11:07:23 +00: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
2b9f57f4e0 Merge pull request #4998 from mkllnk/4277-signup-flow 
Direct new enterprise users to their dashboard
 2020-03-18 16:17:41 +11:00
Maikel Linke
c64493ca77 Continue shopping with the products list 2020-03-17 10:28:03 +11:00
Maikel Linke
5b942e6933 Add spec for "continue shopping" from cart 
https://github.com/openfoodfoundation/openfoodnetwork/issues/4771
 2020-03-17 10:28:03 +11:00
Maikel Linke
9244a95472 Direct new enterprise users to their dashboard 
People were directed to the home page and had to do several more clicks
to continue with their enterprise setup.
 2020-03-16 11:18:32 +11:00
Luis Ramos
c37218fdc5 Merge pull request #4719 from luisramos0/stripe_card_to_pm 
Make StripeSCA payment method work with existing credit cards (the ones saved through the Stripe Charges API)
 2020-03-02 17:22:07 +00:00
Luis Ramos
677f31ffa8 Make payment source_views/gateway work with nil credit card 
This will happen if user deletes a saved credit card used previously. In this case, the admin payment details page will render empty details and the payment amount
 2020-02-26 11:55:17 +00:00
Luis Ramos
5848a46149 Add missing template to render stripeSCA payment and add spec to verify it's presence 2020-02-26 11:38:42 +00:00
Luis Ramos
a3a61967a8 Merge pull request #4621 from luisramos0/spree_backend_js 
OFN without spree_backend 🎉
 2020-02-22 10:24:50 +00:00
Luis Ramos
0c4f22f847 Fix images/new.js path and add simple spec to verify the page loads correctly 
Testing the file upload would be a bit more complicated
 2020-02-20 11:18:22 +00:00
Matt-Yorkley
b3f05d1a98 Use "Variants" instead of "Products" in order cycle exchanges UI 2020-02-05 15:11:34 +01:00
Kristina Lim
9d0e26ae28 Wait for products panel to show in outgoing exchanges feature spec 2020-02-04 16:20:47 +08:00
Maikel Linke
6b18d4a60c Avoid false positives in specs 
When switching from one tab to another, a `have_no_selector` check could
match because the new tab hasn't loaded yet. Now we use that check after
we verified other content on the new tab.
 2020-01-16 15:10:25 +11:00
Maikel Linke
4d53f47d88 Leave tag rules spec in clean state 2020-01-16 15:10:25 +11:00
Maikel Linke
3a9aaf6764 Wait for the first enterprise tab to be loaded 2020-01-16 15:10:25 +11:00
Maikel Linke
42aa15767e DRY navigating to Tag Rules section 2020-01-16 15:10:25 +11:00
Maikel
52d2d1d23c Merge pull request #4668 from Matt-Yorkley/rails-4-prep-2 
Rails 4 prep: admin dashboard route
 2020-01-16 14:16:32 +11:00
Luis Ramos
3171b60d6f Merge pull request #4580 from Matt-Yorkley/order_capture 
Use asynchronous requests for order capture and ship actions
 2020-01-13 17:14:40 +00:00
Matt-Yorkley
b9edea7c0e Rename 'admin/overview#index' route from :admin to :admin_dashboard 
Fixes issues with route declarations in Rails 4
 2020-01-12 13:11:33 +01:00
Luis Ramos
e9a5b889de Merge pull request #4606 from cyrillefr/lone-hub-checked-by-default-4428 
Select by default single Hub/Shop option on creation of payment/shipping method
 2020-01-08 11:44:16 +00:00
Luis Ramos
1606f9900f Merge pull request #4507 from luisramos0/backend_ctrl_reports 
Bring spree_backend reports controller to OFN
 2019-12-23 16:14:07 +00:00
cyrillefr
e6d9ec7bd7 Small fixes for default single Hub/Shop options issue 
- removed mode variable
 - reverted html template accordingly
 - added a more specific helper
 - fixed some short variable names
 2019-12-19 21:08:34 +01:00
Matt-Yorkley
6bed05c721 Add missing feature test for order "Ship" button 2019-12-18 14:15:48 +01:00
Matt-Yorkley
a3ee6674ea Use asynchronous requests for order capture and ship actions 2019-12-18 14:15:46 +01:00
cyrillefr
e59077e63e Select by default single Hub/Shop option on creation of payment/shipping method 
- added a helper
- added mode(new/edit) in payment/shipping views
- updated checkbox creation
- added tests
 2019-12-18 10:45:00 +01:00
luisramos0
c59326743b Remove sales total report 2019-12-13 16:44:46 +00:00
luisramos0
a104bf8efd Add feature spec to validate load all and select all exchange products 2019-12-12 18:49:11 +00:00
luisramos0
1b29d474d0 Add specs to cover case where updating subscriptions products quantity fails 2019-12-09 15:11:32 +00:00
Maikel
f38b1b95f0 Merge pull request #4525 from kristinalim/fix/4489-flaky_spec_for_editing_oc 
4489 Improve waiting in feature spec for edit Order Cycle page
 2019-12-03 20:36:37 +11:00
Kristina Lim
852adfd436 Improve waiting in feature spec for order cycle page 2019-12-02 20:06:43 +08:00
Kristina Lim
1476859c83 Do one thing at a time in feature spec for product cloning 2019-11-28 22:05:17 +08:00
luisramos0
6615469f8b Fix 3 more specs in OC edit pages 2019-11-12 12:00:48 +00:00
luisramos0
d281837dd9 Remove useless spec now that we have 3 steps in OC edit process 2019-11-12 12:00:48 +00:00
luisramos0
7c19fe418e Adapt OC specs to new page flow with 3 steps (these specs are not green yet) 2019-11-12 12:00:48 +00:00
luisramos0
46d0023018 Adapt OC spec to new page flow with 3 steps 2019-11-12 12:00:48 +00:00
Pau Pérez Fabregat
ed15bc422e Merge pull request #4453 from luisramos0/rubo 
run rubocop --auto-correct
 2019-11-12 10:30:21 +01:00