Merge branch 'main' of https://github.com/fmido88/moodle-enrol_wallet

fmido88 · Feb 26, 2024 · 49f83a3 · 49f83a3
2 parents fb9c852 + 0486bb4
commit 49f83a3
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 4 deletions.
diff --git a/classes/output/wallet_balance.php b/classes/output/wallet_balance.php
@@ -135,6 +135,7 @@ public function export_for_template(renderer_base $output) {
             $tempctx->transfer     = !empty($transferenabled) ? $transfer : false;
             $tempctx->referral     = !empty($refenabled) ? $referral : false;
             $tempctx->policy       = !empty($policy) ? $policy : false;
+            $tempctx->walleturl    = (new moodle_url('/enrol/wallet/wallet.php#linkbalance'))->out();
         }
         $tempctx->currentuser = $this->currentuser;
         return $tempctx;

diff --git a/db/install.xml b/db/install.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="enrol/wallet/db" VERSION="20240220" COMMENT="XMLDB file for Moodle enrol/wallet"
+<XMLDB PATH="enrol/wallet/db" VERSION="20240226" COMMENT="XMLDB file for Moodle enrol/wallet"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
 >
@@ -89,7 +89,7 @@
       <FIELDS>
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
         <FIELD NAME="cond" TYPE="number" LENGTH="10" NOTNULL="true" SEQUENCE="false" DECIMALS="5"/>
-        <FIELD NAME="percent" TYPE="int" LENGTH="3" NOTNULL="true" SEQUENCE="false"/>
+        <FIELD NAME="percent" TYPE="number" LENGTH="3" NOTNULL="true" SEQUENCE="false" DECIMALS="2"/>
         <FIELD NAME="category" TYPE="int" LENGTH="10" NOTNULL="false" DEFAULT="0" SEQUENCE="false" COMMENT="The id of the category at which the conditional discount applied, 0 mean main balance discount"/>
         <FIELD NAME="timefrom" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
         <FIELD NAME="timeto" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>

diff --git a/db/upgrade.php b/db/upgrade.php
@@ -348,5 +348,20 @@ function xmldb_enrol_wallet_upgrade($oldversion) {
         // Wallet savepoint reached.
         upgrade_plugin_savepoint(true, 2024022500, 'enrol', 'wallet');
     }
+
+    if ($oldversion < 2024022619) {
+
+        // Changing type of field percent on table enrol_wallet_cond_discount to number.
+        $table = new xmldb_table('enrol_wallet_cond_discount');
+        $field = new xmldb_field('percent', XMLDB_TYPE_NUMBER, '4, 2', null, XMLDB_NOTNULL, null, null, 'cond');
+
+        // Launch change of type for field percent.
+        $dbman->change_field_precision($table, $field);
+        $dbman->change_field_type($table, $field);
+
+        // Wallet savepoint reached.
+        upgrade_plugin_savepoint(true, 2024022619, 'enrol', 'wallet');
+    }
+
     return true;
 }
diff --git a/templates/display.mustache b/templates/display.mustache
@@ -55,7 +55,13 @@
 <span class="hidden" data-uniqid="{{uniqid}}" data-identifier="uniqid"></span>
 <div style="text-align: center; padding-bottom: 0px;">
     {{# currentuser}}
-    <h3 class="wallet-heading" style="text-align: center;"> {{# str }} mywallet, enrol_wallet {{/ str }} </h3>
+    {{#walleturl}}
+    <a href="{{walleturl}}">
+    {{/walleturl}}
+        <h3 class="wallet-heading" style="text-align: center;"> {{# str }} mywallet, enrol_wallet {{/ str }} </h3>
+    {{#walleturl}}
+    </a>
+    {{/walleturl}}
     {{/ currentuser}}
     <div class="balance-card" style="text-align: center; direction: ltr;">
         {{# currentuser}}{{# str }} youhavebalance, enrol_wallet {{/ str }}{{/ currentuser}}<br>

diff --git a/templates/single-bundle.mustache b/templates/single-bundle.mustache
@@ -21,6 +21,16 @@
 
     Example context (json):
     {
+        formid: "123",
+        method: "post",
+        url: "https://example.com",
+        id: "456",
+        discount: "20",
+        after: "80",
+        before: "100",
+        currency: "EGP",
+        category: "sample",
+        description: "example discount"
     }
 }}
 

diff --git a/version.php b/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2024022500;
+$plugin->version   = 2024022619;
 $plugin->requires  = 2020061500;
 $plugin->component = 'enrol_wallet';
 $plugin->release   = '5.2.0';