Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master dev dev #51

Open
wants to merge 123 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
9cb8c58
Product classes list
skiv Aug 29, 2012
893f2b9
Product classes list
skiv Aug 30, 2012
c3bb97e
Product classes list
skiv Aug 30, 2012
8994520
Product classes list
skiv Aug 30, 2012
f16a282
[*] Address Field models are added initially.
Sep 4, 2012
253f527
Merge branch 'core-master-dev' into master-dev-dev
skiv Sep 5, 2012
1a7586d
Product classes
skiv Sep 6, 2012
42a9722
Merge branch 'core-master-dev' into master-dev-dev
skiv Sep 6, 2012
a1a0117
Attributes
skiv Sep 6, 2012
f72e61c
Merge branch 'master-dev' into joy-address-fields-manage
Sep 7, 2012
9af606d
[*] Address fields feature further changes.
Sep 12, 2012
42b8f7d
[*] Address fields feature further changes.
Sep 12, 2012
f28bf95
[*] Checkout is changed for address fields feature. Address clone imp…
Sep 14, 2012
2a7e672
[*] Order details page changes for address fields feature.
Sep 14, 2012
801b57a
Merge branch '1.1.x' into joy-address-fields-manage
svowl Sep 19, 2012
f5c6058
Attributes
skiv Sep 21, 2012
71ddb5e
Merge branch 'core-master-dev' into master-dev-dev
skiv Sep 21, 2012
0fcdd0a
Attributes
skiv Sep 27, 2012
5e3f1dc
Merge branch 'core-master-dev' into master-dev-dev
skiv Sep 27, 2012
b90f413
Attributes
skiv Sep 27, 2012
1e375bd
[*] Address fields refactoring: design of address popup window correc…
svowl Oct 1, 2012
a1c967e
[!] PHP warning fixed
svowl Oct 1, 2012
a5cd5d1
Attributes
skiv Oct 2, 2012
3aeb842
Merge branch 'core-master-dev' into master-dev-dev
skiv Oct 2, 2012
c7fe88e
[*] Add .dev/macro/load-yaml.php
max-shamaev Oct 3, 2012
3d3130d
Attributes
skiv Oct 3, 2012
f88f81f
Merge pull request #43 from skiv/master-dev-dev
max-shamaev Oct 3, 2012
5ab701a
[*] Address fields manage task. Checkout multiple changes.
Oct 4, 2012
81acca1
Merge branch '1.1.x' into master-dev
svowl Oct 4, 2012
aa4d6aa
Attributes
skiv Oct 5, 2012
7d8ac06
[*] Country/State JS connection total refactoring.
Oct 5, 2012
9a903da
[*] Address field feature changes for Estimate shipping.
Oct 8, 2012
646af9b
Merge branch 'master-dev' into svowl-address-fields-manage
Oct 8, 2012
f86b2e6
[+] Upgrade hook is added for profile address fields feature changes.
Oct 9, 2012
dc315cf
[!] Bug: Log library was loaded several times.
Oct 9, 2012
835b2b7
Merge pull request #44 from skiv/master-dev-dev
max-shamaev Oct 10, 2012
b3a48d0
Attributes
skiv Oct 11, 2012
0f24059
Merge pull request #45 from skiv/master-dev-dev
max-shamaev Oct 11, 2012
4903467
[*] Address fields refactoring.
Oct 11, 2012
af28dda
Merge branch '1.1.x' into master-dev
svowl Oct 12, 2012
406d256
Merge branch 'core-master-dev' into master-dev-dev
skiv Oct 15, 2012
8553e8a
Attributes
skiv Oct 15, 2012
66d730f
Merge pull request #47 from skiv/master-dev-dev
max-shamaev Oct 15, 2012
727869e
Attributes
skiv Oct 15, 2012
9ac0bb1
[*] Address fields changes on the order pages.
Oct 15, 2012
f91685a
[*] Custom state field could not change required state.
Oct 15, 2012
3445941
[*] Empty field value is not allowed now on the shipping settings form.
Oct 15, 2012
1cf0acf
[*] Small validation fix for service name field.
Oct 16, 2012
deb4acf
E:42290 [!] Bug: Removing address entry had been removed address fields.
Oct 16, 2012
c58e3c1
[*] Address field service name validation is added to the "Add addres…
Oct 16, 2012
0d9fc3f
[*] Validation alerts hiding is added to popup window close functiona…
Oct 16, 2012
83aa9cd
Merge branch '1.1.x' into master-dev
svowl Oct 17, 2012
3fe3a67
[*] Required address fields checking is added.
Oct 17, 2012
c22e053
[*] Address fields table width changes.
Oct 17, 2012
7c8a6e9
[*] Address fields feature changes on the checkout. Required fields.
Oct 18, 2012
81b8575
Merge branch 'core-master-dev' into master-dev-dev
skiv Oct 19, 2012
842a371
[*] Search functionality changes for address fields feature.
Oct 19, 2012
da42fbd
E:0042305 [!] Payment method: moduleEnabled property of method didn't…
svowl Oct 19, 2012
972a3a2
[*] Address pattern search changes.
Oct 19, 2012
4d37f5a
Product comparison
skiv Oct 22, 2012
d825f80
Product comparison
skiv Oct 23, 2012
cad71b7
[*] Minor refactoring in Core/Marketplace.php
svowl Oct 23, 2012
8d85be8
Merge branch '1.1.x' into master-dev
svowl Oct 23, 2012
6adc386
[*] Paypal module: Corrected pattern for checking error message 10486…
svowl Oct 24, 2012
017d696
Merge branch 'release-1.1.2' into 1.1.x
Oct 25, 2012
fe8f74a
Merge branch '1.1.x' into master-dev
Oct 25, 2012
310bd2d
[!] Percent shipping markup field has wrong type - decimal(4,2). Fixe…
svowl Nov 1, 2012
901bccd
E:0042336 [*] Admin did not get any warnings if payment method does n…
svowl Nov 1, 2012
273e730
E:0042289 [*] DrupalConnector module: Option General->products_per_pa…
svowl Nov 1, 2012
4b73bc7
[!] E:42335 Bug: ID was not unique on the marketplace page.
Nov 1, 2012
5c8a20b
E:0042184 [!] Import products issue: import routime breaks with inter…
svowl Nov 1, 2012
3cbbcc1
E:42186 [!] Button tags had wrong content.
Nov 2, 2012
1e39b5a
E:0042349 [!] Paypal module: PHP error on add-to-cart event if paymen…
svowl Nov 6, 2012
a7ec03b
Merge pull request #48 from skiv/master-dev-dev
max-shamaev Nov 6, 2012
a0064c1
Product comparison
skiv Nov 6, 2012
9aec2df
Attributes
skiv Nov 6, 2012
48de006
Merge pull request #50 from skiv/master-dev-dev
max-shamaev Nov 6, 2012
e554e85
Merge branch 'master-dev' into 1.1.x
Nov 6, 2012
73195d2
[!] Bug: Transparency attribute was not on the appropriate element.
Nov 7, 2012
9110c32
Attributes
skiv Nov 7, 2012
5803717
Attributes
skiv Nov 7, 2012
dc4ec32
Merge pull request #52 from skiv/master-dev-dev
max-shamaev Nov 7, 2012
f1a95bd
E:0042271 [*] Phone orderig payment method is enabled by default
svowl Nov 7, 2012
049cfe4
E:0042371 [!] Bug: e parameter didn't affected getValue() method in X…
svowl Nov 7, 2012
ff51e81
Attributes
skiv Nov 8, 2012
c32b558
Merge pull request #53 from skiv/master-dev-dev
max-shamaev Nov 8, 2012
bcfffb4
E:0042350 [!] SalesTax module: tax is not calculated on shipping cost…
svowl Nov 8, 2012
5cabb8b
[*] Small design changes.
Nov 8, 2012
ec9eeb0
Attributes
skiv Nov 8, 2012
2d7eb53
Merge pull request #54 from skiv/master-dev-dev
max-shamaev Nov 8, 2012
1ec9628
E:0042241 [!] Tests on PaypalWPS module corrected
svowl Nov 8, 2012
d6b1024
E:0042386 [!] Tests updated (SQL dump Repo/sql/module/setup.sql is co…
svowl Nov 8, 2012
27a292d
[*] Address fields default values are added.
Nov 9, 2012
b24b99c
[!] Bug: Street address line had no default value.
Nov 12, 2012
2a1c515
Attributes
skiv Nov 12, 2012
7cd55ed
Merge pull request #55 from skiv/master-dev-dev
max-shamaev Nov 12, 2012
a33274a
Attributes
skiv Nov 13, 2012
053838e
Merge pull request #56 from skiv/master-dev-dev
max-shamaev Nov 13, 2012
798dd57
Attributes
skiv Nov 13, 2012
86d90d1
Merge pull request #57 from skiv/master-dev-dev
max-shamaev Nov 13, 2012
f38824c
Attributes
skiv Nov 13, 2012
f6726b1
[!] Bug: Wrong directory was used for the temporary file storing event.
Nov 13, 2012
7e659cc
[!] Bug: Wrong file path was used.
Nov 14, 2012
e1e3975
[*] post_rebuild hook has been corrected.
Nov 14, 2012
9670692
[*] post_rebuild hook corrected
Nov 14, 2012
7d2eb35
[*] upgrade hook: LC_DIR_TMP -> LC_DIR_VAR
Nov 14, 2012
b32d782
[*] Address fields: upgrade hook has been corrected.
Nov 14, 2012
72f8aef
Merge pull request #58 from skiv/master-dev-dev
max-shamaev Nov 14, 2012
643013b
Attributes
skiv Nov 14, 2012
aad9492
Merge pull request #59 from skiv/master-dev-dev
max-shamaev Nov 14, 2012
cfa4f79
E:0042148 [*] Order invoice templates for email newsletter have been …
svowl Nov 14, 2012
7efe1ac
Attributes
skiv Nov 15, 2012
62363f7
Merge pull request #60 from skiv/master-dev-dev
max-shamaev Nov 15, 2012
e80e5d0
[+] Attributes are added
Nov 15, 2012
d2074f3
Merge branch '1.1.x' into svowl-address-fields-manage
Nov 15, 2012
b8f8bdd
Merge branch '1.1.x' of github.com:litecommerce/core into 1.1.x
Nov 15, 2012
eb1d2a3
[!] Minor fix in Model/Payment/Method.php
svowl Nov 16, 2012
8a5c627
Merge branch 'master-dev-dev' into s-comparison
skiv Nov 16, 2012
cf27935
[!] Cyrillic symbols in attributes values were displayed wrong.
Nov 16, 2012
8649bc3
[*] Added hidden URL to clear marketplace cache
svowl Nov 16, 2012
6a87ef9
Merge branch '1.1.x' of github.com:litecommerce/core into 1.1.x
svowl Nov 16, 2012
d1488ab
[*] Attributes: oops.
Nov 16, 2012
d2da685
Merge branch 's-comparison' into master-dev-dev
skiv Nov 26, 2012
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
46 changes: 2 additions & 44 deletions .dev/macro/core.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@
*
* @category LiteCommerce
* @author Creative Development LLC <[email protected]>
* @copyright Copyright (c) 2011 Creative Development LLC <[email protected]>. All rights reserved
* @copyright Copyright (c) 2011-2012 Creative Development LLC <[email protected]>. All rights reserved
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @link http://www.litecommerce.com/
* @see ____file_see____
* @since 1.0.18
*/

define('MACRO_START_DIR', getcwd());
Expand Down Expand Up @@ -52,8 +50,6 @@
* @param string $msg Error message
*
* @return void
* @see ____func_see____
* @since 1.0.18
*/
function macro_error($msg)
{
Expand All @@ -67,8 +63,6 @@ function macro_error($msg)
* @param string $name Name
*
* @return string
* @see ____func_see____
* @since 1.0.18
*/
function macro_get_named_argument($name)
{
Expand All @@ -83,8 +77,6 @@ function macro_get_named_argument($name)
* @param integer $number Index
*
* @return string
* @see ____func_see____
* @since 1.0.18
*/
function macro_get_plain_argument($number)
{
Expand All @@ -97,8 +89,6 @@ function macro_get_plain_argument($number)
* @param string $path Path
*
* @return string
* @see ____func_see____
* @since 1.0.18
*/
function macro_convert_path_to_class_name($path)
{
Expand All @@ -111,8 +101,6 @@ function macro_convert_path_to_class_name($path)
* @param string $class Class name
*
* @return string
* @see ____func_see____
* @since 1.0.18
*/
function macro_convert_class_name_to_path($class)
{
Expand All @@ -126,8 +114,6 @@ function macro_convert_class_name_to_path($class)
* @param string $data File content
*
* @return void
* @see ____func_see____
* @since 1.0.18
*/
function macro_file_put_contents($path, $data)
{
Expand All @@ -146,8 +132,6 @@ function macro_file_put_contents($path, $data)
* @param string $path path
*
* @return boolean
* @see ____func_see____
* @since 1.0.18
*/
function macro_is_entity($path)
{
Expand All @@ -162,8 +146,6 @@ function macro_is_entity($path)
* @param string $moduleName Module name OPTIONAL
*
* @return string
* @see ____func_see____
* @since 1.0.24
*/
function macro_assemble_class_name($suffix, $moduleAuthor = null, $moduleName = null)
{
Expand All @@ -180,8 +162,6 @@ function macro_assemble_class_name($suffix, $moduleAuthor = null, $moduleName =
* @param string $moduleName Module name OPTIONAL
*
* @return string
* @see ____func_see____
* @since 1.0.24
*/
function macro_assemble_tpl_name($suffix, $moduleAuthor = null, $moduleName = null)
{
Expand All @@ -196,8 +176,6 @@ function macro_assemble_tpl_name($suffix, $moduleAuthor = null, $moduleName = nu
* @param string $class Class full name
*
* @return string
* @see ____func_see____
* @since 1.0.24
*/
function macro_get_class_short_name($class)
{
Expand All @@ -212,8 +190,6 @@ function macro_get_class_short_name($class)
* @param string $camel Camel case string
*
* @return string
* @see ____func_see____
* @since 1.0.24
*/
function macro_convert_camel_to_human_readable($camel)
{
Expand All @@ -233,8 +209,6 @@ function macro_convert_camel_to_human_readable($camel)
* @param string &$path Path
*
* @return void
* @see ____func_see____
* @since 1.0.18
*/
function macro_check_file_path(&$path)
{
Expand All @@ -255,8 +229,6 @@ function macro_check_file_path(&$path)
* @param string $path Path
*
* @return void
* @see ____func_see____
* @since 1.0.18
*/
function macro_check_class_file_path($path)
{
Expand All @@ -273,8 +245,6 @@ function macro_check_class_file_path($path)
* @param string &$class Class
*
* @return void
* @see ____func_see____
* @since 1.0.18
*/
function macro_check_class(&$class)
{
Expand All @@ -290,8 +260,6 @@ function macro_check_class(&$class)
* @param string $module Name
*
* @return void
* @see ____func_see____
* @since 1.0.18
*/
function macro_check_module($author, $module)
{
Expand All @@ -315,8 +283,6 @@ function macro_check_module($author, $module)
* @param string $path Path
*
* @return string
* @see ____func_see____
* @since 1.0.18
*/
function macro_get_file_header($path)
{
Expand All @@ -341,11 +307,9 @@ function macro_get_file_header($path)
*
* @category LiteCommerce
* @author Creative Development LLC <[email protected]>
* @copyright Copyright (c) 2011 Creative Development LLC <[email protected]>. All rights reserved
* @copyright Copyright (c) 2011-2012 Creative Development LLC <[email protected]>. All rights reserved
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @link http://www.litecommerce.com/
* @see ____file_see____
* @since 1.0.0
*/


Expand All @@ -358,8 +322,6 @@ function macro_get_file_header($path)
* @param string $path Path
*
* @return string
* @see ____func_see____
* @since 1.0.18
*/
function macro_get_class_repo_header($path)
{
Expand All @@ -381,8 +343,6 @@ function macro_get_class_repo_header($path)
* @param string $path Path
*
* @return string
* @see ____func_see____
* @since 1.0.18
*/
function macro_get_class_header($path)
{
Expand All @@ -396,8 +356,6 @@ function macro_get_class_header($path)
/**
* Abstract widget
*
* @see ____class_see____
* @since 1.0.0
*/
HEAD;
}
Expand Down
Loading