raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-13 23:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,241 Commits 19 Branches 453 Tags
db3637fe84d2e4bf5743df1dfd892eff7d626cce
Commit Graph

7241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob H
94c375ad31 WIP: changing BOM listing from orders to line items 2014-01-17 16:57:08 +08:00
Rob H
e0d03fa305 Listing more attributes of orders on BOM page 2014-01-17 15:29:08 +08:00
Rob H
00dfa62f43 Basic listing of orders on BOM page 2014-01-17 14:56:26 +08:00
Will Marshall
48854fdcf5 Adding date parsing to Angular 2014-01-17 17:13:15 +11:00
Rob H
5aa032b54c BOM: fetchOrders sends request to API and resetOrders stores returned data 2014-01-17 14:00:02 +08:00
Rob H
c6d9bfafbc Create shared services module for backend angularjs, rename modules 2014-01-17 13:48:28 +08:00
Will Marshall
053f2446bf Adding a temporary note to the product page 2014-01-17 16:37:24 +11:00
Will Marshall
6e622ffb37 Changing the logo to go back to the home page 2014-01-17 16:36:28 +11:00
Will Marshall
1e88c0a6f1 Adding max quantity for group buy to ze form 2014-01-17 16:32:32 +11:00
Will Marshall
f7f4fbf503 Displaying prices better 2014-01-17 16:32:32 +11:00
Rob H
970942ff42 Add JS spec and basic initialisation code for BOM 2014-01-17 13:16:35 +08:00
Rohan Mitchell
87cf596a30 For a product with one or more on_demand variants, don't show 'On demand' at the product level 2014-01-17 16:12:07 +11:00
Rohan Mitchell
ed78cc053b Do not update product on_hand when product has on_demand variants 2014-01-17 16:12:07 +11:00
Rohan Mitchell
4518e30849 Display infinite on_hand as read-only 2014-01-17 16:12:07 +11:00
Rohan Mitchell
ea028ddd01 Fix invalid JSON for on_demand products/variants with infinite on_hand 2014-01-17 16:12:07 +11:00
Rohan Mitchell
5e0515e6c5 Variant value expression returns a value of 1 when unit value equals the scale 2014-01-17 16:12:07 +11:00
Will Marshall
9624a3919a Patching a bug in shop controller 2014-01-17 15:13:48 +11:00
Rob H
15c0350c29 Add product name as proxy for variant_unit_text to Order Managment API 2014-01-17 12:09:31 +08:00
Will Marshall
f5777bc7a1 Making our form on_demand and count_on_hand aware 2014-01-17 15:07:43 +11:00
Will Marshall
ef00927885 Adding a nice little JSON/controller test 2014-01-17 14:48:38 +11:00
Will Marshall
b6590000a4 Improving Product's has_stock, filtering Shop#products to in_stock products 2014-01-17 14:41:15 +11:00
Rob H
cfbf4d5bc4 Adding attributes to Order Managment API 2014-01-17 10:35:40 +08:00
Will Marshall
6f5ff0ab2c Making a light grey option 2014-01-16 16:49:50 +11:00
Will Marshall
939b216c12 Changing text to N/A 2014-01-16 16:31:46 +11:00
Will Marshall
dac287f67a Removing distributors and farmers, curse them 2014-01-16 16:28:10 +11:00
Will Marshall
b6d796e3bc Getting in ze test for previous commit 2014-01-16 16:25:41 +11:00
Rob H
4e9ae7549e Add sub menu to Orders menu item in admin view, add 'Bulk Order Management' page 2014-01-16 13:20:07 +08:00
Rob H
031414a41f Make BPE menu tab selected 2014-01-16 13:18:28 +08:00
Will Marshall
d68551c6eb Patching an issue with quantity fields showing for products with variants 2014-01-16 16:09:03 +11:00
Will Marshall
cbce5958e0 Removing an attr_accessible which breaks EVERYTHING 2014-01-16 15:47:38 +11:00
Will Marshall
0ddef9626e First working image upload for enterprise logos 2014-01-16 15:47:38 +11:00
Rob H
11499178cb Set up API for Bulk Order Management (BOM) 2014-01-16 11:56:11 +08:00
Rohan Mitchell
d861495d7d Fix incomplete save when first setting variant_unit 2014-01-16 14:20:26 +11:00
Rohan Mitchell
1ebfea9c76 Require uglifier, should fix asset precompilation 2014-01-16 14:16:45 +11:00
Will Marshall
cdd64d438a Adding another trivial sort to a test 2014-01-16 13:23:57 +11:00
Will Marshall
1a1057b824 Removing unhelpful gem 2014-01-16 13:04:44 +11:00
Will Marshall
35cc113aca Fixing the checkout spec to conform to reply_to instead of from on mailer 2014-01-16 13:04:26 +11:00
Rohan Mitchell
7d224fb5ac Update js compressor for staging as well as production 2014-01-16 12:06:00 +11:00
Rohan Mitchell
38a20e4a8c Turn off name mangling to make DI more natural in angular - https://shellycloud.com/blog/2013/10/how-to-integrate-angularjs-with-rails-4 2014-01-16 12:05:43 +11:00
Will Marshall
26a8daed0e Patching up the order mailer to set reply_to 2014-01-16 11:39:10 +11:00
Will Marshall
d4d2482927 Adding ng-min 2014-01-16 11:24:53 +11:00
Rob H
ce5b24a777 Prevent duplicate filters being added 2014-01-15 15:50:41 +08:00
Rob H
8146301b2f Add validation to BPE advanced filter box 2014-01-15 14:35:46 +08:00
Rohan Mitchell
29235cd2cb Merge branch 'master' into product-amount-units 
Conflicts:
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	spec/spec_helper.rb
 2014-01-14 15:34:05 +11:00
Rohan Mitchell
7bbf2037e8 Add commented out option for remote debugging via poltergeist 2014-01-14 15:15:09 +11:00
Rohan Mitchell
68e5de0290 Update acceptance specs to expect unit values to be stored in base units 2014-01-14 15:14:54 +11:00
Rohan Mitchell
d0d0fc1a06 Fix intermittently failing spec - comparison of slightly differing dates 2014-01-14 11:47:56 +11:00
Rohan Mitchell
a30e46d747 Do not delete variant options_text when saving/refreshing products 2014-01-14 11:40:58 +11:00
Rohan Mitchell
9442b7b5dc On save, scale from chosen unit to base unit (eg. mL to L) 2014-01-14 11:13:19 +11:00
Rohan Mitchell
c43b56f3f8 On load, scale from base unit to chosen unit (eg. g to kg) 2014-01-14 10:16:21 +11:00