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

2493 Commits

Author SHA1 Message Date
Kristina Lim
368612cad6 Allow removal of enterprise logo and promo image 2018-09-04 02:08:25 +08:00
Kristina Lim
c9370672c6 Add JS support for removal of enterprise images 2018-09-04 02:08:12 +08:00
Pau Pérez Fabregat
7dbbc3e9d8 Merge pull request #2610 from luisramos0/cookies_banner_bug 
[Cookies] Added new test to cookies spec to cover bug on cookies banner and fix…
 2018-09-03 17:23:17 +02:00
luisramos0
14d526efc2 removed assets related to spree store: dead code 2018-09-03 09:50:42 +01:00
Matt-Yorkley
d8bbcdc54b Decrease batch size to reduce chance of timeouts 2018-08-31 22:52:44 +01:00
Matt-Yorkley
04d50d4555 Fix filter results bug in validation section 2018-08-31 15:00:29 +01:00
Kristina Lim
f5c44ef0e6 Rename "entreprise" in i18n keys to "enterprise" 2018-08-31 15:26:30 +08:00
Maikel
1b88edea1f Merge pull request #2420 from stveep/stripe-admin-2 
Stripe admin 2
 2018-08-30 15:48:49 +10:00
luisramos0
8dc10ffc6e Added new test to cookies spec to cover bug on cookies banner and fixed it. See issue #2599. 
Also, improved readability on cookies spec with some extracted methods.
 2018-08-28 23:48:22 +01:00
Maikel
79f50e0b7b Merge pull request #2353 from luisramos0/customers_admin_country_state 
fixed UX problem in the state selector in customers admin
 2018-08-28 16:46:00 +10:00
Maikel
a37931afda Merge pull request #2542 from luisramos0/add_to_cart 
Extract OrderController.populate to new CartController and OrderPopulator to new CartService
 2018-08-24 14:43:33 +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
luisramos0
61f69905f8 fixed UX problem in the state selector in customers admin 2018-08-20 20:51:22 +01:00
stveep
286101c934 PR changes: switch syntax for mapCC, remove ng-init 2018-08-19 10:43:53 +01:00
stveep
c0f41b6833 PR changes - erb to haml, don't update en_GB translations 2018-08-19 10:43:53 +01:00
stveep
b3da7049c6 Should not hide post code on admin side as no billing address otherwise 2018-08-19 10:43:53 +01:00
stveep
ff7dc811e9 Add translations for messages and remove old placeholder translation 2018-08-19 10:43:53 +01:00
stveep
f9a221e2ff add to manifest, tidy up requirements, hide postcode similar to frontend 2018-08-19 10:43:53 +01:00
stveep
a848b9172e Change name to AdminStripeElements to avoid confusion; add status bar for StatusMessages 2018-08-19 10:43:53 +01:00
stveep
8272aebe29 Add Stripe form and duplicate Stripe Elements in backend Angular app 2018-08-19 10:43:53 +01:00
Kristina Lim
c14e7ea8d5 Allow bulk update of order cycle name 2018-08-16 21:18:24 +08:00
luisramos0
ccd5147b11 Added angular templates route and controller to serve angular templates from the server, instead of precompiled assets. This was used to fix a problem with the cookies policy page template that was using a Spree configuration 2018-08-14 10:01:48 +10:00
luisramos0
1c20967ca4 Added a button to close the cookies policy page at the bottom of the page to improve UX on mobile 2018-08-14 10:01:48 +10:00
luisramos0
4b64369ddb Added GA and Matomo toggle in Legal Settings in the global settings in the BO and added GA and Matomo cookies details to the cookies policy page (according to what is configured in the BO) 2018-08-14 10:01:48 +10:00
luisramos0
d920c32376 Added cookies banner toggle and privacy URL to a new section called Legal Settings in the global settings in the BO 2018-08-14 10:01:48 +10:00
luisramos0
92f9cbd00a Added new cookies banner (with link to cookie policy page and the accept cookies button) 2018-08-14 10:01:48 +10:00
luisramos0
08c5d8f3ab Added new cookies policy page and added a link to it in the footer (cookies policy link) 2018-08-14 10:01:48 +10:00
Matt-Yorkley
c8397024e4 Streamline Product Import UX flow 2018-08-03 14:33:35 +10:00
Pau Perez
43bf7293bf Merge branch 'master' into 2-0-stable 
* master: (125 commits)
  Fix syntax error in GETTING_STARTED.md
  Fix syntax error in README.md
  Fix link syntax errors in REAME.md and GETTING_STARTED.md
  Style recently merged code
  Update gem i18n-js to pick up locale changes
  Fix embedded shopfront menu responsiveness
  Add communications links to README
  Fix script/setup by making it less clever
  Change import and reset logic to work with first page
  Move options to first page
  Fix wrong sort predicates in customer index
  Reset reverse when clicking another column to sort
  Move logic for toggling by column into SortOptions
  Generalize sorting through SortOptions service
  Remove unused sorting preferences in ColumnsCtrl
  Fix frontend sorting in "Bulk Order Management"
  Fix frontend sorting in "Customers" index
  Change sorting to be done in ascending order first
  Wrap rows in customer index with TBODY tag
  Update .rubocop_todo.yml
  ...
 2018-07-27 10:21:47 +02:00
Maikel
933ff63de2 Merge pull request #2389 from luisramos0/bulk_prod_edit_fix 
admin page fetcher is now synchronously fetching all pages before reso…
 2018-07-26 14:09:21 +10:00
Maikel
ffd3d28889 Merge pull request #2474 from Matt-Yorkley/pi/import_options 
PI: import options UI
 2018-07-24 10:34:14 +10:00
Matt-Yorkley
67767f86eb Change import and reset logic to work with first page 2018-07-23 02:07:00 +01:00
Matt-Yorkley
bd200c885b Move options to first page 2018-07-23 01:46:32 +01:00
Kristina Lim
47608525c6 Reset reverse when clicking another column to sort 2018-07-23 10:33:40 +10:00
Kristina Lim
5179f7fd63 Move logic for toggling by column into SortOptions 2018-07-23 10:33:40 +10:00
Kristina Lim
55d0b1dfc5 Generalize sorting through SortOptions service 2018-07-23 10:33:40 +10:00
Kristina Lim
8b6b694244 Remove unused sorting preferences in ColumnsCtrl 2018-07-23 10:33:40 +10:00
Kristina Lim
2bba72c5a9 Fix frontend sorting in "Bulk Order Management" 2018-07-23 10:33:40 +10:00
Kristina Lim
822b2c929a Fix frontend sorting in "Customers" index 
The scope for customersCtrl did not have access to the sorting
preferences stored in the nested ColumnsCtrl scope. To address this,
the page has been changed to use a new set of sorting preferences
declared in the customersCtrl scope itself.

Also, these sorting preferences are now stored in an object. This
enables the parent scope to see changes to the sorting preferences which
are done via the nested ColumnsCtrl scope,

The "Bulk Order Management" page is also affected by the same scoping
issue. Once this page is fixed, we can remove remnants of the sorting
preferences initialized in ColumnsCtrl.
 2018-07-23 10:33:39 +10:00
Kristina Lim
9f09861d8b Change sorting to be done in ascending order first 
Currently, we always toggle "reverse" when triggering a sort.

If "reverse" is initially set to false, triggering a sort for the first
time then toggles this to true. The effect is that, the first time that
sorting is done, the rows are sorted in reverse order.

This is not intuitive - they should be sorted in ascending order first.
 2018-07-23 10:33:39 +10:00
Maikel
1dbd265b30 Merge pull request #2384 from luisramos0/open_new_tab 
added directive to make links open in new tab by default in textangul…
 2018-07-19 09:17:09 +10:00
Pau Pérez Fabregat
37e2d76a39 Merge pull request #2477 from mkllnk/2465-use-right-subscriptions-translation 
Reference existing translation: closed order cycle
 2018-07-18 16:47:35 +02:00
luisramos0
4a44454210 fixed number rounding issue in product bulk edit 2018-07-16 13:13:58 +10:00
Maikel Linke
4d68723fe3 Reference existing translation: closed order cycle 
https://github.com/openfoodfoundation/openfoodnetwork/issues/2465

Viewing a customers subscription could display a translation missing
error.
 2018-07-16 09:24:32 +10:00
luisramos0
dfb510debe admin page fetcher is now receiving a onLastPageComplete function that is used to show "no results" messages only after the last page is fetched 2018-07-13 15:01:43 +10:00
Maikel Linke
43883d1ab4 Simplify email confirmation directive 
Making better use of Angular features.
Adding a spec for this functionality.
 2018-07-13 09:04:42 +10:00
Maikel Linke
60b66540df Add resend email button to admin user form 
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/1589
 2018-07-13 09:04:41 +10:00
Rob Harrington
e0d46aa105 Add new serializer to allow search for customer addresses 2018-07-05 19:26:12 +10:00
Rob Harrington
c71a5ec0df Update subscription form to use new card validations for Stripe payment method 2018-07-05 19:26:11 +10:00
Maikel
687612dba8 Merge pull request #2403 from luisramos0/hide-stripe-postcode 
Hide postcode - not necessary as passed from billing address and wrec…
 2018-06-28 08:55:42 +10:00