Commit Graph

138 Commits

Author SHA1 Message Date
Edin Dazdarevic
9154d216a2 basic version of search implemented 2015-03-22 16:16:52 +01:00
Senad Uka
38548e3e33 removed special offer id from items 2015-03-21 06:30:18 +01:00
Edin Dazdarevic
88c53a8512 added elasticsearch gem and index method 2015-03-21 00:00:36 +01:00
Edin Dazdarevic
fb080ed487 registration bug fix and login button style fix 2015-03-20 00:40:03 +01:00
Edin Dazdarevic
76379c4ae5 fixed 'registruj me' button a bit 2015-03-19 22:36:32 +01:00
Edin Dazdarevic
a7e40e579f bunch of fixes, need to refactoring to move state to the store in order to make it more fluxy 2015-03-19 22:29:16 +01:00
Edin Dazdarevic
bc10740780 Merge branch 'master' of https://github.com/senaduka/ribica 2015-03-19 14:27:27 +01:00
Edin Dazdarevic
69f5faffe4 added children to users 2015-03-19 14:27:04 +01:00
Senad Uka
4b019d6b9e logout and login cart state is working now - except a little bug with icon on login 2015-03-19 06:47:41 +01:00
Edin Dazdarevic
1d16951fcf reapplying the fix that was lost by conflict resolution 2015-03-19 01:13:11 +01:00
Edin Dazdarevic
70635ebd1e added 'order' fields to sections, categories and sub_categories. - moved backoffice migrations to front-api 2015-03-19 00:10:24 +01:00
Edin Dazdarevic
a1b9250865 subcategories should not show in the menu 2015-03-18 18:22:21 +01:00
Senad Uka
658fe4931d special offers backoffice is ready now 2015-03-18 06:25:40 +01:00
Senad Uka
3b95500635 cart logic now ties cart with user when cart is created with logged in user 2015-03-15 04:53:04 +01:00
Senad Uka
8815267a79 fixed problem with multiple carts and a whole load of problems with crazy delivery destination logic / if I didn't write it i would have thought it was written by a drug abuser during high 2015-03-14 08:17:06 +01:00
Senad Uka
e7793f0884 added suppliers, weight to item 2015-03-14 06:33:49 +01:00
Senad Uka
0bafbb4b2f fixed bug with not clearing cart notification number when confirming 2015-03-13 08:28:53 +01:00
Senad Uka
b2d4122940 item price is now saved when added to cart 2015-03-13 07:56:11 +01:00
Senad Uka
648dee4636 added delivery costs to total / added ribica logo just for fun / added validation check when confirming delivery 2015-03-13 07:04:44 +01:00
Senad Uka
e3abc09891 added validation for delivery destination 2015-03-11 07:32:05 +01:00
Senad Uka
549424b903 reshuffled towns in address selection - so bigger ones are at the top 2015-03-09 07:39:10 +01:00
Senad Uka
f4e258cb82 redesigned + and - to be clear 2015-03-09 07:38:34 +01:00
Senad Uka
e12c2b01d0 application no longer thanks people for ordering nothing 2015-03-09 07:09:34 +01:00
Edin Dazdarevic
fce49c9f5b Merge branch 'master' of https://github.com/senaduka/ribica 2015-03-05 22:34:53 +01:00
Edin Dazdarevic
6661e50991 bug fix, for validation 2015-03-05 22:34:43 +01:00
Senad Uka
c682063d4f thank you page is now accessed 2015-03-05 05:29:19 +01:00
Senad Uka
41b3f0e555 moved cart to top right 2015-03-05 05:29:19 +01:00
Edin Dazdarevic
b47a90b476 no need to have blank 'errors' property in the states. validation plugin now handles that 2015-03-04 22:55:16 +01:00
Edin Dazdarevic
38de717da9 after successful registration user should be logged in 2015-03-03 22:19:41 +01:00
Edin Dazdarevic
9ebb4769af Merge branch 'master' of https://github.com/senaduka/ribica 2015-03-03 19:11:54 +01:00
Edin Dazdarevic
028bf79617 login & registration now functional 2015-03-03 19:11:38 +01:00
Senad Uka
0f47367cd0 confirming works, last address is now persisted, thank you page is up but not yet accessible 2015-03-03 07:26:38 +01:00
Edin Dazdarevic
4befef5bf4 login progress 2015-03-02 07:49:36 +01:00
Edin Dazdarevic
7c28876fed login page layout 2015-03-01 16:43:28 +01:00
Edin Dazdarevic
db4d256337 registration progress 2015-03-01 16:06:11 +01:00
Senad Uka
2b1d0fbbc1 address saving now works - masallah, la hawle we la kuwette ila billah :) 2015-02-27 07:33:17 +01:00
Senad Uka
1ca7d4509a address saving almost works 2015-02-26 17:59:30 +01:00
Edin Dazdarevic
6e327c758f validation mixin small fixes 2015-02-26 07:28:27 +01:00
Edin Dazdarevic
42f2343cec fixed problem when visiting urls with dynamic segments 2015-02-23 21:53:53 +01:00
Edin Dazdarevic
e1d1804be9 Merge branch 'master' of https://github.com/senaduka/ribica 2015-02-23 21:30:25 +01:00
Edin Dazdarevic
e1bba9d8db basic version of ValidationMixin, register page getting more functional 2015-02-23 21:30:06 +01:00
Senad Uka
ee2a0401d0 had a problem / used a list of postal codes from internet / now I have two problems 2015-02-23 07:08:23 +01:00
Senad Uka
035d07d540 changed all images to https to check if everything works 2015-02-22 13:40:22 +01:00
Senad Uka
3af52737d4 fixed grunt dev so pushstate routes now work ( 404 -> index.html) 2015-02-22 13:28:21 +01:00
Senad Uka
2b6d93a437 added some models, started creating delivery destination state 2015-02-22 07:19:13 +01:00
Edin Dazdarevic
9c152e8adb Merge branch 'master' of https://github.com/senaduka/ribica 2015-02-21 14:00:50 +01:00
Edin Dazdarevic
9860c50ffc ui for register page 2015-02-21 14:00:43 +01:00
Senad Uka
53fc9f0b99 created delivery destination model 2015-02-20 07:34:55 +01:00
Edin Dazdarevic
47017b6830 Merge branch 'master' of https://github.com/senaduka/ribica 2015-02-20 06:55:28 +01:00
Edin Dazdarevic
8f904099cf added user model 2015-02-20 06:55:18 +01:00