raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,124 Commits 21 Branches 450 Tags
1d837c32eea480ea7c817201c3404eaa6856eb2e
Commit Graph

1527 Commits

Author SHA1 Message Date
Rob Harrington
1d837c32ee Replacing bindonce with native Angularjs syntax in admin 2016-05-25 08:10:20 +10:00
Rob Harrington
e5ca494db8 Replacing bindonce with native Angularjs syntax in Darkswarm 
Involved changing bo-text -> ng-bind, bo-href-i -> ng-href, bo-src-i -> ng-src and ng-html -> ng-bind-html
 2016-05-25 08:10:20 +10:00
Rob Harrington
fe739f6a8d angular-foundation tabs directive on shop pages is closed by default 2016-05-25 08:10:20 +10:00
Rob Harrington
02be661163 Bumping angularjs version to 1.3.15 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
Rohan Mitchell
7b994adc23 Merge branch 'use-save-bar' of https://github.com/bingxie/openfoodnetwork into use-save-bar 
Conflicts:
	app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
	app/assets/javascripts/templates/admin/save_bar.html.haml
	app/views/admin/order_cycles/edit.html.haml
	app/views/admin/variant_overrides/_products.html.haml
	app/views/spree/admin/orders/bulk_management.html.haml
 2016-05-13 10:05:39 +10:00
Bing Xie
f8ec0d316a Save bar can support cancel button 2016-05-12 11:04:40 +10:00
Bing Xie
89ae77dfd9 Make the save bar look better 2016-05-12 10:45:41 +10:00
Bing Xie
3760a34b2b Add save_bar to the order cycles simple editing form 2016-05-12 10:45:41 +10:00
Bing Xie
d59dea29ab Fix failed test for the default form 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
d10719330d Extend save_bar directive to support more buttons 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
Bing Xie
064e3c426e Make the save bar look better 2016-05-06 11:00:34 +10:00
Bing Xie
1833f0dd5d Add save_bar to the order cycles simple editing form 2016-05-04 12:45:23 +10:00
Bing Xie
885d489bc3 Fix failed test for the default form 2016-05-04 12:45:23 +10:00
Bing Xie
63b644551c Keep the action with save button 2016-05-04 12:45:23 +10:00
Bing Xie
00858656b5 Extend save_bar directive to support more buttons 2016-05-04 12:45:23 +10:00
Bing Xie
ef0e41e624 Use save bar on order cycle form 2016-05-04 12:45:23 +10:00
Rob Harrington
1d7308bf5d More intuitive logic for minimum billable turnover 2016-04-29 18:03:32 +10:00
Maikel Linke
4d6a21254f Merge remote-tracking branch 'origin/master' into openstreetmap-tiles 2016-04-29 16:40:54 +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
Rohan Mitchell
42a327211e Merge branch 'openstreetmap-tiles' of https://github.com/bingxie/openfoodnetwork into openstreetmap-tiles 2016-04-29 14:36:47 +10:00
Rohan Mitchell
88e9eb59cf Do not allow invalid quantity to reach model, triggering server update 2016-04-29 11:56:48 +10:00
Rohan Mitchell
65895752da Remove cruft 2016-04-29 11:49:30 +10:00
Rohan Mitchell
1220ff8a06 Notify when stock limit reached on shopfront rather than silently capping 2016-04-27 15:05:44 +10:00
Bing Xie
824a29624f Tweak the map UI 2016-04-27 14:17:29 +10:00
Bing Xie
daa5b00a2a Uses openstreetmap tiles 2016-04-27 13:50:15 +10:00
Rohan Mitchell
8f8a1191cb Remove stock cap on max_quantity 2016-04-27 12:27:24 +10:00
Rohan Mitchell
a26266159c Fix timing issue: change in client-side value during server update 2016-04-22 10:47:20 +10:00
Rohan Mitchell
6cba935a65 Add close button to out of stock modal 2016-04-21 11:26:30 +10:00
Rohan Mitchell
35117f7af4 Show a modal when available stock levels have reduced 2016-04-21 09:36:23 +10:00
Rohan Mitchell
5e39b11c2f Spec out of stock handling for group buy 2016-04-21 09:36:23 +10:00
Rohan Mitchell
cfe062918b When a variant goes out of stock, disable the input and grey out the row 2016-04-21 09:36:23 +10:00
Rohan Mitchell
6fbbe580c5 After adding an item to the cart, when less quantity available, reduce quantity and reset client-side stock level 2016-04-21 09:36:23 +10:00
Rohan Mitchell
8a62d26af4 After adding an item to the cart, when out of stock, remove from cart and reset client-side stock level 2016-04-21 09:36:23 +10:00
Rohan Mitchell
a1bcdc616f Extract add-to-cart inputs into partials 2016-04-21 09:36:22 +10:00
Rohan Mitchell
17f69bd182 Remove trailing whitespace 2016-04-21 09:36:22 +10:00
Rohan Mitchell
d45b525497 When there's an out of stock product in the cart, placing order returns user to the cart 2016-04-21 09:36:22 +10:00
Lynne Davis
30ed6df38d Adding super admin configuration for the minimum billable turnover functionality 2016-04-15 16:56:09 +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
Rob Harrington
6c5aaef86e Removing ability to create order discount rules 
Issue with application of tax to discounted items is yet to be resolved
 2016-04-01 21:31:36 +11:00
Rob Harrington
c099711f97 Removing dialogOptions library, not required anymore 2016-04-01 19:48:25 +11: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
47df106237 Refactor tragsWithTranslation directive to handle dynamic attr names 2016-04-01 19:48:25 +11:00
Rob Harrington
ed134bac84 Removing unrequired initSelection option from ofn-select2 2016-04-01 19:48:25 +11:00
Rob Harrington
33aad10e73 Adding dialogOptions library for adding responsiveness to jquery dialog 2016-04-01 19:48:25 +11:00
Rob Harrington
3d78b375c6 Moving angularjs tag rule logic into its own module 2016-04-01 19:48:25 +11:00
Rob Harrington
f9acee2be4 Shipping methods can be tagged 2016-04-01 19:48:25 +11:00