657 Commits

Author SHA1 Message Date
arzynik
adde06ee5b a bunch more admin shit 2012-09-18 16:28:15 -04:00
arzynik
b784299377 more admin shit 2012-09-18 14:55:57 -04:00
arzynik
ace00c536c admin restaurant saving shit 2012-09-18 13:59:32 -04:00
arzynik
64b494d70a admin progress 2012-09-18 12:58:15 -04:00
arzynik
1a25d577af fixes #59 2012-09-18 02:10:39 -04:00
arzynik
fd24f5b2ac fixes #59 2012-09-18 02:10:23 -04:00
arzynik
c46b539846 changed repeat options to save monies 2012-09-18 01:26:25 -04:00
arzynik
5c3b84a4a0 fixed payment method css issue 2012-09-18 01:20:42 -04:00
arzynik
3be3ff4c74 made delivery min apply to subtotals if we want 2012-09-18 01:16:01 -04:00
arzynik
ff474326fb Merge branch 'master' of github.com:devin-la/crunchbutton 2012-09-18 01:11:12 -04:00
arzynik
0a5b87e52c added customer 2012-09-18 01:11:04 -04:00
arzynik
4a82b36f98 Merge branch 'master' of github.com:devin-la/crunchbutton 2012-09-17 22:20:36 -04:00
arzynik
0c81b25595 Merge branch 'master' of github.com:devin-la/crunchbutton
Conflicts:
	include/controllers/default/crunchbutton/api/order/index.php
	include/library/Crunchbutton/Order.php
2012-09-17 22:19:04 -04:00
arzynik
7030b69da2 Merge branch 'master' of github.com:devin-la/crunchbutton 2012-09-17 22:17:27 -04:00
arzynik
027ccf6601 order price issues 2012-09-17 22:17:18 -04:00
arzynik
145766ffa3 fixes #254 2012-09-17 22:14:10 -04:00
arzynik
0fcdf0328e more on #231 2012-09-17 21:50:33 -04:00
arzynik
1769c25eeb fixes #231 2012-09-17 21:06:31 -04:00
arzynik
d3ea3ef776 ug 2012-09-17 20:57:27 -04:00
arzynik
2a1651ea42 fixes #231 2012-09-17 20:55:53 -04:00
arzynik
ac44bed315 voice changes for #231 2012-09-17 18:26:52 -04:00
Brad Butler
dfaa0e44b9 sh 2012-09-17 17:48:44 -04:00
arzynik
b16f0554a0 fixes #199 2012-09-14 15:16:33 -07:00
arzynik
b34d3803d0 fixes #232 2012-09-14 15:16:03 -07:00
arzynik
60eb24bdf7 fixes #248 2012-09-14 13:36:23 -07:00
arzynik
2cee03ee01 fixes #203 2012-09-14 13:34:38 -07:00
arzynik
70d1526eed fixes #200 2012-09-14 13:32:33 -07:00
arzynik
5c9c9dd5bf fixed service fee display 2012-09-14 09:37:02 -07:00
arzynik
5d6b0f49ec fixed refunds 2012-09-14 09:35:35 -07:00
arzynik
42437b5260 fixes #234 2012-09-13 22:30:34 -07:00
arzynik
4b6fda5b4a most of #67 2012-09-13 22:26:21 -07:00
arzynik
0e34c4c24f unfinished shit for #67 2012-09-13 19:06:28 -07:00
arzynik
29981385a3 fixed image cache loading issue 2012-09-13 18:35:00 -07:00
arzynik
d8a955f245 fixes #269 2012-09-13 17:15:39 -07:00
arzynik
78d373209d #246 2012-09-13 17:02:06 -07:00
arzynik
b371253156 #228 2012-09-13 16:33:39 -07:00
arzynik
de2ff34855 fixed orm load issue for orders 2012-09-13 16:11:46 -07:00
arzynik
cc2c3d724c another session issue 2012-09-13 15:47:09 -07:00
arzynik
42e07f382e tip typo 2012-09-13 13:29:08 -07:00
arzynik
c8c7ac8f49 added pizza pier image 2012-09-13 13:23:58 -07:00
arzynik
d833b2e398 added bad character paste cleaner 2012-09-13 13:23:25 -07:00
arzynik
e9a57e0978 added live balanced key 2012-09-13 13:23:17 -07:00
arzynik
28692141b9 fixed order 2012-09-11 23:36:51 -04:00
arzynik
5785671682 catch error 2012-09-11 20:25:27 -07:00
arzynik
c44ffb597b fixes #241 2012-09-11 19:33:08 -07:00
arzynik
db1f70d2f6 admin ui teak 2012-09-11 19:32:57 -07:00
arzynik
164e8f85e2 fixed some balanced issues #145 2012-09-11 19:11:16 -07:00
arzynik
909e2329a7 fixes #145 2012-09-11 19:02:13 -07:00
arzynik
630bcc3e44 fixes #251 2012-09-11 14:57:03 -07:00
arzynik
145daf4b81 ui shit for admin dishes 2012-09-11 14:35:29 -07:00