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
9,960 Commits 18 Branches 451 Tags
1ce431b671bd97caee5bdca7ef3869eaa7f95bee
Commit Graph

878 Commits

Author SHA1 Message Date
luisramos0
e573a3fc2b The main menu is now translatable and configurable using Content configuration and translations. Added 7 menu entries to the translations file (each with text and url) and 7 content configuration points to enable/disable these. The mobile menu icons can also be configured. 2018-08-31 11:23:11 +10:00
Maikel Linke
d1f7828432 Fix pending spec 
The link from the enterprise page was missing the enterprise id. So the
bulk edit page for fees was showing fees for all enterprises.
 2018-08-30 14:50:41 +10:00
Maikel Linke
0174b84254 Remove old deactivated code 2018-08-30 14:50:41 +10:00
Matt-Yorkley
2b057a26d5 Add primary_producer to index to reduce queries 2018-08-24 15:51:37 +10:00
Kristina Lim
c14e7ea8d5 Allow bulk update of order cycle name 2018-08-16 21:18:24 +08:00
luisramos0
3b1bd53d3a Added basic integration with Matomo 
Added matomo script and added a new matomo settings menu entry under configuration. Improved organization of en.yml by grouping configuration screens.
 2018-08-10 16:12:58 +10:00
Kristina Lim
6251c72921 Add divider between admin enterprise index actions 2018-08-10 12:17:31 +10:00
Kristina Lim
b91019ad64 Split translation key for enterprise manage button 
The ".manage" key is still used by the column header for the "Manage"
buttons.
 2018-08-10 12:12:26 +10:00
Maikel
03468efa7e Merge pull request #2346 from oeoeaio/subs-totals 
Subs: totals in backend are consistent and include fee breakdown
 2018-08-07 18:17:13 +10:00
Maikel Linke
b736560d63 Inform about inaccurate subscription totals 
https://github.com/openfoodfoundation/openfoodnetwork/pull/2346#issuecomment-409822038
 2018-08-03 14:59:27 +10:00
Matt-Yorkley
c8397024e4 Streamline Product Import UX flow 2018-08-03 14:33:35 +10:00
Maikel Linke
d5fdda1c46 Fix typo translating Enterprises 2018-08-03 12:15:50 +10:00
Rob Harrington
cead905d05 Use estimated subscription total for proxy orders if order has not been initialized 2018-08-03 12:14:25 +10:00
Rob Harrington
fb93351386 Show fee breakdown in line items panel if present 2018-08-03 12:14:25 +10:00
Maikel
02331221ef Merge pull request #2471 from Matt-Yorkley/pi/post_save 
PI: post-save UI changes
 2018-07-26 11:26:51 +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
89ac558f37 Fix wrong sort predicates in customer index 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
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
745390dcd5 Wrap rows in customer index with TBODY tag 2018-07-23 10:33:39 +10:00
Maikel
add250b30f Merge pull request #2473 from Matt-Yorkley/pi/stop_if_invalid 
PI: Don't allow save if invalid entries are present
 2018-07-23 08:54:01 +10:00
Maikel
1b571e9835 Merge pull request #2379 from Matt-Yorkley/uk/guest_label 
Add guest label to admin customers index
 2018-07-20 08:53:26 +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
Matt-Yorkley
583f16b38d Add guest label to admin customers index 2018-07-18 22:56:10 +01:00
Matt-Yorkley
5e142205bd Use relative translation keys 2018-07-18 13:35:23 +01:00
Matt-Yorkley
b37bea35fa Use relative translation keys 2018-07-18 11:43:31 +01:00
Matt-Yorkley
18206c9369 Remove old view file 2018-07-18 11:42:07 +01:00
Matt-Yorkley
c4af50e95c Add sidebar to Import index page 2018-07-15 23:12:26 +01:00
Matt-Yorkley
f344b7893d Remove Product Import guide page 2018-07-15 20:49:55 +01:00
Matt-Yorkley
8aed78b0e6 Don't allow save if invalid entries are present 2018-07-15 10:21:36 +01:00
Matt-Yorkley
a4210a1cab PI post-save UI changes 2018-07-15 00:27:21 +01:00
Rob Harrington
c71a5ec0df Update subscription form to use new card validations for Stripe payment method 2018-07-05 19:26:11 +10:00
Matt-Yorkley
aaba6da162 Add available_on notes to PI guide 2018-06-21 14:20:59 +10:00
Maikel
3399eba428 Merge pull request #2367 from frank-west-iii/issue-2297-edit-product-cancel 
Move product bulk edit to product index route
 2018-06-20 17:53:57 +10:00
Rob Harrington
86d7453d26 Ask user to confirm oc date change for open order cycles with subsciptions 2018-06-20 13:06:05 +10:00
luisramos0
b8f1571282 added directive to make links open in new tab by default in textangular text areas in enterprise description, enterprise group description and in shopfront open and closed messages 2018-06-19 16:53:21 +01:00
Frank West
8324b00999 Renames product bulk edit action to index 
When a user hit cancel while editing a product it took them to the spree
products index page instead of the bulk edit page. The button was part
of a shared view for all resources so changing it's actions were not
readily available.

It was suggested that instead of carrying our own separate controller
action we could just override the index action of the products
controller with the bulk edit functionality instead. This has the
advantage of removing some overrides and allows us to not add
additional overrides in the future.
 2018-06-19 17:51:23 +10:00
Rob Harrington
dabef16606 Use ofn-select2 directive for country and state selectors on enterprise forms 2018-06-19 10:34:02 +10:00
luisramos0
d1019fcc5e changed the country and state selectors to angular on enterprises admin (new and edit screens) so that states are dynamically updated when country is changed 2018-06-19 10:34:02 +10:00
Pau Pérez Fabregat
3283c5158b Merge pull request #1492 from Matt-Yorkley/uk/import2 
Uk/import2
 2018-06-04 09:56:36 +02:00
Rob Harrington
184bf9ce36 Allow super admin users to enable subscriptions for enterprises 2018-05-30 09:42:03 +10:00
Matt-Yorkley
a4a2bc438a Import settings spec 2018-05-26 19:34:20 +01:00
Matt-Yorkley
b42e3eb2c9 Product Import Guide WIP 2018-05-26 19:34:20 +01:00
Matt-Yorkley
7da97be7d2 Create separate angular module 2018-05-26 19:34:20 +01:00
Matt-Yorkley
c2c42e1d9a Product Import refactor 2018-05-26 19:34:20 +01:00
Matt-Yorkley
7c283d90db Spec adjustments 2018-05-26 19:34:19 +01:00
Matt-Yorkley
1c34ce6162 PI exception handling 2018-05-26 19:34:19 +01:00
Matt-Yorkley
6efd167400 PI inventories UX 
Minor tweaks
 2018-05-26 19:34:19 +01:00