V5`

fmido88 · Feb 3, 2024 · 3cdbd04 · 3cdbd04
1 parent bc67275
commit 3cdbd04
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 30 deletions.
diff --git a/amd/build/balance.min.js.map b/amd/build/balance.min.js.map
diff --git a/amd/build/cdiscount.min.js.map b/amd/build/cdiscount.min.js.map
diff --git a/amd/src/balance.js b/amd/src/balance.js
@@ -31,7 +31,7 @@ let userInput;
 /**
  * Get the balance data through ajax call.
  */
-function get_data() {
+function getData() {
     let userid = parseInt(userInput.value);
 
     if (userid && !isNaN(userid)) {
@@ -63,7 +63,7 @@ export const init = (formid) => {
     userInput = form.querySelector("[name=userlist]");
 
     button.onclick = () => {
-        get_data();
+        getData();
     };
     userInput.onchange = () => {
         holder.innerHTML = '';

diff --git a/amd/src/cdiscount.js b/amd/src/cdiscount.js
@@ -29,9 +29,6 @@ let categoryInput;
 let valueAfterInput;
 let chargingLabel = '';
 let calculateValueHolder;
-// let conditions = [];
-// let discounts = [];
-// let categories = [];
 let rules = [];
 
 /**
@@ -88,7 +85,7 @@ function addListenersChargerForm() {
 }
 
 /**
- * continue the procedure of the charger form.
+ * Continue the procedure of the charger form.
  */
 function proceedChargerForm() {
     calculateValueHolder = form.querySelector("[data-holder=calculated-value]");
@@ -172,7 +169,7 @@ export const init = (formid, formType) => {
     categoryInput = form.querySelector("[name=category]");
 
     for (let i = 1; ; i++) {
-        let element = form.querySelector("[name=discount_rule_"+ i +"]");
+        let element = form.querySelector("[name=discount_rule_" + i + "]");
         if (!element) {
             break;
         }
@@ -183,22 +180,6 @@ export const init = (formid, formType) => {
         rules.push(object);
     }
 
-    // for (let i = 1; ; i++) {
-    //     let element = form.querySelector("[name=condition"+ i +"]");
-    //     if (!element) {
-    //         break;
-    //     }
-    //     conditions.push(parseFloat(element.value));
-    // }
-
-    // for (let i = 1; ; i++) {
-    //     let element = form.querySelector("[name=category"+ i +"]");
-    //     if (!element) {
-    //         break;
-    //     }
-    //     categories.push(parseInt(element.value));
-    // }
-
     if (formType == 'charge') {
         proceedChargerForm();
     } else {

diff --git a/templates/display.mustache b/templates/display.mustache
@@ -33,7 +33,21 @@
         "norefund": 30,
         "policy": "something",
         "transfer": "<a href='https://your-moodle.com/enrol/wallet/extra/transfer.php'>transfer</a>",
-        "referral": "<a href='https://your-moodle.com/enrol/wallet/extra/referral.php'>referral</a>"
+        "referral": "<a href='https://your-moodle.com/enrol/wallet/extra/referral.php'>referral</a>",
+        "currentuser": true,
+        "catdetails": [
+            {
+                name: "some category",
+                refundable: 20,
+                nonrefundable: 100,
+                total: 120
+            },
+            {
+                name: "Another one",
+                refundable: 10,
+                nonrefundable: 5,
+                total: 15
+            }]
     }
 
 }}
@@ -43,7 +57,7 @@
     <h3 class="wallet-heading" style="text-align: center;"> {{# str }} mywallet, enrol_wallet {{/ str }} </h3>
     {{/ currentuser}}
     <p style="text-align: center; direction: ltr;">
-        <div class="balance-card" style="text-align: center; direction: ltr;">{{#currentuser}}{{# str }} youhavebalance, enrol_wallet {{/ str }}{{/currentuser}}<br>
+        <div class="balance-card" style="text-align: center; direction: ltr;">{{# currentuser}}{{# str }} youhavebalance, enrol_wallet {{/ str }}{{/ currentuser}}<br>
             <strong><span class="wallet-ballance" style="font-size: x-large;">{{balance}} {{currency}}</span></strong><br>
             {{#currentuser}}{{# str }} inyourwallet, enrol_wallet {{/ str }} <br>{{/currentuser}}
             <span class="wallet-ballance">{{# str }} mainbalance, enrol_wallet {{/ str }} {{main}} {{currency}}</span><br>

diff --git a/tests/coupons_test.php b/tests/coupons_test.php
@@ -693,7 +693,7 @@ protected function setUp() :void {
             $this->wallet->update_status($instance, ENROL_INSTANCE_ENABLED);
             $inst = 'inst' . $i;
             $this->$inst = $instance;
-            if ($i <= 4) {
+            if ($i <= 3) {
                 $record = new \stdClass;
                 $record->section = 1;
                 $record->course = $this->$var->id;

diff --git a/tests/turn_non_refundable_test.php b/tests/turn_non_refundable_test.php
@@ -141,7 +141,7 @@ public function test_check_transform_validation(): void {
         $this->assertEquals($output2, 200);
 
         // Not transform what already used.
-        $op->debit(50);
+        $op->debit(50, $op::OTHER);
         $output3 = $task->check_transform_validation($data, $trace);
         $this->assertEquals($output3, 150);
 

diff --git a/tests/util/instance_test.php b/tests/util/instance_test.php
@@ -142,7 +142,7 @@ public function test_get_cost_after_discount(): void {
      * Testing discounts after first and second repurchase
      * @covers ::get_cost_after_discount
      */
-    public function test_repurchase_discount_and_function() {
+    public function test_repurchase_discount_and_function():void {
         global $DB;
         $this->resetAfterTest();
         $wallet = new enrol_wallet_plugin;