raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 21 Branches 450 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

34725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob H
9737f21bb8 WIP: Write body of group buy report 2012-10-10 13:46:51 +11:00
Rohan Mitchell
2535e3965b When merging orders, set distributor when target order distributor is nil 0.2.0 2012-10-09 08:42:29 +11:00
Rohan Mitchell
568d948cbe Destroy incomplete orders if they can't be merged, prevents that order unexpectedly appearing in cart after checkout. Also ensure all orders have a shipping method. 2012-10-05 12:09:53 +10:00
Rob H
d7a5a87aef create group buy report, display header 2012-10-03 11:49:21 +10:00
Rob H
3b8c41840f Merge branch 'master' of github.com:andrewspinks/openfoodweb 
Conflicts:
	app/models/spree/line_item_decorator.rb
	db/migrate/20120919013335_add_shipping_method_to_line_items.rb
 2012-10-03 10:27:19 +10:00
Rohan Mitchell
6d9257d941 Do not delete shipping method referenced by a line item 2012-10-02 12:15:09 +10:00
Rohan Mitchell
7430fc9bdd Do not delete shipping method referenced by a product distribution 2012-10-02 11:58:18 +10:00
Rohan Mitchell
473b4e9adc Add positive case test 2012-10-02 11:54:18 +10:00
Rohan Mitchell
2aa450b072 Do not delete shipping method referenced by an order 2012-10-02 11:51:13 +10:00
Rohan Mitchell
3886ec39f7 Add web helper method to visit paths with delete method 2012-10-02 11:47:55 +10:00
Rohan Mitchell
afb8faa96f Update zeus config 2012-10-02 11:44:50 +10:00
Rohan Mitchell
27b7d59f46 BaseController does not attempt to merge incomplete and current orders when they have differing distributors 2012-10-02 09:44:51 +10:00
Rohan Mitchell
bc408d8b6e Add jquery and jquery_ujs includes to admin/all.js, as these have been removed from spree/admin/spree_core.js 2012-09-22 09:20:27 +10:00
Rohan Mitchell
a8758f1271 Fix OrdersHelper for upgraded spree 2012-09-21 16:36:50 +10:00
Rohan Mitchell
2bce9df25a Track 1-1-stable on spree git, fixes order quantity change bug 2012-09-21 15:55:51 +10:00
Rohan Mitchell
479c49752c Update spree_paypal_express, hopefully fixing 'Validation failed: State can't be blank' error 2012-09-21 15:32:19 +10:00
Rohan Mitchell
62d6067c1a Do not truncate cents for product price update on add to cart JS 2012-09-21 12:44:38 +10:00
Rohan Mitchell
a1b5102476 Fix checkout totals, also amend factories for valid test shipping method data 2012-09-21 12:35:01 +10:00
Rohan Mitchell
593f3887c8 Switch pry for pry-debugger 2012-09-21 12:29:06 +10:00
Rohan Mitchell
757456dd57 Set line item shipping method in callback so that Order#update shipping calcs run correctly 2012-09-20 10:45:50 +10:00
Rohan Mitchell
3894ce946d Fix error on supplier page, add test to cover 2012-09-19 15:46:56 +10:00
Rohan Mitchell
f1f9b5b2e8 Make order and distributor report resilient to orders without distributors 2012-09-19 15:19:30 +10:00
Rohan Mitchell
5402590d5f Add debug output on line item migration for lost data 2012-09-19 15:08:05 +10:00
Rohan Mitchell
eaca160367 Set line item shipping method when added to cart, update specs for changes to line item shipping method 2012-09-19 15:01:50 +10:00
Rohan Mitchell
85f18cfb12 Rob: Replace LineItem shipping_method method with relation 2012-09-19 14:27:28 +10:00
Rob H
fe3743af16 Replace shipping method lookup with relation 2012-09-19 12:06:43 +10:00
Rohan Mitchell
7492522066 Improve clarity of various totals (items, shipping, grand total) on checkout page 2012-09-14 15:35:22 +10:00
Rohan Mitchell
334f84637d Fix empty cart button alignment at checkout 2012-09-14 13:32:49 +10:00
Rohan Mitchell
3f15fc0b52 Set default admin orders view to sort with most recent orders first 2012-09-14 13:27:33 +10:00
Rohan Mitchell
a013854d2d Change logo to Eaterprises, update link colour to match 2012-09-14 11:25:36 +10:00
Rohan Mitchell
c883ab87b6 Add db backups and uploaded images to gitignore 2012-09-14 10:32:10 +10:00
Rohan Mitchell
0e313e5826 Add Zeus config 2012-09-14 10:23:22 +10:00
Rohan Mitchell
3794c00856 Upgrade Rails to 3.2.8 and Spree to 1.1.3 2012-09-14 10:20:52 +10:00
Rohan Mitchell
b87c59c051 Default to blank distributor on add to cart to require user to select one 2012-09-13 15:29:04 +10:00
Rohan Mitchell
356ae40c7b Display product descriptions as HTML in checkout 0.1.4 2012-09-13 13:05:12 +10:00
Rohan Mitchell
8394c47064 Add admin js includes 2012-09-13 12:27:20 +10:00
Rohan Mitchell
a84f6f08eb Compile all admin javascripts, fixes admin/images/new.js not found error 2012-09-13 12:20:35 +10:00
Rohan Mitchell
3a391d1e76 Give undefined payment method tolerance to orders and distributors report v0.1.3 2012-08-08 15:30:25 +10:00
Rohan Mitchell
9dd94eaf57 Weight shipping calculator treats variants without weight defined as zero weight 2012-08-08 15:29:47 +10:00
Rohan Mitchell
9f013f0e37 When loading distributors for sidebar, only show those that have active products on hand v0.1.2 2012-08-04 17:51:08 +10:00
Rohan Mitchell
f0ec3080e4 Remove instrumentation 2012-08-04 17:50:30 +10:00
Rohan Mitchell
245de4fe1a Add instrumentation to debug products not appearing on distributor view 2012-08-04 16:52:18 +10:00
Rohan Mitchell
9d33ef460c Max quantity field doesn't affect JS price calcs on products without variants 2012-08-04 16:51:43 +10:00
Rohan Mitchell
e0b8b8b4d4 Force precompile admin css and js 2012-08-04 10:27:15 +10:00
Rohan Mitchell
529de72f75 Force precompilation of store/all.css and store/all.js 2012-08-04 10:23:00 +10:00
Rohan Mitchell
b4f867924b Do not connect to db during asset precompile, fix heroku deploy to cedar 2012-08-04 10:12:06 +10:00
Rohan Mitchell
9d3afe80c6 split_products_by_distributor was not written with pre-pagination by searcher in mind, resulting in silently dropped products. Disable pagination at searcher. v0.1.1 2012-08-03 18:47:33 +10:00
Rohan Mitchell
28e75d6467 Fix add to cart JS for compatibility with group buy 2012-08-03 18:32:19 +10:00
Rohan Mitchell
b0fa05df0c Remove assets from git 2012-08-03 18:31:28 +10:00
Rohan Mitchell
f3ffba378a Add a product with variants to the cart with max quantity for a group buy 2012-08-03 18:05:45 +10:00