raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,189 Commits 18 Branches 451 Tags
2d666caaf2527be1d51ec4e522c477ffa6718ef3
Commit Graph

611 Commits

Author SHA1 Message Date
Rob Harrington
c61cb1bdcd Renaming paymentMethodCtrl to paymentMethodsCtrl 2016-05-27 16:23:26 +10:00
Rob Harrington
eedb2854ec Adding FilterProducts rules to tag rule UI 2016-05-27 16:23:26 +10:00
Rob Harrington
3f8420b0e9 Adding tags to variant overrides 2016-05-27 16:23:26 +10:00
Rob Harrington
924d155012 Using correct syntax for attributes on columns 2016-05-25 08:10:20 +10:00
Rob Harrington
b9f6cb8800 Adding translations for all column names 2016-05-25 08:10:20 +10:00
Rob Harrington
1d8719b474 Default column visibility can be set per user using ColumnPreferences model 2016-05-25 08:10:20 +10:00
Rob Harrington
533a94267a Refactoring save-bar 2016-05-25 08:10:20 +10:00
Rob Harrington
ecb9646ccb Using new syntax for save-bar on customers page 2016-05-25 08:10:20 +10:00
Rob Harrington
564c1a3650 Improvements to customers page 
Create customer from dialog

Limiting the number of products shown as once

Adding SaveBar and StatusMessage
 2016-05-25 08:10:20 +10:00
Rob Harrington
245db8971a Fixing specs broken by faster PhantomJS 2016-05-25 08:10:20 +10:00
Rob Harrington
9d1ca6eaca Renaming customers form to prevent conflict with customers array 2016-05-25 08:10:20 +10:00
Rob Harrington
cf94d67caf Preventing default submit behaviour for order cycle form submission buttons 2016-05-25 08:10:20 +10:00
Rob Harrington
97e53900ad Updating translation to start with a capital letter 2016-05-25 08:10:20 +10:00
Rob Harrington
1d837c32ee Replacing bindonce with native Angularjs syntax in admin 2016-05-25 08:10:20 +10:00
Rob Harrington
6a610ff7a4 Merge remote-tracking branch 'origin/master' into uk/trial-length 2016-05-20 12:22:47 +10:00
Bing Xie
f8ec0d316a Save bar can support cancel button 2016-05-12 11:04:40 +10:00
Bing Xie
7bf6881cb2 Tweaks 2016-05-12 10:45:41 +10:00
Bing Xie
78b4a35d12 Keep the action with save button 2016-05-12 10:45:41 +10:00
Bing Xie
2214c83ec7 Use save_bar on order cycle update form 2016-05-12 10:45:41 +10:00
Bing Xie
38efa218d0 Use save bar on order cycle form 2016-05-12 10:45:41 +10:00
Rob Harrington
1d7308bf5d More intuitive logic for minimum billable turnover 2016-04-29 18:03:32 +10:00
Maikel Linke
fa5fa9e228 Auto-complete tags on customers page 
- new controller serving tags for an enterprise as JSON
- customers page suggesting these tags
- emphasising tags that have rules
 2016-04-29 15:18:17 +10:00
Lynne Davis
cbd0ace098 Code tidying and currency symbol internationalisation 2016-04-15 16:56:09 +01:00
Lynne Davis
30ed6df38d Adding super admin configuration for the minimum billable turnover functionality 2016-04-15 16:56:09 +01:00
Lynne Davis
4033a78887 Removing incorrect angular watch 2016-04-15 16:55:07 +01:00
Lynne Davis
abfb8149d9 Adding configurable Shop Trial Length in business model 2016-04-15 16:51:07 +01:00
Maikel Linke
831df0b222 Create and delete customers in admin interface 
Removed Customers service and extended CustomerResource.
 2016-04-15 11:12:22 +10:00
Maikel Linke
9e4610f9bd Customers: enable change of hub if no customers 
Fix #588.

And show search bar even when no customers are shown. Previously, the
search bar disappeared when you entered a search without results.
 2016-04-15 11:12:22 +10:00
elf Pavlik
f15e948085 small i18n fixes #878 2016-04-14 16:10:21 -05:00
Rob Harrington
44077a2c6f Fixing styling (bottom margin for save-bar) on inventory page 2016-04-06 15:43:55 +10:00
Rob Harrington
d278b72289 Updating Tag Rules UI to allow management of new FilterShippingMethods rule type 2016-04-01 19:48:25 +11:00
Rob Harrington
c74c274a9e Renaming shippingMethodCtrl to shippingMethodsCtrl 2016-04-01 19:48:25 +11:00
Rob Harrington
bf72864c2b Tag Rules can be deleted 2016-04-01 19:48:25 +11:00
Rob Harrington
4c2552e0bf Enterprise users can create tag rules 2016-04-01 19:48:25 +11:00
Rob Harrington
066190c16f First cut at an interface for updating tag rules 2016-04-01 19:48:25 +11:00
Maikel Linke
813dff8af2 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into require-login 2016-04-01 11:04:36 +11:00
Maikel
d51cfccd7e Auto-merged master into i18n-hackathon on deployment. 2016-03-23 10:09:36 +11:00
Maikel Linke
79ad05d405 i18n group image help text 2016-03-23 10:01:04 +11:00
elf Pavlik
6d0dc438a7 i18n fixes after @sstead feedback in #799 2016-03-21 16:55:57 -06:00
Maikel Linke
a48b992ec0 Shops can require users to login 
Enterprise users have a new option to restrict their shopfronts to
logged in users only. If a guest visits one of these shopfornts, the
guest is prompted to login and is not shown any products.

Closes #849.
 2016-03-18 16:46:28 +11:00
Rohan Mitchell
16741598fd Merge branch 'master' into products-caching 
Conflicts:
	spec/features/admin/variant_overrides_spec.rb
 2016-03-18 09:59:56 +11:00
Maikel Linke
2546603a67 Remove what_is_this from locale 
It got replaced by admin.whats_this.
Changed views to use the new key.
 2016-03-11 17:08:13 +11:00
Maikel Linke
e81343c8e4 Merge remote-tracking branch 'origin/master' into i18n-hackathon 2016-03-11 16:50:48 +11:00
Maikel Linke
2a3b3b6dd2 Merge remote-tracking branch 'origin/master' into i18n-hackathon 
Conflicts:
	app/assets/javascripts/admin/enterprise_fees.js
	app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee
	app/views/admin/shared/_columns_dropdown.html.haml
	app/views/admin/variant_overrides/_header.html.haml
	app/views/admin/variant_overrides/_products.html.haml
	spec/features/admin/bulk_order_management_spec.rb
	spec/features/admin/variant_overrides_spec.rb
 2016-03-11 15:38:28 +11:00
Maikel Linke
21a7942de6 Merge remote-tracking branch 'origin/master' into indicate-required-fields-for-new-enterprise-form 2016-03-11 14:14:45 +11:00
Maikel Linke
5225686d8f Re-merge bulk order view 2016-03-11 12:23:12 +11:00
Maikel Linke
3e5f53b082 Rename i18n key what_is_this 2016-03-11 12:13:17 +11:00
Maikel Linke
02cbad2697 Remove duplicate lines from merging 2016-03-09 18:49:35 +11:00
Maikel Linke
28e2d4041f Hide create-enterprise-group button from non-admins 
Only admin users can create groups. The button was still displayed for
users that owned a group.

Unused HTML attributes were removed from that button as well.
 2016-03-04 14:24:24 +11:00
Rohan Mitchell
422061f137 Merge branch 'master' into products-caching 
Conflicts:
	app/controllers/shop_controller.rb
	app/models/enterprise_fee.rb
	app/models/order_cycle.rb
	app/models/variant_override.rb
	db/schema.rb
	lib/open_food_network/products_renderer.rb
	spec/lib/open_food_network/products_renderer_spec.rb
 2016-03-03 09:42:52 +11:00