Commit Graph
447 Commits
Author SHA1 Message Date
Vaidas Lungis 9fffa87a59 Merge branch 'orderbutton-js-load' into develop
Conflicts:
	src/bb-modules/Orderbutton/html_client/mod_orderbutton_js.phtml
2015-02-03 16:12:59 +02:00
Vaidas Lungis e6d13e99df change http protocol to https for external resources
resource loading issues when ssl is used.
2015-02-03 16:12:22 +02:00
Vaidas Lungis af7f09a249 add document ready to orderbutton js 2015-02-03 15:46:57 +02:00
Vaidas Lungis 71bd95fe3a update secure protocol check
issue #246
2015-02-03 09:43:23 +02:00
4Giedrius 6602e57ca6 Escape notification message before saving it to DB 2015-02-02 17:00:45 +02:00
4Giedrius db5073b32b Finish 4.13.7 2015-01-29 13:09:10 +02:00
4Giedrius 199cddba21 If there is promo with same code created already, do not let create new one 2015-01-29 13:08:57 +02:00
Vaidas Lungis d150443e95 Finish tax-improvments at checkout page
issue #244
2015-01-29 11:18:31 +02:00
Vaidas Lungis 6f65771b5b add minus sign before discount price 2015-01-29 10:39:31 +02:00
Vaidas Lungis a11b08c9e4 add tax row at checkout summary 2015-01-29 10:38:57 +02:00
Vaidas Lungis 7b5b94a8d8 add new client api calls: client_is_taxable and invoice_get_tax_rate 2015-01-29 10:00:45 +02:00
4Giedrius ecd84c5796 Footer links fix for huraga theme 2015-01-28 13:22:40 +02:00
Vaidas Lungis cf8eac837f Finish improve-createFromCart 2015-01-28 12:15:55 +02:00
Vaidas Lungis e80128e3aa increase test fixture's group_id values.
old values were mixing with mysql's incremental initial value of table
2015-01-28 12:09:38 +02:00
Vaidas Lungis 6e4246ab5a update checkout page in boxbilling theme
do not show payment gateways if there is enough in client balance
2015-01-28 11:27:11 +02:00
Vaidas Lungis 1211851d3a update logical operator for balance compare. 2015-01-27 17:30:13 +02:00
4Giedrius f2bd35b9ce Profile service test fixed 2015-01-27 17:25:49 +02:00
Vaidas Lungis bcacd31758 update $result array 2015-01-27 16:57:56 +02:00
Vaidas Lungis 88d414360d Do not show payment gateways when client has enough in account balance 2015-01-27 16:53:16 +02:00
Vaidas Lungis 9612b6cd82 cover invoice if client has enought money in balance and activate orders in checkout 2015-01-27 16:40:51 +02:00
Vaidas Lungis 3c82310d35 Client\Api\Client balance_get_total() created
returns client balance amount
2015-01-27 16:29:13 +02:00
4Giedrius 1d70b15b57 Admin notification new message logic moved to service class 2015-01-27 14:43:41 +02:00
Vaidas Lungis f14fe0785b unit test fix related 62ee45c96f 2015-01-27 14:39:26 +02:00
Vaidas Lungis 9eafbfd167 do not activate addon order while master order is not paid 2015-01-27 14:36:53 +02:00
Vaidas Lungis 9c1cab3ffa fix related to 95a435456b
return array with order ids
2015-01-27 14:01:55 +02:00
Vaidas Lungis 9847d83f93 do not set order unpaid_invoice_id if it was covered from client balance 2015-01-27 12:06:55 +02:00
Vaidas Lungis 6daa231085 REVERT do not activate order addon while invoice is not paid
(reverted from commit 47dff4160e)
2015-01-27 11:35:54 +02:00
4Giedrius dd2448f46d Finish 4.13.6 2015-01-27 11:25:08 +02:00
4Giedrius a321d50fdf Finish 4.13.6 2015-01-27 11:25:07 +02:00
4Giedrius 04d9a9f440 Centova Cast service fixes #237 2015-01-27 11:24:48 +02:00
4Giedrius 5789d1b214 Client password fixes 2015-01-27 11:17:03 +02:00
Vaidas Lungis 62ee45c96f prepareInvoice() will return Model_Invoice object instead of invoice id 2015-01-27 11:09:48 +02:00
Vaidas Lungis 16367a2a5c remove redundant cart query 2015-01-27 10:43:30 +02:00
Vaidas Lungis 95a435456b order models are stored in array, not it ids 2015-01-27 10:28:27 +02:00
Vaidas Lungis 47dff4160e do not activate order addon while invoice is not paid 2015-01-27 10:10:34 +02:00
Vaidas Lungis d9061bd3f9 increase test fixture's group_id values.
old values were mixing with mysql's incremental initial value of table
2015-01-26 17:52:12 +02:00
4Giedrius c194376ba0 Added message for client if email confirmation is enabled #231 2015-01-26 14:26:00 +02:00
4Giedrius 4d180c3665 Finish 4.13.5 2015-01-26 13:22:16 +02:00
4Giedrius 61747aa914 Finish 4.13.5 2015-01-26 13:22:16 +02:00
4Giedrius 8449ad3cb2 Client email confirmation link fixed. #231 2015-01-26 13:22:02 +02:00
4Giedrius 5d46326e4d Finish 4.13.4 2015-01-26 11:44:14 +02:00
4Giedrius c3b4ee976a Finish 4.13.4 2015-01-26 11:44:13 +02:00
4Giedrius 745e5a51c8 Passing correct type to convertToBeans() method. Fixes #240 2015-01-26 11:43:58 +02:00
Vaidas Lungis c4e413dcc9 add "generate email templates" action after BB install.
display_errors turned off. When DI tries to start new session and prints notice of already started session. Then JS call does not get 'ok' message and installation's "finish" step is not reached despite successful install.
2015-01-23 16:48:22 +02:00
Vaidas Lungis a1251d7385 D R Y when creating email templates 2015-01-23 14:02:52 +02:00
Vaidas Lungis 48b1195820 fix warnings in interkassa unit tests 2015-01-23 13:51:59 +02:00
Vaidas Lungis 72e07ecfe3 add message to error_log when sending emails in testing application env 2015-01-23 13:34:33 +02:00
4Giedrius 88ec2fe427 Array variables for email template list fixed 2015-01-23 12:47:34 +02:00
4Giedrius 9180cd09ac Allow to edit company VAT and company number fields for client #230 2015-01-23 11:31:35 +02:00
4Giedrius 8dbb38ff73 Custom client fields are 1 to 10, not 0 to 10, fixes #230 2015-01-23 11:16:07 +02:00