Skip to content

E
edx-platform
Commit 4ecb8460 by Muhammad Shoaib
Options

Ex-79 Bug Fixed. If there is no coupon code, 'Generate Registration Codes'… 

Ex-79 Bug Fixed. If there is no coupon code,  'Generate Registration Codes' modal dialog does not appear
parent b3594b69
Showing with 14 additions and 15 deletions
lms/templates/instructor/instructor_dashboard_2/e-commerce.html
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
<h3 class="error-msgs" id="error-msg"></h3> <h3 class="error-msgs" id="error-msg"></h3>
<div id = "accordion"> <div id = "accordion">
<div class="wrap"> <div class="wrap">
<h2>Registration Codes</h2> <h2>${_('Registration Codes')}</h2>
<div> <div>
<span class="code_tip">Click to generate Registration Codes <span class="code_tip">${_('Click to generate Registration Codes')}
<a id="registration_code_generation_link" href="#reg_code_generation_modal" class="add blue-button">Generate Registration Codes</a> <a id="registration_code_generation_link" href="#reg_code_generation_modal" class="add blue-button">${_('Generate Registration Codes')}</a>
</span> </span>
<p>Click to generate a CSV file of all Course Registrations Codes:</p> <p>${_('Click to generate a CSV file of all Course Registrations Codes:')}</p>
<p> <p>
<form action="${ section_data['get_registration_code_csv_url'] }" id="download_registration_codes" method="post"> <form action="${ section_data['get_registration_code_csv_url'] }" id="download_registration_codes" method="post">
<input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }"> <input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<input type="submit" name="list-registration-codes-csv" value="${_("Download Registration Codes")}" data-csv="true"> <input type="submit" name="list-registration-codes-csv" value="${_("Download Registration Codes")}" data-csv="true">
</form> </form>
</p> </p>
<p>Click to generate a CSV file of all Active Course Registrations Codes:</p> <p>${_('Click to generate a CSV file of all Active Course Registrations Codes:')}</p>
<p> <p>
<form action="${ section_data['active_registration_code_csv_url'] }" id="active_registration_codes" method="post"> <form action="${ section_data['active_registration_code_csv_url'] }" id="active_registration_codes" method="post">
<input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }"> <input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<input type="submit" name="active-registration-codes-csv" value="${_("Active Registration Codes")}" data-csv="true"> <input type="submit" name="active-registration-codes-csv" value="${_("Active Registration Codes")}" data-csv="true">
</form> </form>
</p> </p>
<p>Click to generate a CSV file of all Spent Course Registrations Codes:</p> <p>${_('Click to generate a CSV file of all Spent Course Registrations Codes:')}</p>
<p> <p>
<form action="${ section_data['spent_registration_code_csv_url'] }" id="spent_registration_codes" method="post"> <form action="${ section_data['spent_registration_code_csv_url'] }" id="spent_registration_codes" method="post">
<input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }"> <input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
<input type="submit" name="spent-registration-codes-csv" value="${_("Spent Registration Codes")}" data-csv="true"> <input type="submit" name="spent-registration-codes-csv" value="${_("Spent Registration Codes")}" data-csv="true">
</form> </form>
</p> </p>
<a id="registration_code_generation_link-trigger" href="#registration_code_generation_modal" rel="leanModal"></a>
</div> </div>
</div> </div>
<!-- end wrap --> <!-- end wrap -->
...@@ -45,7 +46,7 @@ ...@@ -45,7 +46,7 @@
<div> <div>
<span class="tip">${_("Course Price: ")}<span>$${section_data['course_price']}</span> <span class="tip">${_("Course Price: ")}<span>$${section_data['course_price']}</span>
%if section_data['access']['finance_admin'] is True: %if section_data['access']['finance_admin'] is True:
<a id="course_price_link" href="#set-course-mode-price-modal" rel="leanModal" class="add blue-button">+ Set Price</a> <a id="course_price_link" href="#set-course-mode-price-modal" rel="leanModal" class="add blue-button">+ ${_('Set Price')}</a>
%endif %endif
</span> </span>
</div> </div>
...@@ -90,7 +91,7 @@ ...@@ -90,7 +91,7 @@
</span> </span>
<span class="tip">${_("Coupons Information")} <a id="add_coupon_link" href="#add-coupon-modal" rel="leanModal" <span class="tip">${_("Coupons Information")} <a id="add_coupon_link" href="#add-coupon-modal" rel="leanModal"
class="add blue-button">${_("+ Add Coupon")}</a></span> class="add blue-button">+ ${_("Add Coupon")}</a></span>
<div class="wrapper-content wrapper"> <div class="wrapper-content wrapper">
<section class="content"> <section class="content">
%if len(section_data['coupons']): %if len(section_data['coupons']):
...@@ -111,20 +112,19 @@ ...@@ -111,20 +112,19 @@
%else: %else:
<tr class="coupons-items"> <tr class="coupons-items">
%endif %endif
<td>${coupon.code}</td> <td>${_('{code}').format(code=coupon.code)}</td>
<td>${coupon.description}</td> <td>${_('{description}').format(description=coupon.description)}</td>
<td>${coupon.percentage_discount}</td> <td>${_('{discount}').format(discount=coupon.percentage_discount)}</td>
<td> <td>
${ coupon.couponredemption_set.all().count() } ${ coupon.couponredemption_set.all().count() }
</td> </td>
<!--<td>${coupon.is_active}</td>--> <!--<td>${coupon.is_active}</td>-->
<td><a data-item-id="${coupon.id}" class='remove_coupon' href='#'>[x]</a><a href="#edit-modal" data-item-id="${coupon.id}" class="edit-right">Edit</a></td> <td><a data-item-id="${coupon.id}" class='remove_coupon' href='#'>[x]</a><a href="#edit-modal" data-item-id="${coupon.id}" class="edit-right">${_('Edit')}</a></td>
</tr> </tr>
%endfor %endfor
</tbody> </tbody>
</table> </table>
<a id="edit-modal-trigger" href="#edit-coupon-modal" rel="leanModal"></a> <a id="edit-modal-trigger" href="#edit-coupon-modal" rel="leanModal"></a>
<a id="registration_code_generation_link-trigger" href="#registration_code_generation_modal" rel="leanModal"></a>
%endif %endif
</section> </section>
</div> </div>
......
lms/templates/instructor/instructor_dashboard_2/edit_coupon_modal.html
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<ol class="list-input"> <ol class="list-input">
<li class="field required text" id="edit-coupon-modal-field-code"> <li class="field required text" id="edit-coupon-modal-field-code">
<label for="edit_coupon_code" class="required">${_("Code")}</label> <label for="edit_coupon_code" class="required">${_("Code")}</label>
<input class="field readonly" id="edit_coupon_code" type="text" name="code" maxlength="16" value="" placeholder="example: A123DS" <input class="field readonly" id="edit_coupon_code" type="text" name="code" maxlength="16" value="" placeholder="${_('example: A123DS')}"
readonly aria-required="true"/> readonly aria-required="true"/>
</li> </li>
<li class="field required text" id="edit-coupon-modal-field-discount"> <li class="field required text" id="edit-coupon-modal-field-discount">
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
<input class="field readonly" id="edit_coupon_course_id" type="text" name="course_id" value="" <input class="field readonly" id="edit_coupon_course_id" type="text" name="course_id" value=""
readonly aria-required="true"/> readonly aria-required="true"/>
</li> </li>
</ol> </ol>
</fieldset> </fieldset>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment