Commit Graph

93 Commits

Author SHA1 Message Date
Senad Uka
924a675fa1 main css conflict 2015-11-29 10:02:57 +01:00
Senad Uka
8d5067a567 fixed limit for number of items in group 2015-11-26 10:57:25 +01:00
Senad Uka
b93660b264 added decoration support 2015-11-24 10:29:46 +01:00
harleyribic
f8915dd2d6 testiram 2015-11-11 19:46:23 +01:00
Senad Uka
c4b64a8839 Merge branch 'master' into develop 2015-11-07 08:10:44 +01:00
Senad Uka
11b3669270 multiple cities supported / delivery costs shown only when place is selected 2015-11-07 07:41:08 +01:00
Senad Uka
d34c0c280c parametrized access 2015-10-31 08:24:44 +01:00
Senad Uka
3c5be78146 search problem 2015-10-11 06:37:17 +02:00
Senad Uka
c75b112027 changed about you, changed price settings 2015-10-01 15:48:32 +02:00
Senad Uka
014416ca51 trello integration finished 2015-09-26 11:58:01 +02:00
Senad Uka
56f9c7b72b suggested articles / email is now sent 2015-09-21 06:31:52 +02:00
Senad Uka
2ff5ceabd2 added email notification when order arives 2015-08-09 10:58:14 +02:00
Senad Uka
68b25bf491 added migrations for instant delivery 2015-07-26 19:10:16 +02:00
Senad Uka
96a2fba535 fixed conflicts 2015-07-05 13:24:09 +02:00
Senad Uka
f5664dee88 delivery costs are now shown 2015-07-05 13:22:47 +02:00
Edin Dazdarevic
18d54ffea3 configuring the production build 2015-06-21 15:01:49 +02:00
Senad Uka
52a03f3334 cart page bearable on mobile 2015-06-21 12:24:18 +02:00
Senad Uka
afe0325f00 fixed bugs on menuitem etags 2015-06-20 05:08:22 +02:00
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