Version Notes
OroCRM Bridge extension adds a couple of improvements to Magento SOAP API v2 in order to expose more shopping cart and customer data.
Download this release
Release Info
Developer | Oro, Inc |
Extension | Oro_Api |
Version | 1.1.4.1 |
Comparing to | |
See all releases |
Code changes from version 1.1.3 to 1.1.4.1
- app/code/community/Oro/Api/Model/Observer/Crm/Controller.php +46 -20
- app/code/community/Oro/Api/Model/Sales/Quote/Api.php +9 -4
- app/code/community/Oro/Api/etc/config.xml +1 -1
- app/design/adminhtml/default/default/template/oro/api/check.phtml +57 -0
- app/design/adminhtml/default/default/template/oro/api/login_styles.phtml +10 -0
- app/design/adminhtml/default/default/template/oro/api/page.phtml +6 -1
- app/design/adminhtml/default/default/template/oro/api/script.phtml +2 -2
- package.xml +4 -4
- skin/adminhtml/default/default/images/oro/add_button_icon_dark.png +0 -0
- skin/adminhtml/default/default/images/oro/apply_button_icon.png +0 -0
- skin/adminhtml/default/default/images/oro/error.png +0 -0
- skin/adminhtml/default/default/images/oro/grid_sort_asc.gif +0 -0
- skin/adminhtml/default/default/images/oro/grid_sort_desc.gif +0 -0
- skin/adminhtml/default/default/images/oro/loader.gif +0 -0
- skin/adminhtml/default/default/oro_style.css +284 -0
app/code/community/Oro/Api/Model/Observer/Crm/Controller.php
CHANGED
@@ -80,9 +80,13 @@ class Oro_Api_Model_Observer_Crm_Controller
|
|
80 |
*/
|
81 |
public function handleRenderLayout(Varien_Event_Observer $observer)
|
82 |
{
|
83 |
-
|
84 |
-
|
|
|
|
|
|
|
85 |
|
|
|
86 |
if (($contentBlock = $layout->getBlock('content')) instanceof Mage_Adminhtml_Block_Sales_Order_Create) {
|
87 |
$contentBlock->removeButton('reset');
|
88 |
|
@@ -99,26 +103,18 @@ class Oro_Api_Model_Observer_Crm_Controller
|
|
99 |
/** @var Mage_Core_Block_Text $script */
|
100 |
$layout->createBlock('adminhtml/template', 'oro_script', array('template' => 'oro/api/script.phtml'));
|
101 |
|
102 |
-
$
|
103 |
-
|
104 |
-
|
105 |
-
|
106 |
-
|
107 |
-
|
108 |
-
|
109 |
-
|
110 |
-
|
111 |
-
case $layout->getBlock('content') instanceof Mage_Core_Block_Text_List:
|
112 |
-
$destination = $layout->getBlock('content');
|
113 |
-
break;
|
114 |
-
default:
|
115 |
-
$destination = null;
|
116 |
-
break;
|
117 |
}
|
118 |
|
119 |
-
|
120 |
-
$destination->insert('oro_script');
|
121 |
-
}
|
122 |
|
123 |
if ($layout->getBlock('root') instanceof Mage_Core_Block_Template) {
|
124 |
$layout->getBlock('root')->setTemplate('oro/api/page.phtml');
|
@@ -126,6 +122,36 @@ class Oro_Api_Model_Observer_Crm_Controller
|
|
126 |
}
|
127 |
}
|
128 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
129 |
/**
|
130 |
* Set oro cookie value
|
131 |
*
|
80 |
*/
|
81 |
public function handleRenderLayout(Varien_Event_Observer $observer)
|
82 |
{
|
83 |
+
$layout = Mage::app()->getLayout();
|
84 |
+
|
85 |
+
//add check cookies script
|
86 |
+
$layout->createBlock('adminhtml/template', 'oro_check_script', array('template' => 'oro/api/check.phtml'));
|
87 |
+
$this->_insertBlock('oro_check_script', $layout);
|
88 |
|
89 |
+
if (Mage::helper('oro_api')->isOroRequest()) {
|
90 |
if (($contentBlock = $layout->getBlock('content')) instanceof Mage_Adminhtml_Block_Sales_Order_Create) {
|
91 |
$contentBlock->removeButton('reset');
|
92 |
|
103 |
/** @var Mage_Core_Block_Text $script */
|
104 |
$layout->createBlock('adminhtml/template', 'oro_script', array('template' => 'oro/api/script.phtml'));
|
105 |
|
106 |
+
if (($loginForm = $layout->getBlock('form.additional.info')) instanceof Mage_Core_Block_Text_List) {
|
107 |
+
$layout->createBlock(
|
108 |
+
'adminhtml/template',
|
109 |
+
'oro_login_styles',
|
110 |
+
array('template' => 'oro/api/login_styles.phtml')
|
111 |
+
);
|
112 |
+
$loginForm->insert('oro_login_styles');
|
113 |
+
} elseif ($layout->getBlock('head')) {
|
114 |
+
$layout->getBlock('head')->addCss('oro_style.css');
|
|
|
|
|
|
|
|
|
|
|
|
|
115 |
}
|
116 |
|
117 |
+
$this->_insertBlock('oro_script', $layout);
|
|
|
|
|
118 |
|
119 |
if ($layout->getBlock('root') instanceof Mage_Core_Block_Template) {
|
120 |
$layout->getBlock('root')->setTemplate('oro/api/page.phtml');
|
122 |
}
|
123 |
}
|
124 |
|
125 |
+
/**
|
126 |
+
* Insert block
|
127 |
+
*
|
128 |
+
* @param string $blockName
|
129 |
+
* @param Mage_Core_Model_Layout $layout
|
130 |
+
*/
|
131 |
+
protected function _insertBlock($blockName, Mage_Core_Model_Layout $layout)
|
132 |
+
{
|
133 |
+
$destination = null;
|
134 |
+
|
135 |
+
switch (true) {
|
136 |
+
case $layout->getBlock('form.additional.info') instanceof Mage_Core_Block_Text_List:
|
137 |
+
$destination = $layout->getBlock('form.additional.info');
|
138 |
+
break;
|
139 |
+
case $layout->getBlock('before_body_end') instanceof Mage_Core_Block_Text_List:
|
140 |
+
$destination = $layout->getBlock('before_body_end');
|
141 |
+
break;
|
142 |
+
case $layout->getBlock('content') instanceof Mage_Core_Block_Text_List:
|
143 |
+
$destination = $layout->getBlock('content');
|
144 |
+
break;
|
145 |
+
default:
|
146 |
+
$destination = null;
|
147 |
+
break;
|
148 |
+
}
|
149 |
+
|
150 |
+
if ($destination) {
|
151 |
+
$destination->insert($blockName);
|
152 |
+
}
|
153 |
+
}
|
154 |
+
|
155 |
/**
|
156 |
* Set oro cookie value
|
157 |
*
|
app/code/community/Oro/Api/Model/Sales/Quote/Api.php
CHANGED
@@ -32,7 +32,7 @@ class Oro_Api_Model_Sales_Quote_Api
|
|
32 |
/** @var $apiHelper Oro_Api_Helper_Data */
|
33 |
$apiHelper = Mage::helper('oro_api');
|
34 |
|
35 |
-
$filters = $apiHelper->parseFilters($filters
|
36 |
try {
|
37 |
foreach ($filters as $field => $value) {
|
38 |
$quoteCollection->addFieldToFilter($field, $value);
|
@@ -69,10 +69,10 @@ class Oro_Api_Model_Sales_Quote_Api
|
|
69 |
);
|
70 |
}
|
71 |
|
72 |
-
$result
|
73 |
$result['shipping_address'] = $this->_getAttributes($quote->getShippingAddress(), 'quote_address');
|
74 |
-
$result['billing_address']
|
75 |
-
$result['items']
|
76 |
|
77 |
foreach ($quote->getAllItems() as $item) {
|
78 |
if ($item->getGiftMessageId() > 0) {
|
@@ -85,6 +85,11 @@ class Oro_Api_Model_Sales_Quote_Api
|
|
85 |
}
|
86 |
|
87 |
$result['payment'] = $this->_getAttributes($quote->getPayment(), 'quote_payment');
|
|
|
|
|
|
|
|
|
|
|
88 |
|
89 |
return $result;
|
90 |
}
|
32 |
/** @var $apiHelper Oro_Api_Helper_Data */
|
33 |
$apiHelper = Mage::helper('oro_api');
|
34 |
|
35 |
+
$filters = $apiHelper->parseFilters($filters);
|
36 |
try {
|
37 |
foreach ($filters as $field => $value) {
|
38 |
$quoteCollection->addFieldToFilter($field, $value);
|
69 |
);
|
70 |
}
|
71 |
|
72 |
+
$result = $this->_getAttributes($quote, 'quote');
|
73 |
$result['shipping_address'] = $this->_getAttributes($quote->getShippingAddress(), 'quote_address');
|
74 |
+
$result['billing_address'] = $this->_getAttributes($quote->getBillingAddress(), 'quote_address');
|
75 |
+
$result['items'] = array();
|
76 |
|
77 |
foreach ($quote->getAllItems() as $item) {
|
78 |
if ($item->getGiftMessageId() > 0) {
|
85 |
}
|
86 |
|
87 |
$result['payment'] = $this->_getAttributes($quote->getPayment(), 'quote_payment');
|
88 |
+
if (isset($result['payment'], $result['payment']['additional_information'])
|
89 |
+
&& is_array($result['payment']['additional_information'])
|
90 |
+
) {
|
91 |
+
$result['payment']['additional_information'] = serialize($result['payment']['additional_information']);
|
92 |
+
}
|
93 |
|
94 |
return $result;
|
95 |
}
|
app/code/community/Oro/Api/etc/config.xml
CHANGED
@@ -20,7 +20,7 @@
|
|
20 |
<config>
|
21 |
<modules>
|
22 |
<Oro_Api>
|
23 |
-
<version>1.1.
|
24 |
</Oro_Api>
|
25 |
</modules>
|
26 |
<global>
|
20 |
<config>
|
21 |
<modules>
|
22 |
<Oro_Api>
|
23 |
+
<version>1.1.4</version>
|
24 |
</Oro_Api>
|
25 |
</modules>
|
26 |
<global>
|
app/design/adminhtml/default/default/template/oro/api/check.phtml
ADDED
@@ -0,0 +1,57 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
$badCookiesMessage = Mage::helper('oro_api')->
|
3 |
+
__(
|
4 |
+
"In order for this feature to work properly your browser must accept third-party cookies.".
|
5 |
+
" Please enable third-party cookies in your browser settings"
|
6 |
+
);
|
7 |
+
?>
|
8 |
+
<script type="text/html" id="errorPage">
|
9 |
+
<style type="text/css">
|
10 |
+
.error-container {
|
11 |
+
margin: 170px auto;
|
12 |
+
padding-left: 32px;
|
13 |
+
width: 350px;
|
14 |
+
background-color: #ededed;
|
15 |
+
border-radius: 6px;
|
16 |
+
}
|
17 |
+
.text-container{
|
18 |
+
padding: 35px;
|
19 |
+
text-align: left;
|
20 |
+
background: url(<?php echo $this->getSkinUrl('images/oro/error.png') ?>) left no-repeat;
|
21 |
+
}
|
22 |
+
</style>
|
23 |
+
<div class="error-container">
|
24 |
+
<div class="text-container">
|
25 |
+
<?php echo $badCookiesMessage; ?>
|
26 |
+
</div>
|
27 |
+
</div>
|
28 |
+
</script>
|
29 |
+
<script type="text/javascript" src="<?php echo Mage::getBaseUrl('js') ?>mage/cookies.js"></script>
|
30 |
+
<?php /** @var $cookie Mage_Core_Model_Cookie */
|
31 |
+
$cookie = Mage::getSingleton('core/cookie');
|
32 |
+
?>
|
33 |
+
<script type="text/javascript">
|
34 |
+
//<![CDATA[
|
35 |
+
//check if we can set cookies in iframe
|
36 |
+
if (window.self != window.top) {
|
37 |
+
var cookieName = 'isCookiesEnabled';
|
38 |
+
window.Mage.Cookies.set(
|
39 |
+
cookieName,
|
40 |
+
1,
|
41 |
+
null,
|
42 |
+
'<?php echo $cookie->getPath();?>',
|
43 |
+
'<?php echo $cookie->getDomain();?>'
|
44 |
+
);
|
45 |
+
if (!window.Mage.Cookies.get(cookieName)) {
|
46 |
+
document.body.innerHTML = document.getElementById('errorPage').innerHTML;
|
47 |
+
}
|
48 |
+
window.Mage.Cookies.set(
|
49 |
+
cookieName,
|
50 |
+
0,
|
51 |
+
new Date(1980, 1, 1),
|
52 |
+
'<?php echo $cookie->getPath();?>',
|
53 |
+
'<?php echo $cookie->getDomain();?>'
|
54 |
+
);
|
55 |
+
}
|
56 |
+
//]]>
|
57 |
+
</script>
|
app/design/adminhtml/default/default/template/oro/api/login_styles.phtml
ADDED
@@ -0,0 +1,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<script>
|
2 |
+
//<![CDATA[
|
3 |
+
var head = document.head || document.getElementsByTagName('head')[0],
|
4 |
+
style = document.createElement('link');
|
5 |
+
style.type = 'text/css';
|
6 |
+
style.rel = 'stylesheet';
|
7 |
+
style.href = '<?php echo $this->getSkinUrl('oro_style.css') ?>';
|
8 |
+
head.appendChild(style);
|
9 |
+
//]]>
|
10 |
+
</script>
|
app/design/adminhtml/default/default/template/oro/api/page.phtml
CHANGED
@@ -47,7 +47,12 @@
|
|
47 |
<?php echo $this->getChildHtml('js') ?>
|
48 |
<?php echo $this->getChildHtml('profiler') ?>
|
49 |
<div id="loading-mask" style="display:none">
|
50 |
-
<
|
|
|
|
|
|
|
|
|
|
|
51 |
</div>
|
52 |
|
53 |
<?php echo $this->getChildHtml('before_body_end') ?>
|
47 |
<?php echo $this->getChildHtml('js') ?>
|
48 |
<?php echo $this->getChildHtml('profiler') ?>
|
49 |
<div id="loading-mask" style="display:none">
|
50 |
+
<div class="loading-wrapper"></div>
|
51 |
+
<div class="loading-frame">
|
52 |
+
<div class="box">
|
53 |
+
<div class="loading-content"><?php echo Mage::helper('adminhtml')->__('Loading...') ?></div>
|
54 |
+
</div>
|
55 |
+
</div>
|
56 |
</div>
|
57 |
|
58 |
<?php echo $this->getChildHtml('before_body_end') ?>
|
app/design/adminhtml/default/default/template/oro/api/script.phtml
CHANGED
@@ -1,6 +1,6 @@
|
|
1 |
<script type="text/javascript" src="<?php echo Mage::getBaseUrl('js') ?>mage/cookies.js"></script>
|
2 |
-
<?php /** @var $cookie Mage_Core_Model_Cookie */
|
3 |
-
$cookie = Mage::getSingleton('core/cookie'); ?>
|
4 |
<script type="text/javascript">
|
5 |
//<![CDATA[
|
6 |
if (window.self == window.top && 1 == window.Mage.Cookies.get("is-oro-request")) {
|
1 |
<script type="text/javascript" src="<?php echo Mage::getBaseUrl('js') ?>mage/cookies.js"></script>
|
2 |
+
<?php /** @var $cookie Mage_Core_Model_Cookie */ ?>
|
3 |
+
<?php $cookie = Mage::getSingleton('core/cookie'); ?>
|
4 |
<script type="text/javascript">
|
5 |
//<![CDATA[
|
6 |
if (window.self == window.top && 1 == window.Mage.Cookies.get("is-oro-request")) {
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Oro_Api</name>
|
4 |
-
<version>1.1.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL 3.0)</license>
|
7 |
<channel>community</channel>
|
@@ -10,9 +10,9 @@
|
|
10 |
<description>OroCRM Bridge extension adds a couple of improvements to Magento SOAP API v2 in order to expose more shopping cart and customer data.</description>
|
11 |
<notes>OroCRM Bridge extension adds a couple of improvements to Magento SOAP API v2 in order to expose more shopping cart and customer data.</notes>
|
12 |
<authors><author><name>Oro, Inc</name><user>orocrm</user><email>info@orocrm.com</email></author></authors>
|
13 |
-
<date>2014-
|
14 |
-
<time>
|
15 |
-
<contents><target name="magecommunity"><dir name="Oro"><dir name="Api"><dir name="Helper"><file name="Data.php" hash="94d7cebbd20dca0e0176e300a4165434"/></dir><dir name="Model"><dir name="Catalog"><dir name="Product"><dir name="Api"><file name="V2.php" hash="9fe5e65e1b189ba6a9fed25fe8d858d6"/></dir></dir></dir><dir name="Customer"><dir name="Api"><file name="V2.php" hash="89fc6f16e7f452438d4927669ea0f0de"/></dir><file name="Api.php" hash="d8a56eba2d835451c9021c2e94a7347b"/></dir><dir name="Newsletter"><dir name="Subscriber"><dir name="Api"><file name="V2.php" hash="7b18db294f86ccf841a95aa7b7e656af"/></dir><file name="Api.php" hash="a49473afaca6c5bbbb82f58f41ff1650"/></dir></dir><dir name="Observer"><dir name="Crm"><file name="Controller.php" hash="
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.2.13</min><max>5.5.0</max></php></required></dependencies>
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Oro_Api</name>
|
4 |
+
<version>1.1.4.1</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL 3.0)</license>
|
7 |
<channel>community</channel>
|
10 |
<description>OroCRM Bridge extension adds a couple of improvements to Magento SOAP API v2 in order to expose more shopping cart and customer data.</description>
|
11 |
<notes>OroCRM Bridge extension adds a couple of improvements to Magento SOAP API v2 in order to expose more shopping cart and customer data.</notes>
|
12 |
<authors><author><name>Oro, Inc</name><user>orocrm</user><email>info@orocrm.com</email></author></authors>
|
13 |
+
<date>2014-06-11</date>
|
14 |
+
<time>12:55:56</time>
|
15 |
+
<contents><target name="magecommunity"><dir name="Oro"><dir name="Api"><dir name="Helper"><file name="Data.php" hash="94d7cebbd20dca0e0176e300a4165434"/></dir><dir name="Model"><dir name="Catalog"><dir name="Product"><dir name="Api"><file name="V2.php" hash="9fe5e65e1b189ba6a9fed25fe8d858d6"/></dir></dir></dir><dir name="Customer"><dir name="Api"><file name="V2.php" hash="89fc6f16e7f452438d4927669ea0f0de"/></dir><file name="Api.php" hash="d8a56eba2d835451c9021c2e94a7347b"/></dir><dir name="Newsletter"><dir name="Subscriber"><dir name="Api"><file name="V2.php" hash="7b18db294f86ccf841a95aa7b7e656af"/></dir><file name="Api.php" hash="a49473afaca6c5bbbb82f58f41ff1650"/></dir></dir><dir name="Observer"><dir name="Crm"><file name="Controller.php" hash="ae6c98e07ba8c175a9ef22c40bde502b"/></dir><dir name="Sales"><file name="Order.php" hash="81e2f8992f57a406130c893072365782"/></dir></dir><dir name="Ping"><file name="V2.php" hash="0fa10110ecb67d32079c5530a979c55a"/></dir><file name="Ping.php" hash="e5f8c2feb8ece7f27ff4f13277da68fd"/><dir name="Report"><dir name="Product"><dir name="Viewed"><dir name="Api"><file name="V2.php" hash="c8481504cefd028a17cc4a6555182ad0"/></dir><file name="Api.php" hash="fe175f2aab97cafa47574f1da2e169a3"/></dir></dir></dir><dir name="Resource"><dir name="Reports"><dir name="Product"><dir name="Index"><dir name="Viewed"><file name="Collection.php" hash="199749c5c972ab305abff0c9b10e9954"/></dir></dir></dir></dir></dir><dir name="Sales"><dir name="Order"><dir name="Api"><file name="V2.php" hash="0621bd68c420feb8000dae6861c49369"/></dir><file name="Api.php" hash="abbcb2a561b1030a4c1cc465e6cc0a1e"/></dir><dir name="Quote"><dir name="Api"><file name="V2.php" hash="4e8ba0ed7757110c4eae1d239b2adf76"/></dir><file name="Api.php" hash="263438faf4af9fd4fff6e81ac9f006ff"/></dir></dir><dir name="Wishlist"><dir name="Api"><file name="V2.php" hash="f0ac63e1cf9440ed0e4ca72eb93834f2"/></dir><file name="Api.php" hash="3ebfc3b7841c265921ea05d63f8ba5a9"/><dir name="Item"><dir name="Api"><file name="V2.php" hash="43a919dae8dd432e211878a39ba3f4a2"/></dir><file name="Api.php" hash="8d5d856ea533b9b122c96d0bef32861b"/></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Oro"><file name="GatewayController.php" hash="aca4efd099a889a77fb119356d9fab23"/><file name="SalesController.php" hash="4ba37d2b0d86c0eeaf9e6fa2b7bac843"/></dir></dir></dir><dir name="etc"><file name="api.xml" hash="2ee90b80f4d29ab73b3517a3d19e7aa3"/><file name="config.xml" hash="88705771d0f78063c695e39e4c5f1af9"/><file name="workflow.xml" hash="12ad592e533d8a53187af25c46fb017e"/><file name="wsdl.xml" hash="da7d4715356d7cb88052f720bf739c15"/><file name="wsi.xml" hash="1343db7b48eef10979246ca616651781"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Oro_Api.xml" hash="e4836dedcf0ace31dd01b117a1fd962e"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="oro"><dir><dir name="api"><file name="check.phtml" hash="142e380fa9eae5c0b7f233d519d13dc7"/><file name="login_styles.phtml" hash="a89d5d690702cf8296d76923b85e4ced"/><file name="page.phtml" hash="e9359e49019bbaa6e8b77e2a0ec458dd"/><file name="script.phtml" hash="89c3810165995c0ef6a0f5ad3b39f41f"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="oro"><file name="add_button_icon_dark.png" hash="01929b4351b537427035ba0f4df61689"/><file name="apply_button_icon.png" hash="4fc6fffbf943e82ea2b1a0022ec329e1"/><file name="error.png" hash="0caf3533e40e7f425d206803ef6e1876"/><file name="grid_sort_asc.gif" hash="8a86df764d4219dc0cf04f8529165cef"/><file name="grid_sort_desc.gif" hash="4f493deb94cb0eb0c6401e7f6bf6e0af"/><file name="loader.gif" hash="edf214475c8e79574dac3687926fc62b"/></dir></dir><file name="oro_style.css" hash="f6b8ef21733eb76e70deb5eb4cf33a30"/></dir></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.2.13</min><max>5.5.0</max></php></required></dependencies>
|
18 |
</package>
|
skin/adminhtml/default/default/images/oro/add_button_icon_dark.png
ADDED
Binary file
|
skin/adminhtml/default/default/images/oro/apply_button_icon.png
ADDED
Binary file
|
skin/adminhtml/default/default/images/oro/error.png
ADDED
Binary file
|
skin/adminhtml/default/default/images/oro/grid_sort_asc.gif
ADDED
Binary file
|
skin/adminhtml/default/default/images/oro/grid_sort_desc.gif
ADDED
Binary file
|
skin/adminhtml/default/default/images/oro/loader.gif
ADDED
Binary file
|
skin/adminhtml/default/default/oro_style.css
ADDED
@@ -0,0 +1,284 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
body {
|
2 |
+
font-family: Helvetica, Arial, sans-serif;
|
3 |
+
}
|
4 |
+
|
5 |
+
.notice {
|
6 |
+
color: #c30b25;
|
7 |
+
}
|
8 |
+
|
9 |
+
a, a:hover {
|
10 |
+
color: #006acc;
|
11 |
+
text-decoration: underline;
|
12 |
+
font-size: 1.1em;
|
13 |
+
}
|
14 |
+
|
15 |
+
button:hover, .form-button:hover {
|
16 |
+
background: #f3f3f3 linear-gradient(#f3f3f3, #f6f6f6) 0 0 repeat-x;
|
17 |
+
}
|
18 |
+
|
19 |
+
button, .form-button {
|
20 |
+
background: #f3f3f3 linear-gradient(#f3f3f3, #f6f6f6) 0 0 repeat-x;
|
21 |
+
border: 1px solid #969696;
|
22 |
+
box-shadow: none;
|
23 |
+
box-sizing: border-box;
|
24 |
+
cursor: pointer;
|
25 |
+
display: inline-block;
|
26 |
+
font-size: 11px;
|
27 |
+
font-weight: bold;
|
28 |
+
height: 22px;
|
29 |
+
line-height: 20px;
|
30 |
+
margin-bottom: 0px;
|
31 |
+
padding: 0 12px 0 12px;
|
32 |
+
text-align: center;
|
33 |
+
text-decoration: none solid rgb(255, 255, 255);
|
34 |
+
vertical-align: middle;
|
35 |
+
visibility: visible;
|
36 |
+
color: #666666;
|
37 |
+
}
|
38 |
+
|
39 |
+
button.add span {
|
40 |
+
background-image: url('./images/oro/add_button_icon_dark.png');
|
41 |
+
}
|
42 |
+
|
43 |
+
button.save span {
|
44 |
+
background-image: url('./images/oro/apply_button_icon.png');
|
45 |
+
}
|
46 |
+
|
47 |
+
button.save {
|
48 |
+
background-color: rgb(113, 192, 24);
|
49 |
+
background-image: linear-gradient(rgb(130, 206, 32), rgb(87, 172, 11));
|
50 |
+
background-repeat: repeat-x;
|
51 |
+
border-bottom-color: rgb(38, 117, 7);
|
52 |
+
border-bottom-style: solid;
|
53 |
+
border-bottom-width: 1px;
|
54 |
+
border-image-outset: 0px;
|
55 |
+
border-image-repeat: stretch;
|
56 |
+
border-image-slice: 100%;
|
57 |
+
border-image-source: none;
|
58 |
+
border-image-width: 1;
|
59 |
+
border-left-color: rgb(59, 141, 28);
|
60 |
+
border-left-style: solid;
|
61 |
+
border-left-width: 1px;
|
62 |
+
border-right-color: rgb(59, 141, 28);
|
63 |
+
border-right-style: solid;
|
64 |
+
border-right-width: 1px;
|
65 |
+
border-top-color: rgb(73, 152, 43);
|
66 |
+
border-top-style: solid;
|
67 |
+
border-top-width: 1px;
|
68 |
+
color: rgb(255, 255, 255);
|
69 |
+
position: relative;
|
70 |
+
text-shadow: rgb(59, 141, 28) 0px 1px 0px;
|
71 |
+
}
|
72 |
+
|
73 |
+
dl.accordion dt, .entry-edit .entry-edit-head, .create-order-sidebar-block .head {
|
74 |
+
border-bottom: 1px solid #000;
|
75 |
+
background-color: #47505a;
|
76 |
+
background-color: #404952;
|
77 |
+
background-image: -moz-linear-gradient(top, #47505a, #363e47);
|
78 |
+
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#47505a), to(#363e47));
|
79 |
+
background-image: -webkit-linear-gradient(top, #47505a, #363e47);
|
80 |
+
background-image: -o-linear-gradient(top, #47505a, #363e47);
|
81 |
+
background-image: linear-gradient(to bottom, #47505a, #363e47);
|
82 |
+
background-repeat: repeat-x;
|
83 |
+
color: #ffffff;
|
84 |
+
}
|
85 |
+
|
86 |
+
.entry-edit .entry-edit-head h4 {
|
87 |
+
color: #ffffff;
|
88 |
+
font-weight: normal;
|
89 |
+
}
|
90 |
+
|
91 |
+
.content-header h3 {
|
92 |
+
color: #444444;
|
93 |
+
font-weight: normal;
|
94 |
+
}
|
95 |
+
|
96 |
+
.create-order-sidebar-block .head h5 {
|
97 |
+
color: #ffffff;
|
98 |
+
font-weight: normal;
|
99 |
+
margin-top: 3px;
|
100 |
+
}
|
101 |
+
|
102 |
+
.entry-edit .entry-edit-head h4 {
|
103 |
+
font-size: 1.1em;
|
104 |
+
line-height: 16px;
|
105 |
+
margin-top: 5px;
|
106 |
+
font-weight: normal;
|
107 |
+
}
|
108 |
+
|
109 |
+
.grid tr.headings {
|
110 |
+
background: #ececec;
|
111 |
+
}
|
112 |
+
|
113 |
+
.grid tr.headings th.no-link, .grid tr.headings th span.sort-title {
|
114 |
+
text-transform: uppercase;
|
115 |
+
}
|
116 |
+
|
117 |
+
.grid tr.headings th span.nobr {
|
118 |
+
color: #2d444f;
|
119 |
+
}
|
120 |
+
|
121 |
+
.grid table td {
|
122 |
+
background-color: #fff;
|
123 |
+
}
|
124 |
+
|
125 |
+
.grid tr.filter {
|
126 |
+
background: #f6f6f6;
|
127 |
+
}
|
128 |
+
|
129 |
+
.grid table tfoot tr td {
|
130 |
+
background: #ececec;
|
131 |
+
}
|
132 |
+
|
133 |
+
.grid tr.headings th a.sort-arrow-desc span.sort-title {
|
134 |
+
background-image: url('./images/oro/grid_sort_desc.gif');
|
135 |
+
}
|
136 |
+
|
137 |
+
.grid tr.headings th a.sort-arrow-asc span.sort-title {
|
138 |
+
background-image: url('./images/oro/grid_sort_asc.gif');
|
139 |
+
}
|
140 |
+
|
141 |
+
.grid tr.headings th a.sort-arrow-desc, .grid tr.headings th a.sort-arrow-asc {
|
142 |
+
background: none;
|
143 |
+
border-bottom: 0;
|
144 |
+
border-right: 0;
|
145 |
+
}
|
146 |
+
|
147 |
+
.grid tr.headings th a, .grid tr.headings th a:hover {
|
148 |
+
color: #2d444f;
|
149 |
+
}
|
150 |
+
|
151 |
+
.order-save-in-address-book {
|
152 |
+
background: #f9f9f9;
|
153 |
+
}
|
154 |
+
|
155 |
+
.switcher {
|
156 |
+
background: none repeat scroll 0 0 #ffffff;
|
157 |
+
}
|
158 |
+
|
159 |
+
.box, .entry-edit fieldset, .entry-edit .fieldset {
|
160 |
+
background: #fff;
|
161 |
+
}
|
162 |
+
|
163 |
+
.order-choose-address {
|
164 |
+
background: #f6f6f6;
|
165 |
+
}
|
166 |
+
|
167 |
+
.sub-btn-set {
|
168 |
+
background: #fff;
|
169 |
+
}
|
170 |
+
|
171 |
+
.create-order-sidebar-container {
|
172 |
+
background: #fff;
|
173 |
+
}
|
174 |
+
|
175 |
+
.login-container {
|
176 |
+
background: none;
|
177 |
+
}
|
178 |
+
|
179 |
+
.login-form {
|
180 |
+
border: 1px solid #d4d4d4;
|
181 |
+
border-bottom: none;
|
182 |
+
background: none;
|
183 |
+
-webkit-border-top-left-radius: 5px;
|
184 |
+
-webkit-border-top-right-radius: 5px;
|
185 |
+
-moz-border-radius-topleft: 5px;
|
186 |
+
-moz-border-radius-topright: 5px;
|
187 |
+
border-top-left-radius: 5px;
|
188 |
+
border-top-right-radius: 5px;
|
189 |
+
}
|
190 |
+
|
191 |
+
.login-form label {
|
192 |
+
font: 14px/22px Helvetica, Arial, sans-serif;
|
193 |
+
color: #5b636d;
|
194 |
+
}
|
195 |
+
|
196 |
+
.login-form input.input-text {
|
197 |
+
font: 14px/16px Helvetica, Arial, sans-serif;
|
198 |
+
height: 16px;
|
199 |
+
}
|
200 |
+
|
201 |
+
.login-container .legal {
|
202 |
+
display: none;
|
203 |
+
}
|
204 |
+
|
205 |
+
.order-totals {
|
206 |
+
background: none;
|
207 |
+
border: 1px solid #d6d6d6 !important;
|
208 |
+
}
|
209 |
+
|
210 |
+
.content-header-floating {
|
211 |
+
display: none;
|
212 |
+
position: fixed;
|
213 |
+
left: 0;
|
214 |
+
top: 0;
|
215 |
+
width: 100%;
|
216 |
+
border-bottom: none;
|
217 |
+
z-index: 100;
|
218 |
+
background: #444444;
|
219 |
+
color: #ffffff;
|
220 |
+
opacity: .85;
|
221 |
+
}
|
222 |
+
|
223 |
+
.content-header-floating .content-header {
|
224 |
+
padding: 10px 20px;
|
225 |
+
}
|
226 |
+
|
227 |
+
.content-header-floating .content-header h3 {
|
228 |
+
color: #ffffff;
|
229 |
+
}
|
230 |
+
|
231 |
+
#order-header h3 {
|
232 |
+
padding-left: 0;
|
233 |
+
margin-left: 0;
|
234 |
+
background: none;
|
235 |
+
}
|
236 |
+
|
237 |
+
#loading-mask {
|
238 |
+
background: none;
|
239 |
+
opacity: 1;
|
240 |
+
}
|
241 |
+
|
242 |
+
#loading-mask .loading-wrapper {
|
243 |
+
background: #000;
|
244 |
+
opacity: .3;
|
245 |
+
position: absolute;
|
246 |
+
top: 0;
|
247 |
+
left: 0;
|
248 |
+
right: 0;
|
249 |
+
bottom: 0;
|
250 |
+
z-index: 999;
|
251 |
+
}
|
252 |
+
|
253 |
+
#loading-mask .loading-frame {
|
254 |
+
position: fixed;
|
255 |
+
top: 45%;
|
256 |
+
left: 50%;
|
257 |
+
width: 180px;
|
258 |
+
z-index: 9999;
|
259 |
+
}
|
260 |
+
|
261 |
+
#loading-mask .loading-frame .box {
|
262 |
+
margin: 20px 0;
|
263 |
+
background: #fff;
|
264 |
+
font-size: 14px;
|
265 |
+
font-weight: bold;
|
266 |
+
line-height: 24px;
|
267 |
+
min-height: 20px;
|
268 |
+
padding: 19px;
|
269 |
+
border: 1px solid #e6e6e6;
|
270 |
+
-webkit-border-radius: 4px;
|
271 |
+
-moz-border-radius: 4px;
|
272 |
+
border-radius: 4px;
|
273 |
+
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
|
274 |
+
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
|
275 |
+
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
|
276 |
+
}
|
277 |
+
|
278 |
+
#loading-mask .loading-frame .box .loading-content {
|
279 |
+
opacity: 1;
|
280 |
+
background: #ffffff url('./images/oro/loader.gif') no-repeat center left;
|
281 |
+
padding-left: 35px;
|
282 |
+
text-align: left;
|
283 |
+
color: #000;
|
284 |
+
}
|