Merge branch 'r-1902001-01' into foodcourt

2020-07-11 04:00:55 +06:30
parent 4b0d7294ae 13fcb69dee
commit 2ee1fc2423
99 changed files with 2085 additions and 1781 deletions
--- a/app/views/layouts/CRM.html.erb
+++ b/app/views/layouts/CRM.html.erb
@@ -31,6 +31,7 @@
            <p>Please wait...</p>
        </div>
    </div>
+    <%= render 'shared/license_expire_warning' if Rails.env.production? %>
    <!-- #END# Page Loader -->
    <!-- Overlay For Sidebars -->
    <div class="overlay"></div>