Devin Smith
|
eba47fc262
|
more null division fixes
|
2015-03-24 10:18:20 -07:00 |
|
Devin Smith
|
59e0b5e115
|
fixed a 0 division issue
|
2015-03-23 12:55:01 -07:00 |
|
Pererinha
|
d4901a02ba
|
Edit New issue customer referral changes - mvp #4859
|
2015-03-18 14:45:30 -03:00 |
|
Pererinha
|
9c72b8008f
|
Merge branch 'Points_redemption_system_4248' into Reward_4881
Conflicts:
include/controllers/default/cockpit2/api/test/index.php
include/controllers/default/crunchbutton/api/test/index.php
include/library/Crunchbutton/Order.php
include/views/default/crunchbutton/frontend/order.phtml
include/views/default/crunchbutton/frontend/orders.phtml
include/views/default/crunchbutton/frontend/restaurant.phtml
include/views/default/seven/frontend/order.phtml
include/views/default/seven/frontend/restaurant.phtml
www/assets/scss/seven.scss
|
2015-03-18 11:43:02 -03:00 |
|
Devin Smith
|
bc73d7af40
|
query fix
|
2015-03-03 14:34:57 -08:00 |
|
Devin Smith
|
711aa894a3
|
more pdo stuff
|
2015-03-02 10:17:52 -08:00 |
|
Devin Smith
|
4ffd94658b
|
some postgres required changes
|
2015-02-28 00:42:18 -08:00 |
|
Devin Smith
|
35b0f32e83
|
WARNING: THIS MIGHT BREAK EVERYTHING
Upgraded all db stuff to PDO
fixes #2195
|
2015-02-27 17:46:24 -08:00 |
|
Pererinha
|
d50c7a95ce
|
Merge branch 'master' into Points_redemption_system_4248
Conflicts:
include/controllers/default/cockpit2/api/test/index.php
include/views/default/crunchbutton/frontend/order.phtml
include/views/default/seven/frontend/orders.phtml
www/assets/scss/seven.scss
|
2015-02-17 19:29:50 -02:00 |
|
Pererinha
|
dfeed011a0
|
Merge branch 'master' into PexCardAPI_4270
Conflicts:
include/controllers/default/cockpit2/api/test/index.php
include/views/default/crunchbutton/frontend/order.phtml
|
2015-02-09 12:12:26 -02:00 |
|
Pererinha
|
17c0a15611
|
Point redemption system improvements for customer-customer referrals #4248
|
2015-02-05 19:33:55 -02:00 |
|
Pererinha
|
9a9b408fce
|
Merge branch 'master' into Points_redemption_system_4248
|
2015-02-04 21:03:56 -02:00 |
|
Devin Smith
|
f27fb00fe2
|
even more fb tests
|
2015-02-04 14:18:28 -08:00 |
|
Devin Smith
|
e686a64e31
|
more fb tests
|
2015-02-04 14:16:17 -08:00 |
|
Pererinha
|
e3c0ac4ac8
|
partial #4248
|
2015-02-02 14:31:14 -02:00 |
|
Daniel Camargo
|
d5350c3316
|
partial #4202
|
2014-12-02 20:11:09 -02:00 |
|
Devin Smith
|
576a52412d
|
ssl images
|
2014-11-25 10:58:16 -08:00 |
|
Devin Smith
|
3a24dd22a6
|
added query library. added user images
|
2014-11-25 10:37:33 -08:00 |
|
Devin Smith
|
6204686213
|
#4160
|
2014-11-22 11:44:25 -08:00 |
|
Devin Smith
|
2f78360bb3
|
added customers and customer page
|
2014-11-20 15:47:17 -08:00 |
|
arzynik
|
257c0ffb42
|
changed invite code stuff
fixes #4090
|
2014-11-11 13:58:07 -08:00 |
|
Daniel Camargo
|
05a94cb062
|
test rewards system #3586
|
2014-08-12 15:55:09 -03:00 |
|
Daniel Camargo
|
568056ff15
|
partial: rewards: two way gift cards #2561
|
2014-07-23 14:34:38 -03:00 |
|
Daniel Camargo
|
8ed3fd3090
|
if is a new user, dont show change info button #2867
|
2014-04-07 11:45:32 -03:00 |
|
Daniel Camargo
|
f5b1040fdb
|
partial #2242 - separate user and payment type table
|
2013-12-17 14:50:20 -02:00 |
|
Daniel Camargo
|
8cbd2a0814
|
partial #2102 - copy notes from previous orders
|
2013-12-09 15:13:48 -02:00 |
|
Daniel Camargo
|
4d1aa65da2
|
partial #2095 - when a users credit balance is over the order total, dont force CARD
|
2013-12-06 14:06:13 -02:00 |
|
arzynik
|
11c429fe8f
|
partial #1944
|
2013-12-02 14:16:47 -08:00 |
|
arzynik
|
5ad3f7a4c4
|
fixes #2165. fixes #1839. partial #2106.
|
2013-12-01 13:03:44 -08:00 |
|
arzynik
|
0e46ac6dab
|
partial #859
|
2013-11-30 22:34:24 -08:00 |
|
arzynik
|
b6949f0717
|
added ability to grab a users image, and got a count of how many there are with images available
|
2013-11-27 15:09:15 -08:00 |
|
arzynik
|
e20c83647f
|
fixes #2073
|
2013-11-15 18:51:53 -08:00 |
|
arzynik
|
5eb1eb0d86
|
added better debug testing sstem
|
2013-10-08 09:08:18 -07:00 |
|
Daniel Camargo
|
c847f422c5
|
partial #1860
|
2013-10-02 10:49:29 -03:00 |
|
Daniel Camargo
|
eabafea03b
|
Partial #1676
|
2013-09-04 12:50:59 -03:00 |
|
Daniel Camargo
|
dd60059b89
|
viral invite feature
|
2013-08-27 16:19:12 -03:00 |
|
arzynik
|
4975f923b1
|
updated how all of the facebook authentication works
|
2013-08-16 00:03:11 -07:00 |
|
arzynik
|
a9adc20a25
|
moved some config stuff around
|
2013-08-02 16:34:15 -07:00 |
|
Daniel Camargo
|
44258a7aac
|
partial #1284
|
2013-05-15 17:13:07 -03:00 |
|
Daniel Camargo
|
ff98a8bce2
|
partial #956
|
2013-04-01 17:27:28 -03:00 |
|
arzynik
|
622eb548aa
|
fixed issue with getting fb emails
|
2013-04-01 13:30:40 -04:00 |
|
arzynik
|
af26a5d6cc
|
fixed some tracking issues
|
2013-04-01 13:23:44 -04:00 |
|
Daniel Camargo
|
6af4487f1f
|
partial #874
|
2013-03-28 16:26:05 -03:00 |
|
Daniel Camargo
|
0a78aef7b9
|
partial #529
|
2013-03-18 10:10:12 -03:00 |
|
Daniel Camargo
|
69a785c6e1
|
partial #529 (tip field changes)
I'll test it on beta
|
2013-03-15 15:11:33 -03:00 |
|
Daniel Camargo
|
b953b786b8
|
partial #613
|
2013-03-13 08:00:36 -03:00 |
|
arzynik
|
e894d5f40d
|
updated orders page for tempalte use
|
2013-02-22 13:34:58 -08:00 |
|
arzynik
|
48eaefba62
|
fixed order of returned users for texthacker api.
|
2013-02-20 09:45:06 -08:00 |
|
arzynik
|
09f300f7ea
|
added method to get details based on phone
|
2013-02-20 09:40:11 -08:00 |
|
pererinha
|
cd0a3eb09b
|
partial #13
|
2013-02-08 12:30:09 -02:00 |
|