Version Notes
Messages view in front office changed in a more "Magento" style
Download this release
Release Info
Developer | Magento Core Team |
Extension | Order_tickets |
Version | 1.3.2 |
Comparing to | |
See all releases |
Code changes from version 1.3.1 to 1.3.2
- app/code/community/Laurent/OrderTickets/Block/Order/Tabs.php +0 -64
- app/code/community/Laurent/OrderTickets/etc/config.xml +1 -1
- app/design/frontend/base/default/layout/ordertickets.xml +54 -13
- app/design/frontend/base/default/template/ordertickets/chat.phtml +1 -6
- app/design/frontend/base/default/template/ordertickets/order/tabs.phtml +0 -17
- package.xml +5 -5
- skin/frontend/base/default/css/ordertickets.css +0 -45
app/code/community/Laurent/OrderTickets/Block/Order/Tabs.php
DELETED
@@ -1,64 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
|
3 |
-
/*
|
4 |
-
* @category Laurent
|
5 |
-
* @package Laurent_OrderTickets
|
6 |
-
* @copyright Copyright (c) 2011 Laurent Clouet
|
7 |
-
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
8 |
-
* @author Laurent Clouet <laurent35240@gmail.com>
|
9 |
-
*/
|
10 |
-
|
11 |
-
/**
|
12 |
-
* Description of Tabs
|
13 |
-
*
|
14 |
-
*/
|
15 |
-
class Laurent_OrderTickets_Block_Order_Tabs extends Mage_Core_Block_Template {
|
16 |
-
|
17 |
-
CONST ORDER_VIEW_LINK = 'sales/order/view';
|
18 |
-
CONST ORDER_CHAT_LINK = 'ordertickets/chat/view';
|
19 |
-
|
20 |
-
/**
|
21 |
-
* Retrieve current order model instance
|
22 |
-
*
|
23 |
-
* @return Mage_Sales_Model_Order
|
24 |
-
*/
|
25 |
-
public function getOrder()
|
26 |
-
{
|
27 |
-
return Mage::registry('current_order');
|
28 |
-
}
|
29 |
-
|
30 |
-
/**
|
31 |
-
* Gives url link for viewing the current order
|
32 |
-
* @return string
|
33 |
-
*/
|
34 |
-
public function getOrderViewLink(){
|
35 |
-
return $this->getUrl(self::ORDER_VIEW_LINK, array('order_id' => $this->getOrder()->getId()));
|
36 |
-
}
|
37 |
-
|
38 |
-
/**
|
39 |
-
* Gives url link for viewing tickets chat of current order
|
40 |
-
* @return string
|
41 |
-
*/
|
42 |
-
public function getOrderChatLink(){
|
43 |
-
return $this->getUrl(self::ORDER_CHAT_LINK, array('order_id' => $this->getOrder()->getId()));
|
44 |
-
}
|
45 |
-
|
46 |
-
/**
|
47 |
-
* Check if we are currenty in sales/order/view page
|
48 |
-
* @return boolean
|
49 |
-
*/
|
50 |
-
public function pageIsOrderView(){
|
51 |
-
$requestString = $this->getRequest()->getRequestString();
|
52 |
-
return (strstr($requestString, self::ORDER_VIEW_LINK) !== false);
|
53 |
-
}
|
54 |
-
|
55 |
-
|
56 |
-
/**
|
57 |
-
* Check if we are currenty in order chat view page
|
58 |
-
* @return boolean
|
59 |
-
*/
|
60 |
-
public function pageIsOrderChat(){
|
61 |
-
$requestString = $this->getRequest()->getRequestString();
|
62 |
-
return (strstr($requestString, self::ORDER_CHAT_LINK) !== false);
|
63 |
-
}
|
64 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Laurent/OrderTickets/etc/config.xml
CHANGED
@@ -9,7 +9,7 @@
|
|
9 |
<config>
|
10 |
<modules>
|
11 |
<Laurent_OrderTickets>
|
12 |
-
<version>1.3.
|
13 |
</Laurent_OrderTickets>
|
14 |
</modules>
|
15 |
<global>
|
9 |
<config>
|
10 |
<modules>
|
11 |
<Laurent_OrderTickets>
|
12 |
+
<version>1.3.2</version>
|
13 |
</Laurent_OrderTickets>
|
14 |
</modules>
|
15 |
<global>
|
app/design/frontend/base/default/layout/ordertickets.xml
CHANGED
@@ -8,21 +8,62 @@
|
|
8 |
<layout version="0.1.0">
|
9 |
<ordertickets_chat_view>
|
10 |
<update handle="customer_account"/>
|
11 |
-
<reference name="
|
12 |
-
<
|
13 |
-
|
14 |
-
|
15 |
-
|
16 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
17 |
</reference>
|
18 |
</ordertickets_chat_view>
|
19 |
-
|
20 |
-
<
|
21 |
-
<reference name="
|
22 |
-
<action method="
|
23 |
-
|
24 |
-
|
25 |
-
|
|
|
26 |
</reference>
|
|
|
|
|
|
|
|
|
27 |
</sales_order_view>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
28 |
</layout>
|
8 |
<layout version="0.1.0">
|
9 |
<ordertickets_chat_view>
|
10 |
<update handle="customer_account"/>
|
11 |
+
<reference name="my.account.wrapper">
|
12 |
+
<block type="sales/order_info" as="info" name="sales.order.info">
|
13 |
+
<block type="sales/order_info_buttons" as="buttons" name="sales.order.info.buttons" />
|
14 |
+
<action method="addLink" translate="label" module="sales">
|
15 |
+
<name>view</name>
|
16 |
+
<path>sales/order/view</path>
|
17 |
+
<label>Order Information</label>
|
18 |
+
</action>
|
19 |
+
<action method="addLink" translate="label" module="sales">
|
20 |
+
<name>invoice</name>
|
21 |
+
<path>sales/order/invoice</path>
|
22 |
+
<label>Invoices</label>
|
23 |
+
</action>
|
24 |
+
<action method="addLink" translate="label" module="sales">
|
25 |
+
<name>shipment</name>
|
26 |
+
<path>sales/order/shipment</path>
|
27 |
+
<label>Shipments</label>
|
28 |
+
</action>
|
29 |
+
<action method="addLink" translate="label" module="sales">
|
30 |
+
<name>creditmemo</name>
|
31 |
+
<path>sales/order/creditmemo</path>
|
32 |
+
<label>Refunds</label>
|
33 |
+
</action>
|
34 |
+
<action method="addLink" translate="label" module="ordertickets">
|
35 |
+
<name>ordertickets</name>
|
36 |
+
<path/>
|
37 |
+
<label>Messages</label>
|
38 |
+
</action>
|
39 |
+
</block>
|
40 |
+
<block type="ordertickets/chat" name="ordertickets_chat" template="ordertickets/chat.phtml"/>
|
41 |
</reference>
|
42 |
</ordertickets_chat_view>
|
43 |
+
|
44 |
+
<ordertickets_chat_link>
|
45 |
+
<reference name="sales.order.info">
|
46 |
+
<action method="addLink" translate="label" module="ordertickets">
|
47 |
+
<name>ordertickets</name>
|
48 |
+
<path>ordertickets/chat/view</path>
|
49 |
+
<label>Messages</label>
|
50 |
+
</action>
|
51 |
</reference>
|
52 |
+
</ordertickets_chat_link>
|
53 |
+
|
54 |
+
<sales_order_view>
|
55 |
+
<update handle="ordertickets_chat_link"/>
|
56 |
</sales_order_view>
|
57 |
+
|
58 |
+
<sales_order_invoice>
|
59 |
+
<update handle="ordertickets_chat_link"/>
|
60 |
+
</sales_order_invoice>
|
61 |
+
|
62 |
+
<sales_order_shipment>
|
63 |
+
<update handle="ordertickets_chat_link"/>
|
64 |
+
</sales_order_shipment>
|
65 |
+
|
66 |
+
<sales_order_creditmemo>
|
67 |
+
<update handle="ordertickets_chat_link"/>
|
68 |
+
</sales_order_creditmemo>
|
69 |
</layout>
|
app/design/frontend/base/default/template/ordertickets/chat.phtml
CHANGED
@@ -7,18 +7,13 @@
|
|
7 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
8 |
* @author Laurent Clouet <laurent35240@gmail.com>
|
9 |
*/
|
10 |
-
|
11 |
-
<?php
|
12 |
/**
|
13 |
* @var $this Laurent_OrderTickets_Block_Chat
|
14 |
*/
|
15 |
|
16 |
$_order = $this->getOrder();
|
17 |
?>
|
18 |
-
<?php echo $this->getMessagesBlock()->getGroupedHtml();?>
|
19 |
-
<div class="page-head button-level">
|
20 |
-
<h3><?php echo $this->__('Order #%s - %s', $_order->getRealOrderId(), $_order->getStatusLabel()) ?></h3>
|
21 |
-
</div>
|
22 |
<?php foreach($this->getTickets() as $ticket):?>
|
23 |
<?php /** @var $ticket Laurent_OrderTickets_Model_Ticket */?>
|
24 |
<div class="ticket <?php echo $ticket->getType()?>">
|
7 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
8 |
* @author Laurent Clouet <laurent35240@gmail.com>
|
9 |
*/
|
10 |
+
|
|
|
11 |
/**
|
12 |
* @var $this Laurent_OrderTickets_Block_Chat
|
13 |
*/
|
14 |
|
15 |
$_order = $this->getOrder();
|
16 |
?>
|
|
|
|
|
|
|
|
|
17 |
<?php foreach($this->getTickets() as $ticket):?>
|
18 |
<?php /** @var $ticket Laurent_OrderTickets_Model_Ticket */?>
|
19 |
<div class="ticket <?php echo $ticket->getType()?>">
|
app/design/frontend/base/default/template/ordertickets/order/tabs.phtml
DELETED
@@ -1,17 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
/**
|
3 |
-
* @see Laurent_OrderTickets_Block_Order_Tabs
|
4 |
-
*/
|
5 |
-
?>
|
6 |
-
<ul class="order-tabs">
|
7 |
-
<li class="<?php if($this->pageIsOrderView()):?>active<?php endif; ?>">
|
8 |
-
<a href="<?php echo $this->getOrderViewLink() ?>" class="link-cart">
|
9 |
-
<?php echo $this->__('Details') ?>
|
10 |
-
</a>
|
11 |
-
</li>
|
12 |
-
<li class="<?php if($this->pageIsOrderChat()):?>active<?php endif; ?>">
|
13 |
-
<a href="<?php echo $this->getOrderChatLink() ?>" class="link-cart">
|
14 |
-
<?php echo $this->__('Messages') ?>
|
15 |
-
</a>
|
16 |
-
</li>
|
17 |
-
</ul>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Order_tickets</name>
|
4 |
-
<version>1.3.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/afl-3.0.php">Academic Free License (AFL 3.0)</license>
|
7 |
<channel>community</channel>
|
@@ -11,11 +11,11 @@
|
|
11 |
- customer can add message to orders
|
12 |
- administrator can see these messages, reply to them, change status of a chat and create new messages
|
13 |
- a cron also exists to send a reminder email to administrator about new messages</description>
|
14 |
-
<notes>
|
15 |
<authors><author><name>Laurent Clouet</name><user>auto-converted</user><email>laurent35240@gmail.com</email></author></authors>
|
16 |
-
<date>2013-
|
17 |
-
<time>
|
18 |
-
<contents><target name="magecommunity"><dir name="Laurent"><dir name="OrderTickets"><dir name="Block"><dir name="Adminhtml"><dir name="Chat"><dir name="Create"><dir name="Order"><file name="Grid.php" hash="c7f1c769d398155bd346edb8fe76d6bf"/></dir><dir name="Steptwo"><file name="Form.php" hash="00359248809a4f067f8c488fda650712"/></dir><file name="Form.php" hash="521cca1147cbcecdf66d6e25e42e93d4"/><file name="Order.php" hash="4b5cbda78abda88f5858b1b389ef5b75"/><file name="Steptwo.php" hash="3a439f520e3469d0499ddf4443df674f"/></dir><dir name="View"><dir name="Tab"><file name="Main.php" hash="03c4041d1cf51152b81960301c1a7a09"/><file name="Tickets.php" hash="1113741720801f3101ba7eea34be9e0f"/></dir><file name="Form.php" hash="39fdb499109549c3f343c558016bbeba"/><file name="Tabs.php" hash="f8013ba3783ab56b81ddf85a9322f6eb"/></dir><file name="Create.php" hash="12830fc66389cc498f31a08e75dcac6f"/><file name="Grid.php" hash="991c017b9bc30ea7d21abc37d5357d1f"/><file name="View.php" hash="878e4932d98a2c46c7a63ac01c3f9e28"/></dir><dir name="Customer"><dir name="Edit"><dir name="Tab"><file name="Tickets.php" hash="ed5185f29d37f483f7db8538773fe6a7"/></dir></dir></dir><dir name="Order"><dir name="View"><dir name="Tab"><file name="Tickets.php" hash="78cc90b8582578c6370fb1ae18aaa161"/></dir></dir></dir><file name="Chat.php" hash="1c2c452367328e34b5e887473e06a220"/></dir><
|
19 |
<compatible/>
|
20 |
<dependencies/>
|
21 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Order_tickets</name>
|
4 |
+
<version>1.3.2</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/afl-3.0.php">Academic Free License (AFL 3.0)</license>
|
7 |
<channel>community</channel>
|
11 |
- customer can add message to orders
|
12 |
- administrator can see these messages, reply to them, change status of a chat and create new messages
|
13 |
- a cron also exists to send a reminder email to administrator about new messages</description>
|
14 |
+
<notes>Messages view in front office changed in a more "Magento" style</notes>
|
15 |
<authors><author><name>Laurent Clouet</name><user>auto-converted</user><email>laurent35240@gmail.com</email></author></authors>
|
16 |
+
<date>2013-02-03</date>
|
17 |
+
<time>15:47:58</time>
|
18 |
+
<contents><target name="magecommunity"><dir name="Laurent"><dir name="OrderTickets"><dir name="Block"><dir name="Adminhtml"><dir name="Chat"><dir name="Create"><dir name="Order"><file name="Grid.php" hash="c7f1c769d398155bd346edb8fe76d6bf"/></dir><dir name="Steptwo"><file name="Form.php" hash="00359248809a4f067f8c488fda650712"/></dir><file name="Form.php" hash="521cca1147cbcecdf66d6e25e42e93d4"/><file name="Order.php" hash="4b5cbda78abda88f5858b1b389ef5b75"/><file name="Steptwo.php" hash="3a439f520e3469d0499ddf4443df674f"/></dir><dir name="View"><dir name="Tab"><file name="Main.php" hash="03c4041d1cf51152b81960301c1a7a09"/><file name="Tickets.php" hash="1113741720801f3101ba7eea34be9e0f"/></dir><file name="Form.php" hash="39fdb499109549c3f343c558016bbeba"/><file name="Tabs.php" hash="f8013ba3783ab56b81ddf85a9322f6eb"/></dir><file name="Create.php" hash="12830fc66389cc498f31a08e75dcac6f"/><file name="Grid.php" hash="991c017b9bc30ea7d21abc37d5357d1f"/><file name="View.php" hash="878e4932d98a2c46c7a63ac01c3f9e28"/></dir><dir name="Customer"><dir name="Edit"><dir name="Tab"><file name="Tickets.php" hash="ed5185f29d37f483f7db8538773fe6a7"/></dir></dir></dir><dir name="Order"><dir name="View"><dir name="Tab"><file name="Tickets.php" hash="78cc90b8582578c6370fb1ae18aaa161"/></dir></dir></dir><file name="Chat.php" hash="1c2c452367328e34b5e887473e06a220"/></dir><file name="Chat.php" hash="4b0247f7c114a894adba736e08cdda7c"/></dir><dir name="Controller"><dir name="Adminhtml"><file name="Chat.php" hash="43b419b5c2b5e6900051e6358153175d"/></dir></dir><dir name="Helper"><file name="Data.php" hash="93cacb500a03173347d3136403be13b1"/></dir><dir name="Model"><dir name="Config"><file name="Cron.php" hash="71180552ddcaa52e340668255ed871a0"/></dir><dir name="Mysql4"><dir name="Chat"><file name="Collection.php" hash="3765532820c8272190ad6bd65a42594d"/></dir><dir name="Ticket"><file name="Collection.php" hash="c04b0fe47e291380a57dce1939425b95"/></dir><file name="Chat.php" hash="105edfaafa9109c87dfb509b641decdc"/><file name="Ticket.php" hash="f9f4e7f6e9da8c110d5042760fe1183e"/></dir><file name="Abstract.php" hash="1c3cebb3cdfbba03c4b21198e2412bd5"/><file name="Chat.php" hash="17c4c6e412fd8fb398646b8d292d2c96"/><file name="Observer.php" hash="b6d6db35f8d63fc8cf6c8f9f96730e80"/><file name="Ticket.php" hash="a7d70471a959d82c6c9ff184d50eea9e"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="ChatController.php" hash="22110c7385e72f371bf36b7f1dfe4eab"/><file name="CreateController.php" hash="cbe6071edf569cbfd78036063e0c08f4"/></dir><file name="ChatController.php" hash="276a4b7488baed2fcbb8a10f6e066c4e"/></dir><dir name="etc"><file name="adminhtml.xml" hash="f4a61001efef301ff263010aad0ecb9d"/><file name="config.xml" hash="674993335fcc220b53816a63ea9c38fa"/><file name="system.xml" hash="33934d7e9443b340daa1b58b36294dc8"/></dir><dir name="sql"><dir name="ordertickets_setup"><file name="mysql4-install-0.1.0.php" hash="eaf0ed1190d400612f7eda66b51a28df"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="a59e90142a8ba64c370f59699878a7e1"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="ordertickets.xml" hash="066b893e6f6d4043f0d7ef0093d7d840"/></dir><dir name="template"><dir name="ordertickets"><dir name="chat"><dir name="create"><file name="abstract.phtml" hash="19cbea5ac678b9197b08c6d9e8f55880"/><file name="form.phtml" hash="5a45de144e3f0b6b52a2e2ee19450413"/></dir><dir name="view"><dir name="tab"><file name="tickets.phtml" hash="baa5371991469d993477bae28cfacf2f"/></dir></dir></dir><dir name="order"><dir name="view"><dir name="tab"><file name="tickets.phtml" hash="dee13d8912c7819fb96cd1695baee9b1"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="ordertickets.xml" hash="82ce89e2dcbea7d1d1373e137e44568f"/></dir><dir name="template"><dir name="ordertickets"><file name="chat.phtml" hash="e4c288559d263e369c54e5dfb870ac31"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Laurent_OrderTickets.xml" hash="46fdc0a685ad8d9144f4db4cb99f97fe"/></dir></target><target name="magelocale"><dir name="fr_FR"><file name="Laurent_OrderTickets.csv" hash="6a8cafdb0a9b7136cfbc7b30fe2edb2b"/></dir></target></contents>
|
19 |
<compatible/>
|
20 |
<dependencies/>
|
21 |
</package>
|
skin/frontend/base/default/css/ordertickets.css
DELETED
@@ -1,45 +0,0 @@
|
|
1 |
-
/*
|
2 |
-
Document : ordertikets
|
3 |
-
Created on : 30 avr. 2011, 13:33:15
|
4 |
-
Author : laurent
|
5 |
-
*/
|
6 |
-
|
7 |
-
ul.order-tabs {
|
8 |
-
margin: 1em 0 1em 0;
|
9 |
-
font: 12px arial, helvetica, sans-serif;
|
10 |
-
border-bottom: 1px solid #D0CBC1;
|
11 |
-
list-style-type: none;
|
12 |
-
padding: 3px 10px 3px 10px;
|
13 |
-
}
|
14 |
-
|
15 |
-
ul.order-tabs li {
|
16 |
-
display: inline;
|
17 |
-
margin-left: 10px;
|
18 |
-
}
|
19 |
-
|
20 |
-
ul.order-tabs li.active {
|
21 |
-
border-bottom: 1px solid #D6DCDC; /* set border color to page background color */
|
22 |
-
background-color: #D6DCDC; /* set background color to match above border color */
|
23 |
-
}
|
24 |
-
|
25 |
-
ul.order-tabs li.active a { /* settings for selected tab link */
|
26 |
-
background-color: #D6DCDC; /* set selected tab background color as desired */
|
27 |
-
color: #000; /* set selected tab link color as desired */
|
28 |
-
position: relative;
|
29 |
-
top: 1px;
|
30 |
-
padding-top: 4px; /* must change with respect to padding (X) above and below */
|
31 |
-
}
|
32 |
-
|
33 |
-
ul.order-tabs li a { /* settings for all tab links */
|
34 |
-
padding: 3px 4px; /* set padding (tab size) as desired; FIRST number must change with respect to padding-top (X) above */
|
35 |
-
border: 1px solid #D0CBC1; /* set border COLOR as desired; usually matches border color specified in .order-tabs */
|
36 |
-
background-color: #fff; /* set unselected tab background color as desired */
|
37 |
-
margin-right: 0px; /* set additional spacing between tabs as desired */
|
38 |
-
text-decoration: none;
|
39 |
-
border-bottom: none;
|
40 |
-
}
|
41 |
-
|
42 |
-
ul.order-tabs a:hover { /* settings for hover effect */
|
43 |
-
background: #D6DCDC; /* set desired hover color */
|
44 |
-
}
|
45 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|