Version Notes
Added configuration for showing the MatchScore in the order grid.
Re-styled the MatchScore tab layout.
Updated the grade labels and the messaging structure and language.
Download this release
Release Info
Developer | Matt Woodward |
Extension | WhitePages_PRO |
Version | 1.1.0 |
Comparing to | |
See all releases |
Code changes from version 1.0.1 to 1.1.0
- app/code/community/Wp/WhitePages/Block/Adminhtml/Sales/Order/Tab/MatchScore.php +4 -4
- app/code/community/Wp/WhitePages/Helper/Data.php +68 -8
- app/code/community/Wp/WhitePages/Model/MatchScore.php +23 -0
- app/code/community/Wp/WhitePages/Model/Observer.php +44 -35
- app/code/community/Wp/WhitePages/Model/System/Config/Source/MatchScore.php +1 -1
- app/code/community/Wp/WhitePages/etc/config.xml +2 -1
- app/code/community/Wp/WhitePages/etc/system.xml +11 -2
- app/code/community/Wp/WhitePages/sql/whitePages_setup/mysql4-upgrade-1.0.0-1.1.0.php +33 -0
- app/design/adminhtml/default/default/template/whitepages/order/view/tab/matchscore.phtml +70 -67
- package.xml +11 -6
- skin/adminhtml/default/default/whitepages.css +10 -0
app/code/community/Wp/WhitePages/Block/Adminhtml/Sales/Order/Tab/MatchScore.php
CHANGED
@@ -121,9 +121,9 @@ class Wp_WhitePages_Block_Adminhtml_Sales_Order_Tab_MatchScore extends Mage_Admi
|
|
121 |
public function getMatchScoreLabel($labelKey)
|
122 |
{
|
123 |
$labelArray = array(
|
124 |
-
'phone_name' => $this->__('Phone-Name
|
125 |
-
'address_name' => $this->__('Address-Name
|
126 |
-
'deliverable' => $this->__('
|
127 |
'family' => $this->__('Family Count'),
|
128 |
'spam' => $this->__('Phone Spam Score'),
|
129 |
'phone_type' => $this->__('Phone Type')
|
@@ -145,7 +145,7 @@ class Wp_WhitePages_Block_Adminhtml_Sales_Order_Tab_MatchScore extends Mage_Admi
|
|
145 |
{
|
146 |
return $this->_matchScore->getTransactionDetails();
|
147 |
}
|
148 |
-
|
149 |
|
150 |
/**
|
151 |
* ######################## TAB settings #################################
|
121 |
public function getMatchScoreLabel($labelKey)
|
122 |
{
|
123 |
$labelArray = array(
|
124 |
+
'phone_name' => $this->__('Phone-to-Name'),
|
125 |
+
'address_name' => $this->__('Address-to-Name'),
|
126 |
+
'deliverable' => $this->__('Address Status'),
|
127 |
'family' => $this->__('Family Count'),
|
128 |
'spam' => $this->__('Phone Spam Score'),
|
129 |
'phone_type' => $this->__('Phone Type')
|
145 |
{
|
146 |
return $this->_matchScore->getTransactionDetails();
|
147 |
}
|
148 |
+
|
149 |
|
150 |
/**
|
151 |
* ######################## TAB settings #################################
|
app/code/community/Wp/WhitePages/Helper/Data.php
CHANGED
@@ -41,19 +41,51 @@ class Wp_WhitePages_Helper_Data extends Mage_Core_Helper_Abstract
|
|
41 |
*
|
42 |
*/
|
43 |
|
44 |
-
public function getMatchScoreOptions()
|
45 |
{
|
46 |
-
$
|
47 |
-
|
48 |
-
|
49 |
-
|
50 |
-
|
51 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
52 |
}
|
53 |
-
|
54 |
return $matchScoresOptionArray;
|
55 |
}
|
56 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
57 |
public function isScoreDeclined($grade)
|
58 |
{
|
59 |
$declined = false;
|
@@ -77,4 +109,32 @@ class Wp_WhitePages_Helper_Data extends Mage_Core_Helper_Abstract
|
|
77 |
return 0;
|
78 |
}
|
79 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
80 |
}
|
41 |
*
|
42 |
*/
|
43 |
|
44 |
+
public function getMatchScoreOptions($select=false)
|
45 |
{
|
46 |
+
if($select == false)
|
47 |
+
{
|
48 |
+
$matchScoresOptionArray = array(
|
49 |
+
'A'=> $this->__('Match'),
|
50 |
+
'B'=> $this->__('Near Match'),
|
51 |
+
'C'=> $this->__('Near Match'),
|
52 |
+
'D'=> $this->__('Poor Match'),
|
53 |
+
'E'=> $this->__('Poor Match'),
|
54 |
+
'F'=> $this->__('No Match')
|
55 |
+
);
|
56 |
+
}
|
57 |
+
else
|
58 |
+
{
|
59 |
+
$grades = range('A', 'F');
|
60 |
+
|
61 |
+
foreach ($grades as $key => $value)
|
62 |
+
{
|
63 |
+
$matchScoresOptionArray[$value] = $value;
|
64 |
+
}
|
65 |
}
|
|
|
66 |
return $matchScoresOptionArray;
|
67 |
}
|
68 |
|
69 |
+
public function getMatchScoreAddressOptions()
|
70 |
+
{
|
71 |
+
$matchScoreAddressOptionsArray = array(
|
72 |
+
'A'=> $this->__('Receiving Mail'),
|
73 |
+
'F'=> $this->__('Not Receiving Mail ')
|
74 |
+
);
|
75 |
+
|
76 |
+
return $matchScoreAddressOptionsArray;
|
77 |
+
}
|
78 |
+
|
79 |
+
public function getMatchScorePhoneOptions()
|
80 |
+
{
|
81 |
+
$matchScoresPhoneOptionsArray = array(
|
82 |
+
'A'=> $this->__('Mobile or Landline'),
|
83 |
+
'F'=> $this->__('Non-fixed VoIP')
|
84 |
+
);
|
85 |
+
|
86 |
+
return $matchScoresPhoneOptionsArray;
|
87 |
+
}
|
88 |
+
|
89 |
public function isScoreDeclined($grade)
|
90 |
{
|
91 |
$declined = false;
|
109 |
return 0;
|
110 |
}
|
111 |
|
112 |
+
public function getMatchScoreOptionsLabel($grade, $key)
|
113 |
+
{
|
114 |
+
switch ($key)
|
115 |
+
{
|
116 |
+
case "phone_type":
|
117 |
+
$matchScoreOptions = $this->getMatchScorePhoneOptions();
|
118 |
+
break;
|
119 |
+
case "deliverable":
|
120 |
+
$matchScoreOptions = $this->getMatchScoreAddressOptions();
|
121 |
+
break;
|
122 |
+
default:
|
123 |
+
$matchScoreOptions = $this->getMatchScoreOptions();
|
124 |
+
break;
|
125 |
+
|
126 |
+
}
|
127 |
+
|
128 |
+
$matchScoreOptionsLabel = ( isset($matchScoreOptions[$grade]) ? $matchScoreOptions[$grade] : null);
|
129 |
+
|
130 |
+
if( $grade == null)
|
131 |
+
{
|
132 |
+
$matchScoreOptionsLabel = $this->__('n/a');
|
133 |
+
}elseif($matchScoreOptionsLabel == null)
|
134 |
+
{
|
135 |
+
$matchScoreOptionsLabel = $grade;
|
136 |
+
}
|
137 |
+
|
138 |
+
return $matchScoreOptionsLabel;
|
139 |
+
}
|
140 |
}
|
app/code/community/Wp/WhitePages/Model/MatchScore.php
CHANGED
@@ -130,4 +130,27 @@ class Wp_WhitePages_Model_MatchScore extends Mage_Core_Model_Abstract
|
|
130 |
{
|
131 |
return json_decode($this->getResult() ,true);
|
132 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
133 |
}
|
130 |
{
|
131 |
return json_decode($this->getResult() ,true);
|
132 |
}
|
133 |
+
|
134 |
+
public function getMessagesString($type,$fieldKey,$grade)
|
135 |
+
{
|
136 |
+
$detailedMatchScore = $this->getDetailedMatchScore();
|
137 |
+
$hasLabelValue = Mage::helper('whitePages')->getMatchScoreOptionsLabel($grade , $fieldKey );
|
138 |
+
|
139 |
+
if( ($fieldKey != 'phone_type') || ($fieldKey == 'phone_type' && $hasLabelValue == null) )
|
140 |
+
{
|
141 |
+
$messages = $detailedMatchScore[$type][$fieldKey]['messages'];
|
142 |
+
foreach ( $messages as $key => $message)
|
143 |
+
{
|
144 |
+
$pos = strripos( $message, 'but' );
|
145 |
+
if($pos != null)
|
146 |
+
{
|
147 |
+
$first = substr( $message, 0, $pos );
|
148 |
+
$second = substr( $message, $pos );
|
149 |
+
$messages[$key] = $first."<br>".$second;
|
150 |
+
}
|
151 |
+
}
|
152 |
+
}
|
153 |
+
|
154 |
+
return $messages;
|
155 |
+
}
|
156 |
}
|
app/code/community/Wp/WhitePages/Model/Observer.php
CHANGED
@@ -114,45 +114,54 @@ class Wp_WhitePages_Model_Observer
|
|
114 |
|
115 |
public function orderGridAddMatchScore($observer)
|
116 |
{
|
117 |
-
$
|
118 |
-
|
119 |
-
|
120 |
-
|
121 |
-
|
122 |
-
|
123 |
-
|
124 |
-
|
125 |
-
|
126 |
-
|
127 |
-
|
128 |
-
|
129 |
-
|
130 |
-
|
131 |
-
|
132 |
-
|
133 |
-
|
134 |
-
|
135 |
-
|
|
|
|
|
|
|
|
|
136 |
}
|
137 |
|
138 |
public function orderGridFilterCiollection($observer)
|
139 |
{
|
140 |
-
$
|
141 |
-
|
142 |
-
|
143 |
-
|
144 |
-
|
145 |
-
|
146 |
-
|
147 |
-
|
148 |
-
|
149 |
-
|
150 |
-
|
151 |
-
|
152 |
-
|
153 |
-
|
154 |
-
|
155 |
-
|
|
|
|
|
|
|
|
|
|
|
156 |
}
|
157 |
|
158 |
}
|
114 |
|
115 |
public function orderGridAddMatchScore($observer)
|
116 |
{
|
117 |
+
$showInOrderGrid = Mage::getStoreConfig('whitePages_configuration/match_score/show_in_order_grid');
|
118 |
+
if($showInOrderGrid == true)
|
119 |
+
{
|
120 |
+
$block = $observer->getBlock();
|
121 |
+
if (!isset($block)) {
|
122 |
+
return $this;
|
123 |
+
}
|
124 |
+
|
125 |
+
if($block->getId() == 'sales_order_grid')
|
126 |
+
{
|
127 |
+
$block->addColumnAfter('match_score', array(
|
128 |
+
'header' => 'MatchScore',
|
129 |
+
'index' => 'match_score',
|
130 |
+
'align' => 'center',
|
131 |
+
'width' => '75',
|
132 |
+
'renderer' => 'Wp_WhitePages_Block_Adminhtml_Sales_Order_Grid_Renderer_MatchScore',
|
133 |
+
'filter_index' => Mage::helper('whitePages')->getMatchScoreExpression('match_score'),
|
134 |
+
'type' => 'options',
|
135 |
+
'options' => Mage::helper('whitePages')->getMatchScoreOptions(true)
|
136 |
+
),
|
137 |
+
'grand_total');
|
138 |
+
}
|
139 |
+
}
|
140 |
}
|
141 |
|
142 |
public function orderGridFilterCiollection($observer)
|
143 |
{
|
144 |
+
$showInOrderGrid = Mage::getStoreConfig('whitePages_configuration/match_score/show_in_order_grid');
|
145 |
+
|
146 |
+
if($showInOrderGrid == true)
|
147 |
+
{
|
148 |
+
$block = $observer->getBlock();
|
149 |
+
if (!isset($block)) {
|
150 |
+
return $this;
|
151 |
+
}
|
152 |
+
|
153 |
+
if($block->getId() == 'sales_order_grid')
|
154 |
+
{
|
155 |
+
$collection = $block->getCollection();
|
156 |
+
$block->getCollection()->addFieldToSelect('match_score');
|
157 |
+
$collection->getSelect()->columns(array(
|
158 |
+
'match_score' => Mage::helper('whitePages')->getMatchScoreExpression('match_score'),
|
159 |
+
));
|
160 |
+
|
161 |
+
$block->setCollection($collection);
|
162 |
+
|
163 |
+
}
|
164 |
+
}
|
165 |
}
|
166 |
|
167 |
}
|
app/code/community/Wp/WhitePages/Model/System/Config/Source/MatchScore.php
CHANGED
@@ -34,7 +34,7 @@ class Wp_WhitePages_Model_System_Config_Source_MatchScore
|
|
34 |
*/
|
35 |
public function toOptionArray()
|
36 |
{
|
37 |
-
return (array(0=>Mage::helper('adminhtml')->__('Accept All Orders')) + Mage::helper('whitePages')->getMatchScoreOptions() );
|
38 |
}
|
39 |
|
40 |
/**
|
34 |
*/
|
35 |
public function toOptionArray()
|
36 |
{
|
37 |
+
return (array(0=>Mage::helper('adminhtml')->__('Accept All Orders')) + Mage::helper('whitePages')->getMatchScoreOptions(true) );
|
38 |
}
|
39 |
|
40 |
/**
|
app/code/community/Wp/WhitePages/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Wp_WhitePages>
|
5 |
-
<version>1.
|
6 |
</Wp_WhitePages>
|
7 |
</modules>
|
8 |
<frontend>
|
@@ -175,6 +175,7 @@
|
|
175 |
<match_score>
|
176 |
<decline>0</decline>
|
177 |
<message>Your order has been declined because of an issue with your billing or shipping information. Please contact us to complete your order.</message>
|
|
|
178 |
</match_score>
|
179 |
<reverse_lookup>
|
180 |
<enabled>1</enabled>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Wp_WhitePages>
|
5 |
+
<version>1.1.0</version>
|
6 |
</Wp_WhitePages>
|
7 |
</modules>
|
8 |
<frontend>
|
175 |
<match_score>
|
176 |
<decline>0</decline>
|
177 |
<message>Your order has been declined because of an issue with your billing or shipping information. Please contact us to complete your order.</message>
|
178 |
+
<show_in_order_grid>2</show_in_order_grid>
|
179 |
</match_score>
|
180 |
<reverse_lookup>
|
181 |
<enabled>1</enabled>
|
app/code/community/Wp/WhitePages/etc/system.xml
CHANGED
@@ -54,11 +54,20 @@
|
|
54 |
<show_in_website>1</show_in_website>
|
55 |
<show_in_store>1</show_in_store>
|
56 |
<fields>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
57 |
<decline>
|
58 |
<label>Decline Orders with Scores Below</label>
|
59 |
<frontend_type>select</frontend_type>
|
60 |
<source_model>whitePages/system_config_source_matchScore</source_model>
|
61 |
-
<sort_order>
|
62 |
<show_in_default>1</show_in_default>
|
63 |
<show_in_website>1</show_in_website>
|
64 |
<show_in_store>1</show_in_store>
|
@@ -67,7 +76,7 @@
|
|
67 |
<message>
|
68 |
<label>Decline Message</label>
|
69 |
<frontend_type>textarea</frontend_type>
|
70 |
-
<sort_order>
|
71 |
<show_in_default>1</show_in_default>
|
72 |
<show_in_website>1</show_in_website>
|
73 |
<show_in_store>1</show_in_store>
|
54 |
<show_in_website>1</show_in_website>
|
55 |
<show_in_store>1</show_in_store>
|
56 |
<fields>
|
57 |
+
<show_in_order_grid>
|
58 |
+
<label>Show in Order Grid</label>
|
59 |
+
<frontend_type>select</frontend_type>
|
60 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
61 |
+
<sort_order>10</sort_order>
|
62 |
+
<show_in_default>1</show_in_default>
|
63 |
+
<show_in_website>1</show_in_website>
|
64 |
+
<show_in_store>1</show_in_store>
|
65 |
+
</show_in_order_grid>
|
66 |
<decline>
|
67 |
<label>Decline Orders with Scores Below</label>
|
68 |
<frontend_type>select</frontend_type>
|
69 |
<source_model>whitePages/system_config_source_matchScore</source_model>
|
70 |
+
<sort_order>20</sort_order>
|
71 |
<show_in_default>1</show_in_default>
|
72 |
<show_in_website>1</show_in_website>
|
73 |
<show_in_store>1</show_in_store>
|
76 |
<message>
|
77 |
<label>Decline Message</label>
|
78 |
<frontend_type>textarea</frontend_type>
|
79 |
+
<sort_order>30</sort_order>
|
80 |
<show_in_default>1</show_in_default>
|
81 |
<show_in_website>1</show_in_website>
|
82 |
<show_in_store>1</show_in_store>
|
app/code/community/Wp/WhitePages/sql/whitePages_setup/mysql4-upgrade-1.0.0-1.1.0.php
ADDED
@@ -0,0 +1,33 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* @category Wp
|
4 |
+
* @package Wp_Whitepages
|
5 |
+
* @author WhitePages <support@whitepages.com>
|
6 |
+
* @copyright WhitePages Inc. (c) 2013
|
7 |
+
*
|
8 |
+
* THIS SOFTWARE AND RELATED SERVICE IS PROVIDED ON AN �AS IS� BASIS. TO THE FULLEST EXTENT
|
9 |
+
* PERMISSIBLE, WHITEPAGES AND ITS AFFILIATES DISCLAIM ALL WARRANTIES OF ANY KIND, EXPRESS
|
10 |
+
* OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF TITLE, NONINFRINGEMENT AND IMPLIED
|
11 |
+
* WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSEOR THOSE ARISING FROM
|
12 |
+
* COURSE OF DEALING OR USAGE OF TRADE. WITHOUT LIMITING THE FOREGOING, WHITEPAGES MAKES NO
|
13 |
+
* REPRESENTATIONS THAT (I) THE SOFTWARE OR RELATED SERVICE WILL MEET YOUR REQUIREMENTS OR BE
|
14 |
+
* ACCURATE, COMPLETE, RELIABLE OR ERROR FREE; (II) THAT THE SOFTWARE OR RELATED SERVICE
|
15 |
+
* ALWAYS BE AVAILABLE OR WILL BE UNINTERRUPTED, ACCESSIBLE, TIMELY, RESPONSIVE OR SECURE; OR
|
16 |
+
* (III) THAT ANY DEFECTS WILL BE CORRECTED, OR THAT THE SOFTWARE OR RELATED SERVICE WILL BE
|
17 |
+
* FREE FROM VIRUSES, �WORMS,� �TROJAN HORSES� OR OTHER HARMFUL PROPERTIES. YOU EXPRESSLY
|
18 |
+
* AGREE THAT USE IS AT YOUR SOLE RISK AND THAT YOU WILL BE SOLELY RESPONSIBLE FOR ANY DAMAGE
|
19 |
+
* TO YOUR COMPUTER SYSTEM OR LOSS OF DATA THAT RESULTS FROM AND FOR ANY DISCLOSURE OF
|
20 |
+
* INFORMATION THAT YOU UNDERTAKE WHILE USING THE SOFTWARE OR RELATED SERVICE. IN NO EVENT
|
21 |
+
* SHALL WHITEPAGES OR ITS AFFILIATES BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHERLIABILITY,
|
22 |
+
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION
|
23 |
+
* WITH THE SOFTWARE OR RELATED SERVICE.
|
24 |
+
*
|
25 |
+
*/
|
26 |
+
|
27 |
+
$installer = $this;
|
28 |
+
|
29 |
+
$installer->startSetup();
|
30 |
+
|
31 |
+
$installer->run("ALTER TABLE {$this->getTable('wp_match_score')} ADD KEY `order_id` (`order_id`);");
|
32 |
+
|
33 |
+
$installer->endSetup();
|
app/design/adminhtml/default/default/template/whitepages/order/view/tab/matchscore.phtml
CHANGED
@@ -71,77 +71,80 @@
|
|
71 |
|
72 |
</fieldset>
|
73 |
</div>
|
74 |
-
<div class="
|
75 |
-
<div class="entry-edit
|
76 |
-
<
|
77 |
-
|
78 |
-
<fieldset>
|
79 |
-
<div class="box-left">
|
80 |
-
<table cellspacing="2" class="data">
|
81 |
-
<tbody>
|
82 |
-
<tr>
|
83 |
-
<td style="width: 150px;"><strong><?php echo $this->__('Billing Info')?></strong></td>
|
84 |
-
<td style="width: 25px;"></td>
|
85 |
-
<td></td>
|
86 |
-
</tr>
|
87 |
-
<?php foreach ($detailedMatchScore['billing'] as $key => $value):?>
|
88 |
-
<?php if($key !='family'): //removing family temporarily until the data gets fixed in the WP API ?>
|
89 |
-
<tr>
|
90 |
-
<td><?php echo $this->getMatchScoreLabel($key)?></td>
|
91 |
-
<?php if($key =='family'):?>
|
92 |
-
<td><strong><?php echo count($value['names'])?></strong></td>
|
93 |
-
<td><?php echo (count($value['names']) > 1 ? " (". $this->getFamilyNames($value['names']). ")": '')?></td>
|
94 |
-
<?php else :?>
|
95 |
-
<td><strong class="grade-<?php echo $value['grade'] ?>"><?php echo $value['grade']?></strong></td>
|
96 |
-
<td><?php echo ($value['messages'] != null ? " (". implode(',', $value['messages']).")" : '')?></td>
|
97 |
-
<?php endif;?>
|
98 |
-
</tr>
|
99 |
-
<?php endif;?>
|
100 |
-
<?php endforeach;?>
|
101 |
-
<tr>
|
102 |
-
<td><br /></td>
|
103 |
-
<td> </td></tr>
|
104 |
-
<tr>
|
105 |
-
<td><strong><?php echo $this->__('Shipping Info')?></strong></td>
|
106 |
-
<td></td>
|
107 |
-
</tr>
|
108 |
-
<?php foreach ($detailedMatchScore['shipping'] as $key => $value):?>
|
109 |
-
|
110 |
-
<?php if($key !='family'): //removing family temporarily until the data gets fixed in the WP API ?>
|
111 |
-
<tr>
|
112 |
-
<td><?php echo $this->getMatchScoreLabel($key)?></td>
|
113 |
-
<?php if($key =='family'):?>
|
114 |
-
<td><strong><?php echo count($value['names'])?></strong></td>
|
115 |
-
<td><?php echo (count($value['names']) > 1 ? " (". $this->getFamilyNames($value['names']). ")": '')?></td>
|
116 |
-
<?php else :?>
|
117 |
-
<td><strong class="grade-<?php echo $value['grade'] ?>"><?php echo $value['grade']?></strong></td>
|
118 |
-
<td><?php echo ($value['messages'] != null ? " (". implode(',', $value['messages']).")" : '')?></td>
|
119 |
-
<?php endif;?>
|
120 |
-
</tr>
|
121 |
-
<?php endif;?>
|
122 |
-
<?php endforeach;?>
|
123 |
-
</tbody>
|
124 |
-
</table>
|
125 |
</div>
|
126 |
-
|
127 |
-
|
128 |
-
|
129 |
-
|
130 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
131 |
</div>
|
132 |
-
|
133 |
-
|
134 |
-
|
135 |
-
|
136 |
-
|
137 |
-
<td style="width: 150px;"><?php echo $this->__('Transaction Id')?></td>
|
138 |
-
<td><?php echo $transactionDetails['transaction_id'] ?></td>
|
139 |
-
</tr>
|
140 |
-
</tbody>
|
141 |
-
</table>
|
142 |
</div>
|
143 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
144 |
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
145 |
<?php else:?>
|
146 |
<h1 class=""><?php echo $this->__('No MatchScore Available')?></h1>
|
147 |
<p><?php echo $this->__('This order was created prior to the WhitePages PRO module being installed.')?></p>
|
71 |
|
72 |
</fieldset>
|
73 |
</div>
|
74 |
+
<div class="box-left">
|
75 |
+
<div class="entry-edit">
|
76 |
+
<div class="entry-edit-head">
|
77 |
+
<h4 class="icon-head"><?php echo $this->__('Billing Info')?></h4>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
78 |
</div>
|
79 |
+
<fieldset>
|
80 |
+
<ul>
|
81 |
+
<?php foreach ($detailedMatchScore['billing'] as $key => $value):?>
|
82 |
+
<?php if($key !='family'): //removing family temporarily until the data gets fixed in the WP API ?>
|
83 |
+
<li>
|
84 |
+
<strong><?php echo $this->getMatchScoreLabel($key)?>: <span class="grade-<?php echo $value['grade'] ?>"><?php echo Mage::helper('whitePages')->getMatchScoreOptionsLabel( $value['grade'], $key ) ?></strong>
|
85 |
+
<?php if($key =='family'):?>
|
86 |
+
<ul>
|
87 |
+
<li><strong><?php echo count($value['names'])?></strong></li>
|
88 |
+
<li><?php echo (count($value['names']) > 1 ? $this->getFamilyNames($value['names']) : '')?></li>
|
89 |
+
</ul>
|
90 |
+
<?php else :?>
|
91 |
+
<ul>
|
92 |
+
<li><?php echo ($value['messages'] != null ? implode(',', $matchSCore->getMessagesString('billing', $key, $value['grade']) ) : '')?></li>
|
93 |
+
</ul>
|
94 |
+
<?php endif;?>
|
95 |
+
</li>
|
96 |
+
<?php endif;?>
|
97 |
+
<?php endforeach;?>
|
98 |
+
</ul>
|
99 |
+
</fieldset>
|
100 |
</div>
|
101 |
+
</div>
|
102 |
+
<div class="box-right">
|
103 |
+
<div class="entry-edit">
|
104 |
+
<div class="entry-edit-head">
|
105 |
+
<h4 class="icon-head"><?php echo $this->__('Shipping Info')?></h4>
|
|
|
|
|
|
|
|
|
|
|
106 |
</div>
|
107 |
+
<fieldset>
|
108 |
+
<ul>
|
109 |
+
<?php foreach ($detailedMatchScore['shipping'] as $key => $value):?>
|
110 |
+
<?php if($key !='family'): //removing family temporarily until the data gets fixed in the WP API ?>
|
111 |
+
<li>
|
112 |
+
<strong><?php echo $this->getMatchScoreLabel($key)?>: <span class="grade-<?php echo $value['grade'] ?>"><?php echo Mage::helper('whitePages')->getMatchScoreOptionsLabel( $value['grade'], $key ) ?></strong>
|
113 |
+
<?php if($key =='family'):?>
|
114 |
+
<ul>
|
115 |
+
<li><strong><?php echo count($value['names'])?></strong></li>
|
116 |
+
<li><?php echo (count($value['names']) > 1 ? $this->getFamilyNames($value['names']) : '')?></li>
|
117 |
+
</ul>
|
118 |
+
<?php else:?>
|
119 |
+
<ul>
|
120 |
+
<li><?php echo ($value['messages'] != null ? implode(',', $matchSCore->getMessagesString('shipping', $key, $value['grade']) ) : '')?></li>
|
121 |
+
</ul>
|
122 |
+
<?php endif;?>
|
123 |
+
</li>
|
124 |
+
<?php endif;?>
|
125 |
+
<?php endforeach;?>
|
126 |
+
</ul>
|
127 |
+
</fieldset>
|
128 |
+
</div>
|
129 |
</div>
|
130 |
+
<div class="clear"></div>
|
131 |
+
<div class="entry-edit">
|
132 |
+
<div class="entry-edit-head">
|
133 |
+
<h4 class="icon-head"><?php echo $this->__('Transaction Details')?></h4>
|
134 |
+
</div>
|
135 |
+
<fieldset>
|
136 |
+
<div class="">
|
137 |
+
<table cellspacing="2" class="data">
|
138 |
+
<tbody>
|
139 |
+
<tr>
|
140 |
+
<td style="width: 150px;"><?php echo $this->__('Transaction Id')?></td>
|
141 |
+
<td><?php echo $transactionDetails['transaction_id'] ?></td>
|
142 |
+
</tr>
|
143 |
+
</tbody>
|
144 |
+
</table>
|
145 |
+
</div>
|
146 |
+
</fieldset>
|
147 |
+
</div>
|
148 |
<?php else:?>
|
149 |
<h1 class=""><?php echo $this->__('No MatchScore Available')?></h1>
|
150 |
<p><?php echo $this->__('This order was created prior to the WhitePages PRO module being installed.')?></p>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>WhitePages_PRO</name>
|
4 |
-
<version>1.0
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://pro.whitepages.com/magento/license">MITL</license>
|
7 |
<channel>community</channel>
|
@@ -29,11 +29,16 @@ WhitePages PRO’s Customer Lookup feature allows for much faster order ent
|
|
29 |

|
30 |
The WhitePages PRO extension is free to install. Pricing depends on usage. For more information please contact <a href="mailto:pro-sales@whitepages.com">pro-sales@whitepages.com</a>.
|
31 |
</description>
|
32 |
-
<notes>
|
|
|
|
|
|
|
|
|
|
|
33 |
<authors><author><name>Matt Woodward</name><user>MattWoodward</user><email>mwoodward@whitepages.com</email></author></authors>
|
34 |
-
<date>2013-
|
35 |
-
<time>
|
36 |
-
<contents><target name="magecommunity"><dir name="Wp"><dir name="WhitePages"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Create"><dir name="Form"><dir name="Account"><file name="Autocomplete.php" hash="ee74eecff99a6443399e87593940695a"/></dir></dir></dir><dir name="Grid"><dir name="Renderer"><file name="MatchScore.php" hash="7e560eab5cb98a60abc10a3ed6e26a5e"/></dir></dir><dir name="Tab"><file name="MatchScore.php" hash="
|
37 |
<compatible/>
|
38 |
-
<dependencies><required><php><min>5.0.
|
39 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>WhitePages_PRO</name>
|
4 |
+
<version>1.1.0</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://pro.whitepages.com/magento/license">MITL</license>
|
7 |
<channel>community</channel>
|
29 |

|
30 |
The WhitePages PRO extension is free to install. Pricing depends on usage. For more information please contact <a href="mailto:pro-sales@whitepages.com">pro-sales@whitepages.com</a>.
|
31 |
</description>
|
32 |
+
<notes>Added configuration for showing the MatchScore in the order grid. 
|
33 |
+

|
34 |
+
Re-styled the MatchScore tab layout.
|
35 |
+

|
36 |
+
Updated the grade labels and the messaging structure and language. 
|
37 |
+
</notes>
|
38 |
<authors><author><name>Matt Woodward</name><user>MattWoodward</user><email>mwoodward@whitepages.com</email></author></authors>
|
39 |
+
<date>2013-04-08</date>
|
40 |
+
<time>16:24:00</time>
|
41 |
+
<contents><target name="magecommunity"><dir name="Wp"><dir name="WhitePages"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Create"><dir name="Form"><dir name="Account"><file name="Autocomplete.php" hash="ee74eecff99a6443399e87593940695a"/></dir></dir></dir><dir name="Grid"><dir name="Renderer"><file name="MatchScore.php" hash="7e560eab5cb98a60abc10a3ed6e26a5e"/></dir></dir><dir name="Tab"><file name="MatchScore.php" hash="9732503396a6a66c1498e01a42938539"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Options"><file name="Button.php" hash="219d8673155453d0dd44036c7cc77895"/></dir></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="7ba5112a47cad382e767fe17ce493895"/></dir><dir name="Model"><file name="Api.php" hash="6acce704b8c3b17004fbafa6a84ba9eb"/><file name="AutocompleteAddress.php" hash="2bf0d3dad2002b6b3847eb6c8a8f7e7c"/><file name="MatchScore.php" hash="f86df9a1cc9d8d71cb827a794f8f9ec1"/><dir name="Mysql4"><dir name="MatchScore"><file name="Collection.php" hash="d75cf5ecc9243214c2ca90237bde033f"/></dir><file name="MatchScore.php" hash="06384b36c3ee5ccb28d7f42d0967c0c7"/></dir><file name="Observer.php" hash="1cd7f3149734249f8b972370dc18ce88"/><dir name="System"><dir name="Config"><dir name="Source"><file name="MatchScore.php" hash="e3f75328f33ff6951351ffd4c4b38f60"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="IndexController.php" hash="d1b44167985127410741354779b72af7"/></dir><file name="IndexController.php" hash="2f9313dac5f41eb2178a1f19ae5aa363"/></dir><dir name="etc"><file name="config.xml" hash="193dc3e96a17c5297e9ab2615a033d67"/><file name="system.xml" hash="5025668291a2316c0b3d783506996486"/></dir><dir name="sql"><dir name="whitePages_setup"><file name="mysql4-install-0.0.1.php" hash="6c4fb5bcfc4445ccd08ef57e69657ae1"/><file name="mysql4-upgrade-1.0.0-1.1.0.php" hash="512a104c6db27cc4304bd8d3ca9a4917"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><file name="whitepages.css" hash="858b0b4c3694be0a3287be36e5acf064"/><dir name="images"><file name="WPPRO-blue.png" hash="a475c0574d5c48540ee60a2a1fae6c56"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="whitePages.xml" hash="c10e2aba9197696f7508eb22e015b496"/></dir><dir name="template"><dir name="whitepages"><dir name="order"><dir name="create"><dir name="form"><dir name="account"><dir name="autocomplete"><file name="results.phtml" hash="a566f44620c43108392afeb3bc0375b6"/></dir><file name="autocomplete.phtml" hash="6de09d828f640e06f1124795e5cedf1f"/></dir><file name="account.phtml" hash="0acb1327a2203a855bf891a1d9e12fed"/></dir></dir><dir name="view"><dir name="tab"><file name="matchscore.phtml" hash="e76db365de4bfed993d4cb6639a57562"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="whitepages"><file name="autocompleteaddress.js" hash="4e1a6ca3f001996531b7b181b34822e2"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Wp_WhitePages.xml" hash="53d45a1a03cd134f07f23a8453c137b5"/></dir></target></contents>
|
42 |
<compatible/>
|
43 |
+
<dependencies><required><php><min>5.0.00</min><max>5.3.50</max></php></required></dependencies>
|
44 |
</package>
|
skin/adminhtml/default/default/whitepages.css
CHANGED
@@ -56,6 +56,11 @@
|
|
56 |
|
57 |
/* Styles for MatchScore */
|
58 |
|
|
|
|
|
|
|
|
|
|
|
59 |
.grade-A
|
60 |
{
|
61 |
color:green;
|
@@ -120,4 +125,9 @@
|
|
120 |
.matchscore .wp-logo img
|
121 |
{
|
122 |
float: right;
|
|
|
|
|
|
|
|
|
|
|
123 |
}
|
56 |
|
57 |
/* Styles for MatchScore */
|
58 |
|
59 |
+
|
60 |
+
.grade-A, .grade-B, .grade-C, .grade-D, .grade-E, .grade-F, .grade-
|
61 |
+
{
|
62 |
+
text-transform: uppercase;
|
63 |
+
}
|
64 |
.grade-A
|
65 |
{
|
66 |
color:green;
|
125 |
.matchscore .wp-logo img
|
126 |
{
|
127 |
float: right;
|
128 |
+
}
|
129 |
+
|
130 |
+
.matchscore fieldset ul li
|
131 |
+
{
|
132 |
+
margin-left: 10px;
|
133 |
}
|