Commit Graph

75 Commits

Author SHA1 Message Date
Senad Uka
baf1617053 added etags on prepare_for_display items and menuitems 2015-06-20 05:06:32 +02:00
Senad Uka
393ec79a40 fixed bug in commission calculation 2015-06-14 07:14:00 +02:00
Senad Uka
4dfc2ffbd1 our commission is now shown on cart page 2015-06-14 07:11:46 +02:00
Senad Uka
771a71b42f fiddled around with css / numbers on two decimals now on product list 2015-06-06 21:50:41 +02:00
Edin Dazdarevic
99492f137f link banner centering 2015-06-02 13:41:58 +02:00
Edin Dazdarevic
b5fdc6d173 cart now functional without bugs (at least the ones we know about)
fixed a small issue with ItemGroup REST call
2015-05-27 13:58:44 +02:00
Edin Dazdarevic
e1be044fd9 - removed our copy jquery & bootstrap. using cdn instead
- added search box to the header
- made reindex rake task
2015-05-25 20:49:52 +02:00
Senad Uka
49dd10acbc almost finished new design on product page / reproduced bug with amount not updating 2015-05-13 16:32:53 +02:00
Senad Uka
fe452d359f added orders to confirm report / phone allows more digits now / added reports to rails admin navigation 2015-05-11 11:35:24 +02:00
Senad Uka
c9949c444a item groups now have order - start page is now item group 1 (configurable in globals) 2015-04-21 06:39:30 +02:00
Senad Uka
269ad19e4f it's not fluid anymore - and shadows are not that strong 2015-04-16 21:19:33 +02:00
Edin Dazdarevic
19cdca76b1 added menu sub sub items (horrible name i know) 2015-04-15 00:10:37 +02:00
Edin Dazdarevic
96420fc547 Merge branch 'master' of https://github.com/senaduka/ribica 2015-04-13 01:05:40 +02:00
Edin Dazdarevic
9865cb5f0a trimming whitespace on import, fixed issue with units_in_pack column being too small 2015-04-13 01:05:22 +02:00
Senad Uka
ea2837bd00 items are now done and pictures resize on serverside automagically 2015-04-12 11:11:26 +02:00
Senad Uka
6da4e6c9fd created a very ugly report 2015-04-08 07:35:00 +02:00
Edin Dazdarevic
5464ec5770 added ribica rake task (item import, copying sections to menu etc.) 2015-04-07 00:29:14 +02:00
Edin Dazdarevic
7c1eb2f4fd - browsing by subcategory 2015-03-29 23:23:21 +02:00
Senad Uka
b3fc46633c Merge branch 'master' of github.com:senaduka/ribica 2015-03-29 12:47:08 +02:00
Senad Uka
7acf1a8d6c banners are show now ! 2015-03-29 12:46:51 +02:00
Edin Dazdarevic
71fbde93de added brands 2015-03-28 14:38:15 +01:00
Senad Uka
d8668115ed fixed bugs with address in incognito and NaN in delivery costs and total 2015-03-25 06:12:38 +01:00
Edin Dazdarevic
5bc77597a4 menu -> submenu backend 2015-03-24 06:18:27 +01:00
Senad Uka
b534d15866 groups of articles now shown on ribica.ba/group/1/, background is in cloudinary 2015-03-23 07:21:53 +01:00
Edin Dazdarevic
e23bfe0a7f Merge branch 'master' of https://github.com/senaduka/ribica 2015-03-22 16:17:05 +01:00
Edin Dazdarevic
9154d216a2 basic version of search implemented 2015-03-22 16:16:52 +01:00
Senad Uka
bbedb4a877 created item groups and link banners and their associations and fixed bugs with join tables 2015-03-22 06:17:05 +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
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
70635ebd1e added 'order' fields to sections, categories and sub_categories. - moved backoffice migrations to front-api 2015-03-19 00:10:24 +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
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
e12c2b01d0 application no longer thanks people for ordering nothing 2015-03-09 07:09:34 +01:00
Senad Uka
c682063d4f thank you page is now accessed 2015-03-05 05:29:19 +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
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