raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,848 Commits 18 Branches 452 Tags
4fd1a3d77c4fbf4e41e4b50de5dfe3b3febdb85b
Commit Graph

1373 Commits

Author SHA1 Message Date
Will Marshall
7a062b0310 Reworking the variant display of units and names 2014-06-12 16:13:51 +10:00
Rob H
9f681bd1ef Use display_as as option value for variant when it is present 2014-06-12 12:57:56 +10:00
Rob H
721aeea130 OptionValueNamer spec refactor 2014-06-12 12:57:20 +10:00
Rob H
1a91b5a728 Move option value naming logic into separate lib class 2014-06-12 12:55:53 +10:00
Rob H
c2109026ca Add js spec for option value namer 2014-06-12 11:49:55 +10:00
Rohan Mitchell
71020a14ef Fix payments coming up as $0, credit card charges failing for the same reason 2014-06-12 11:49:54 +10:00
Rob H
d9a5b02415 Move dynamic placeholder logic to directive so that it can be used for master variants too 2014-06-12 11:49:54 +10:00
Rohan Mitchell
908f7871bb Orders and fulfilment report handles order cycles with nil opening or closing times 2014-06-12 11:49:54 +10:00
Rob H
f688461e84 Add fields for variant display name and display as to bpe 2014-06-12 11:49:53 +10:00
Rob H
2c78d537fa Use display_as as option value for variant when it is present 2014-06-12 11:49:52 +10:00
Rob H
227c10288d OptionValueNamer spec refactor 2014-06-12 11:49:52 +10:00
Rob H
e9f2a8f2cd Move option value naming logic into separate lib class 2014-06-12 11:49:52 +10:00
Rob H
c21342b82e Adding all fields to new admin product spec 2014-06-12 11:49:51 +10:00
Will Marshall
94b7601d73 Patching authorization tests 2014-06-10 14:01:25 +10:00
Will Marshall
4d7fa8b1bf Removing payments when emptying order 2014-06-10 11:15:04 +10:00
Will Marshall
dbf4f503a9 Restoring my clever flash refactoring 2014-06-10 11:14:52 +10:00
Rohan Mitchell
f068cb3cd7 Show shipping method via angular only (don't show spree's adjustment) 2014-06-06 17:05:50 +10:00
Rohan Mitchell
be644bdcc3 Revert "Reworking flash messages hooray" 
This reverts commit c9d0091cd9.
 2014-06-06 16:59:47 +10:00
Will Marshall
c9d0091cd9 Reworking flash messages hooray 2014-06-06 16:41:28 +10:00
Will Marshall
37f197205f Removing shipping method from order when emptied 2014-06-06 16:39:53 +10:00
Will Marshall
82ab14a33e Starting on on the map 2014-06-06 14:04:45 +10:00
Rohan Mitchell
634af96a66 Update reports controller spec for multi-order-cycle params 2014-06-06 09:47:16 +10:00
Rohan Mitchell
1d44cbf506 Show distribution charge on report 2014-06-06 09:47:16 +10:00
Rohan Mitchell
f8fa014796 LineItem.supplied_by_any 2014-06-06 09:47:15 +10:00
Rohan Mitchell
05c62634fc Further overlapping elements fixes 2014-06-05 14:49:41 +10:00
Rohan Mitchell
2bedc431e8 Fix spec fragility - overlapping elements error 2014-06-05 13:43:41 +10:00
Rohan Mitchell
566afc0b75 Merge branch 'laura_and_will' 2014-06-05 11:42:02 +10:00
Rohan Mitchell
f28d9f9d9b Fix distributor logo spec - Add a logo 2014-06-05 11:38:27 +10:00
Rohan Mitchell
4a7609a835 Basic styling for checkout credit card form 2014-06-05 11:17:53 +10:00
Will Marshall
69e5459afd Finishing off the merge with localStorage refactoring with sekrets 2014-06-04 17:22:10 +10:00
Will Marshall
df7ee03cbf Adding presenters to the social media fields 2014-06-04 17:13:18 +10:00
Will Marshall
a6a4d28072 Fixing up bugs in the Checkout form 2014-06-04 17:13:18 +10:00
Will Marshall
59c433881e Making the auto-closing more granular on checkout 2014-06-04 17:12:16 +10:00
Rohan Mitchell
fc3402bbd0 Determine whether to send card field attributes by payment method type 2014-06-04 16:55:27 +10:00
Rohan Mitchell
6a8def3d76 Do not send attributes for card fields when no card is supplied 2014-06-04 16:30:57 +10:00
Rohan Mitchell
37c780ed70 WIP: Send credit card details to server on checkout 2014-06-04 16:20:48 +10:00
Rohan Mitchell
d52c1fa5da Revert "Do not show deleted products in order cycle admin" 
This reverts commit 4e45a682fd.
 2014-06-03 12:18:27 +10:00
Rohan Mitchell
d4f65a63bb Remove spec for removed image 2014-06-03 11:31:30 +10:00
Rohan Mitchell
4e45a682fd Do not show deleted products in order cycle admin 2014-06-03 11:29:54 +10:00
Rob H
bcfa1a8266 Fix spec to check validation of missing primary_taxon correctly 2014-05-30 20:06:40 +10:00
Rob H
2a8ef182f2 Merge remote-tracking branch 'origin/master' into new-product-form 2014-05-30 16:38:50 +10:00
Rob H
1d5cc5dced Adding specs for new product creation 2014-05-30 16:38:29 +10:00
Rob H
66a47f053c Amend products controller spec to include requirement for primary_taxon_id 2014-05-30 16:21:04 +10:00
Rob H
66d6de9dfc Merge master (with primary taxons restored) 2014-05-30 15:45:48 +10:00
Rohan Mitchell
15d8299efb Fix enterprises spec - primary taxons change 2014-05-30 15:28:53 +10:00
Rob H
69376e7f4b Merge in master 2014-05-30 15:10:13 +10:00
Will Marshall
be640fd856 Patching a spec and naming something 2014-05-30 15:02:47 +10:00
Will Marshall
a7340df6a5 Removing some dud test content 2014-05-30 14:45:27 +10:00
Will Marshall
b736145552 Adding primary taxon to admin forms 
Conflicts:
	db/migrate/20140522044009_add_primary_taxon_to_products.rb
	spec/features/admin/products_spec.rb
 2014-05-30 14:31:27 +10:00
Will Marshall
1c31ac56ea Adding primary taxon field to product 
Conflicts:
	db/migrate/20140522044009_add_primary_taxon_to_products.rb
 2014-05-30 14:31:03 +10:00