Subversion Repositories SmartDukaan

Rev

Rev 31900 | Rev 31932 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 31900 Rev 31901
Line 13... Line 13...
13 
 
 13 
 
14 
    <!-- Bootstrap CSS -->
 14 
    <!-- Bootstrap CSS -->
15 
    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.1.3/dist/css/bootstrap.min.css"
 15 
    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.1.3/dist/css/bootstrap.min.css"
16 
        integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
 16 
        integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
17
17
- 
 
 18
- 
 
 19 
        <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
- 
 
 20 
        integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
- 
 
 21 
        crossorigin="anonymous"></script>
- 
 
 22
- 
 
 23 
        <script src="https://cdn.jsdelivr.net/npm/popper.js@1.14.3/dist/umd/popper.min.js"
- 
 
 24 
        integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49"
- 
 
 25 
        crossorigin="anonymous"></script>
- 
 
 26 
        <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.1.3/dist/js/bootstrap.min.js"
- 
 
 27 
        integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy"
- 
 
 28 
        crossorigin="anonymous"></script>
- 
 
 29
18 
        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
 30 
        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
19 
        <script type="text/javascript" src="resources/js/common.js?v=${version}"></script>
 31 
        <script type="text/javascript" src="resources/js/common.js?v=${version}"></script>
20
32
21 
        <script type="text/javascript" src="resources/js/retailer.js?v=${version}"></script>
 33 
        <script type="text/javascript" src="resources/js/retailer.js?v=${version}"></script>
22
34
Line 1015... Line 1027...
1015 
 
 1027 
 
1016 
 
 1028 
 
1017 
    <!-- Optional JavaScript -->
 1029 
    <!-- Optional JavaScript -->
1018 
    <!-- jQuery first, then Popper.js, then Bootstrap JS -->
 1030 
    <!-- jQuery first, then Popper.js, then Bootstrap JS -->
1019
1031
1020 
       <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
 - 
 
1021 
        integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
 - 
 
1022 
        crossorigin="anonymous"></script>
 - 
 
- 
 
 1032
- 
 
 1033 
 
1023 
 
 1034 
 
1024 
    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.14.3/dist/umd/popper.min.js"
 - 
 
1025 
        integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49"
 - 
 
1026 
        crossorigin="anonymous"></script>
 - 
 
1027 
    <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.1.3/dist/js/bootstrap.min.js"
 - 
 
1028 
        integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy"
 - 
 
1029 
        crossorigin="anonymous"></script>
 - 
 
1030 
    <script>
 1035 
    <script>
1031 
     var op = $chartInvestment;
1036 
     var op = $chartInvestment;
1032 
     var px = document.getElementById('chartInvestmentJSContainer').getContext('2d');
1037 
     var px = document.getElementById('chartInvestmentJSContainer').getContext('2d');
1033 
     var chart = new Chart(px,op);
 1038 
     var chart = new Chart(px,op);
1034 
     chart.update();
 1039 
     chart.update();