44 Commits

Author SHA1 Message Date
Devin Smith
fb2e002126 fixes #4129 2014-11-18 20:05:10 -08:00
arzynik
e9c4826cbe fixes #3359 2014-06-10 15:50:10 -07:00
arzynik
978d290bc4 warning hide 2014-05-28 12:42:23 -07:00
arzynik
cd49fcea98 better error loc 2014-05-28 12:41:58 -07:00
arzynik
43f0098563 added better error 2014-05-28 12:38:58 -07:00
arzynik
8e47d5b0aa trace info 2014-05-28 12:38:02 -07:00
arzynik
4fd7880706 more trace removal 2014-05-28 12:37:01 -07:00
arzynik
95353a4927 spacing fixes 2014-04-16 12:14:25 -07:00
arzynik
4a4ce5f79b fixed header issue 2014-04-16 11:40:25 -07:00
arzynik
d4e995c8f5 travis changes 2014-04-05 13:59:01 -07:00
arzynik
1f1aed2319 tests 2014-04-05 13:51:07 -07:00
Daniel Camargo
b2b1bf450f #2278 - hours api finished 2014-01-08 13:05:32 -02:00
Daniel Camargo
6265237e15 hours api finished 2014-01-08 10:20:04 -02:00
Daniel Camargo
61a4242732 partial 2014-01-07 16:33:26 -02:00
Daniel Camargo
727a02e9d9 partial #2278 2014-01-07 13:03:34 -02:00
arzynik
e690a5bf1c begin rework on payments 2013-12-23 19:18:14 -08:00
Daniel Camargo
518f302ebb partial #2243 - add the ability to pay using stripe or balanced in the order.php
Updated the Stripe API (php) to the new version (from 1.7.2 to 1.10.1).

Updated the keys (public and secret) of the test env (config.xml). I was afraid to change it from the live one.

I changed the way the user_payment_type was working.
Now the user will be able to have two actives payment types, one for stripe and another for balanced.

When you call the method Crunchbutton_User_Payment_Type::getUserPaymentType() it will return the active payment type for the current processor.

I have also created this method Crunchbutton_User_Payment_Type::processor() returns the current processor type and replaced all the calls from c::config()->processor to this method. That way if we decide to put this data at config’s table we will have to just change this method. Or even is we need to use the processor type that is previously stored that will be easy too.

I created two new files tokenizeCard.stripe.js and tokenizeCard.balanced.js and moved the method App.tokenizeCard to these files
2013-12-18 14:43:22 -02:00
Daniel Camargo
78feccbea2 partial #2243 - update stripe version 2013-12-17 16:03:57 -02:00
Daniel Camargo
5025988bf1 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-11-20 13:13:11 -02:00
Daniel Camargo
38e7d12b38 partial #1382 - specific close times for restaurants (holidays) 2013-11-20 13:10:16 -02:00
arzynik
dc49016383 updated thumbnail creation for new imagemagick params 2013-11-20 00:19:27 -08:00
arzynik
e89657bbd9 hide errors 2013-11-19 12:26:45 -08:00
pererinha
214919a64b partial #1857 - track platform per order for stats 2013-11-14 15:06:59 -02:00
arzynik
aafb9af6ca partial for #2074 2013-11-13 16:21:51 -08:00
arzynik
ad68ae3b67 added base 2013-11-11 08:58:52 -08:00
arzynik
ac154b5a2e updated admin buttons 2013-07-18 10:55:03 -07:00
arzynik
7153ba8be2 added change sets to restaurant table. added admin auth at global auth library. 2013-07-15 09:43:29 -07:00
arzynik
a5bcc0c6d7 added encoder helper for faxes. #1188 2013-07-12 15:37:51 -07:00
Stuardo Rodríguez
53d670567b partial for issue #22
* moved the protected _jsonBoolean() method to the Cana_Table as it's something to be used in different models
* moved the protected _mergeWhere() method to the Cana_Table as it's something to be used in different models
* use the _mergeWhere() to show the inactive dishes in the admin
* use the _mergeWhere() to show the inactive notifications in the admin
2013-02-11 09:15:44 -05:00
Daniel Camargo
677f6ed2f7 partial #13 2013-02-06 16:58:15 -02:00
Daniel Camargo
15521c0071 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
Conflicts:
	www/assets/js/app.js
2013-02-06 16:55:33 -02:00
Stuardo -StR- Rodríguez
7f0e965679 Fixing the issue with the request handler in the Rest controller 2012-12-21 14:13:59 -05:00
arzynik
f0dc8df8a0 fixes #562 2012-11-27 18:18:22 -05:00
arzynik
2004bba952 made major changes to core classes for multiple dbs 2012-10-29 14:23:33 -04:00
arzynik
7039079df9 added sitemap 2012-10-17 13:58:08 -04:00
arzynik
428051ec5b a shitload of location detection and hello page changes. #359 #233 2012-10-02 23:48:04 -07:00
arzynik
c030e72e98 should fix all twilio notification shit 2012-10-01 19:11:08 -04:00
arzynik
02b4054330 zgip, bundle, and base64 optimizations 2012-07-23 13:19:14 -07:00
arzynik
153a588676 lotsss of changes.... 2012-07-18 02:34:49 -07:00
arzynik
93cc3ad705 bunch of stupid shit 2012-07-16 22:32:47 -07:00
arzynik
7f9ef52505 converted to History.js 2012-07-16 21:10:14 -04:00
arzynik
a0f16605bc backend order progress 2012-06-30 01:44:16 -07:00
arzynik
cd2226125b just some shit 2012-06-28 22:56:17 -07:00
arzynik
69bd3d91d1 initial 2012-06-20 21:39:23 -07:00