Skip to content

Commit

Permalink
Implemented #1217
Browse files Browse the repository at this point in the history
  • Loading branch information
Al Brookbanks committed Sep 2, 2016
1 parent 9ff372a commit c430797
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 11 deletions.
7 changes: 5 additions & 2 deletions admin/skins/default/templates/products.reviews.php
View file
Expand Up @@ -97,9 +97,12 @@
{/if}
{if $DISPLAY_FORM}
<div id="review" class="tab_content">
<h3>{$LANG.reviews.title_review_edit}</h3>
<h3>{if $FORM_MODE=='edit'}{$LANG.reviews.title_review_edit}{else}{$LANG.catalogue.add_review}{/if}</h3>
<fieldset>
<div><label for="review_name">{$LANG.common.status}</label><span><input type="hidden" class="toggle" name="review[approved]" id="review_approved" value="{$REVIEW.approved}"></span></div>
{if $FORM_MODE=='add'}
<div><label for="ajax_name">{$LANG.common.product}</label><span><input type="hidden" id="ajax_product_id" name="review[product_id]" rel="product_id"><input type="text" id="ajax_name" placeholder="{$LANG.common.type_to_search}" class="textbox ajax not-empty" rel="product"></span></div>
{/if}
<div><label for="review_approved">{$LANG.common.status}</label><span><input type="hidden" class="toggle" name="review[approved]" id="review_approved" value="{$REVIEW.approved}"></span></div>
<div><label for="review_name">{$LANG.common.name}</label><span><input type="text" name="review[name]" id="review_name" value="{$REVIEW.name}" class="textbox"></span></div>
<div><label for="review_email">{$LANG.common.email}</label><span><input type="text" name="review[email]" id="review_email" value="{$REVIEW.email}" class="textbox"></span></div>
<div><label for="review_title">{$LANG.documents.document_title}</label><span><input type="text" name="review[title]" id="review_title" value="{$REVIEW.title}" class="textbox"></span></div>
Expand Down
47 changes: 38 additions & 9 deletions admin/sources/products.reviews.inc.php
View file
Expand Up @@ -50,7 +50,7 @@
}

## Update Review
if (isset($_POST['review']) && is_array($_POST['review']) && is_numeric($_POST['review']['id']) && Admin::getInstance()->permissions('reviews', CC_PERM_EDIT)) {
if (isset($_POST['review']) && is_array($_POST['review']) && Admin::getInstance()->permissions('reviews', CC_PERM_EDIT)) {
$record = array(
'approved' => $_POST['review']['approved'],
'name' => $_POST['review']['name'],
Expand All @@ -60,14 +60,36 @@
'rating' => (isset($_POST['rating']) && is_numeric($_POST['rating'])) ? (int)$_POST['rating'] : 0,
);

if ($GLOBALS['db']->update('CubeCart_reviews', $record, array('id' => (int)$_POST['review']['id']))) {
$GLOBALS['main']->setACPNotify($lang['reviews']['notify_review_update']);
$rem_array = array('edit');
if(is_numeric($_POST['review']['id'])) {
if ($GLOBALS['db']->update('CubeCart_reviews', $record, array('id' => (int)$_POST['review']['id']))) {
$GLOBALS['main']->setACPNotify($lang['reviews']['notify_review_update']);
$rem_array = array('edit');
} else {
$GLOBALS['main']->setACPWarning($lang['reviews']['error_review_update']);
$rem_array = false;
}
} else {
$GLOBALS['main']->setACPWarning($lang['reviews']['error_review_update']);
$rem_array = false;
$record['ip_address'] = get_ip_address();
$record['customer_id'] = 0;
$record['product_id'] = $_POST['review']['product_id'];

if(!empty($_POST['review']['product_id']) && is_numeric($_POST['review']['product_id'])) {
if($GLOBALS['db']->insert('CubeCart_reviews', $record)) {
$GLOBALS['main']->setACPNotify($lang['reviews']['notify_review_added']);
$rem_array = array('edit');
} else {
$GLOBALS['main']->setACPWarning($lang['reviews']['error_review_added']);
$rem_array = false;
}
} else {
$no_redirect = true;
$GLOBALS['smarty']->assign('REVIEW', $record);
$GLOBALS['main']->setACPWarning($lang['reviews']['error_no_product_selected']);
}
}
if(!isset($no_redirect)) {
httpredir(currentPage($rem_array));
}
httpredir(currentPage($rem_array));
}

## Approve reviews
Expand Down Expand Up @@ -124,9 +146,15 @@
$GLOBALS['gui']->addBreadcrumb($lang['reviews']['title_reviews'], currentPage(array('edit', 'field', 'sort', 'product_id', 'approved')));

if (isset($_GET['edit']) && is_numeric($_GET['edit']) && Admin::getInstance()->permissions('reviews', CC_PERM_EDIT)) {
$GLOBALS['main']->addTabControl($lang['reviews']['title_review_edit'], 'review');

// Edit review
if (($reviews = $GLOBALS['db']->select('CubeCart_reviews', false, array('id' => (int)$_GET['edit']))) !== false) {
if($_GET['edit']==0) {
$GLOBALS['main']->addTabControl($lang['catalogue']['add_review'], 'review');
$GLOBALS['smarty']->assign('FORM_MODE', 'add');
$GLOBALS['smarty']->assign('DISPLAY_FORM', true);
} else if (($reviews = $GLOBALS['db']->select('CubeCart_reviews', false, array('id' => (int)$_GET['edit']))) !== false) {
$GLOBALS['main']->addTabControl($lang['reviews']['title_review_edit'], 'review');
$GLOBALS['smarty']->assign('FORM_MODE', 'edit');
$review = $reviews[0];
$GLOBALS['gui']->addBreadcrumb($review['title'], currentPage());
for ($i=1; $i<=5; $i++) {
Expand All @@ -140,6 +168,7 @@
} else {

$GLOBALS['main']->addTabControl($lang['reviews']['title_reviews'], 'reviews');
$GLOBALS['main']->addTabControl($lang['catalogue']['add_review'], '','?_g=products&node=reviews&edit=0');
$GLOBALS['main']->addTabControl($lang['reviews']['title_bulk_delete'], 'bulk_delete');
$GLOBALS['main']->addTabControl($lang['common']['search'], 'search');

Expand Down
4 changes: 4 additions & 0 deletions language/definitions.xml
View file
Expand Up @@ -509,6 +509,7 @@
<string name="vote_down" introduced="5.0.0"><![CDATA[Vote Down]]></string>
<string name="vote_up" introduced="5.0.0"><![CDATA[Vote Up]]></string>
<string name="write_a_review" introduced="5.0.0"><![CDATA[Write a review]]></string>
<string name="add_review" introduced="6.1.0"><![CDATA[Add review]]></string>
<string name="write_review" introduced="5.0.0"><![CDATA[Write Review]]></string>
<string name="your_email" introduced="5.0.0"><![CDATA[Your Email]]></string>
<string name="your_name" introduced="5.0.0"><![CDATA[Your Name]]></string>
Expand Down Expand Up @@ -1649,15 +1650,18 @@
<string name="title_reports_from_to" introduced="5.0.0"><![CDATA[Sales report form %1$s to %2$s]]></string>
</group>
<group name="reviews">
<string name="error_no_product_selected" introduced="6.1.0"><![CDATA[No product selected.]]></string>
<string name="error_review_delete" introduced="5.0.0"><![CDATA[Failed to delete review.]]></string>
<string name="error_review_update" introduced="5.0.0"><![CDATA[Failed to update review.]]></string>
<string name="error_review_added" introduced="6.1.0"><![CDATA[Failed to add review.]]></string>
<string name="error_reviews_none" introduced="5.0.0"><![CDATA[No reviews have been made.]]></string>
<string name="filter_approved" introduced="5.0.0"><![CDATA[Showing approved reviews]]></string>
<string name="filter_by_product" introduced="5.0.0"><![CDATA[Filter by Product]]></string>
<string name="filter_unapproved" introduced="5.0.0"><![CDATA[Showing unapproved reviews]]></string>
<string name="notify_review_delete" introduced="5.0.0"><![CDATA[Review successfully deleted.]]></string>
<string name="notify_review_status" introduced="5.0.0"><![CDATA[Review statuses updated.]]></string>
<string name="notify_review_update" introduced="5.0.0"><![CDATA[Review successfully updated.]]></string>
<string name="notify_review_added" introduced="6.1.0"><![CDATA[Review successfully added.]]></string>
<string name="title_reviews" introduced="5.0.0"><![CDATA[Product Reviews]]></string>
<string name="title_bulk_delete" introduced="5.2.5"><![CDATA[Bulk Delete]]></string>
<string name="bulk_delete_desc" introduced="5.2.5"><![CDATA[To delete multiple reviews at once please enter an ip address and/or email address and click &quot;Submit&quot;. This can't be undone.]]></string>
Expand Down

0 comments on commit c430797

Please sign in to comment.