28 Commits

Author SHA1 Message Date
Devin Smith
aa909bebf4 more query fixes 2015-03-03 14:32:16 -08:00
Devin Smith
a4fa1b40ce more query fixes 2015-03-03 14:17:57 -08:00
Devin Smith
6dfa4b7134 lots of bool changes 2015-03-02 12:00:12 -08:00
Devin Smith
71f52616d8 fixed quote issue 2015-03-02 10:24:09 -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
Devin Smith
c23e2a5f4a fixes #4425 2015-01-09 12:00:19 -08:00
Daniel Camargo
254351ddb1 fixed #4162 2014-12-19 17:05:30 -02:00
Daniel Camargo
13b5a50637 partial #4329 2014-12-16 19:37:03 -02:00
Daniel Camargo
e384b97b0e partial #3427 - need to review 2014-07-17 18:06:37 -03:00
arzynik
802d4e42cb partial #3125 2014-05-13 11:10:20 -07: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
f5b1040fdb partial #2242 - separate user and payment type table 2013-12-17 14:50:20 -02:00
arzynik
40411638e9 hide errors 2013-11-30 14:10:17 -08:00
Daniel Camargo
bcd67a3e5f partial #2055 2013-11-12 17:21:18 -02:00
Daniel Camargo
f438557e7c partial #1055 - let users who registered with email or facebook also log in with their phone number and be able to reset password with their phone number 2013-04-17 14:14:34 -03:00
Daniel Camargo
911a8cbef8 Issue #775 2013-02-28 13:37:30 -03:00
pererinha
cd0a3eb09b partial #13 2013-02-08 12:30:09 -02:00
Daniel Camargo
7bce4d3a13 partial #13
Changing the email subject
2013-02-07 16:43:04 -02:00
Daniel Camargo
c3afebad20 partial #13 send email and sms 2013-02-07 10:37:45 -02:00
Daniel Camargo
5a0179e8a1 partial #13
Fixed the Auth model.
2013-02-06 17:21:23 -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
Daniel Camargo
0704be0911 partial #13 2013-02-06 16:29:40 -02:00
Daniel Camargo
1e4adcb494 partial #13 2013-02-05 17:02:36 -02:00
Daniel Camargo
80c720fe38 partial #13 2013-02-04 18:04:01 -02:00
Daniel Camargo
fe18dc7aef partial #13 2013-02-02 19:18:25 -02:00
arzynik
69bd3d91d1 initial 2012-06-20 21:39:23 -07:00