Subversion Repositories SmartDukaan

Rev

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

Rev 36080 Rev 36895
Line 23... Line 23...
23
                            <th>Partner Id</th>
23
                            <th>Partner Id</th>
24
                            <th>Partner Name</th>
24
                            <th>Partner Name</th>
25
                            <th>Catalog Id</th>
25
                            <th>Catalog Id</th>
26
                            <th>Model Number</th>
26
                            <th>Model Number</th>
27
                            <th>Brand</th>
27
                            <th>Brand</th>
-
 
28
                            <th>HID Qty</th>
-
 
29
                            <th>Bill/Act 5d</th>
-
 
30
                            <th>Current Qty</th>
-
 
31
                            <th>Excess/Short</th>
28
                            <th>Requested Allocation</th>
32
                            <th>Requested Qty</th>
-
 
33
                            <th>Requestor</th>
-
 
34
                            <th>Approver</th>
29
                            <th>Action</th>
35
                            <th>Action</th>
30
                        </tr>
36
                        </tr>
31
                        </thead>
37
                        </thead>
32
                        <tbody>
38
                        <tbody>
33
                            #foreach($model in $pendingRequestedHidAllocations)
39
                            #foreach($model in $pendingRequestedHidAllocations)
Line 36... Line 42...
36
                                <td> $userMap.get($model.getFofoId()).getName()
42
                                <td> $userMap.get($model.getFofoId()).getName()
37
                                    - $fofoStoreMap.get($model.getFofoId()).getCode() </td>
43
                                    - $fofoStoreMap.get($model.getFofoId()).getCode() </td>
38
                                <td> $model.getCatalogId() </td>
44
                                <td> $model.getCatalogId() </td>
39
                                <td> $model.getModelNumber() </td>
45
                                <td> $model.getModelNumber() </td>
40
                                <td> $model.getBrand() </td>
46
                                <td> $model.getBrand() </td>
-
 
47
                                <td> $hidQtyMap.get($model.getId()) </td>
-
 
48
                                <td> $billActMap.get($model.getId()) </td>
-
 
49
                                <td> $currentQtyMap.get($model.getId()) </td>
-
 
50
                                #set($es = $excessShortMap.get($model.getId()))
-
 
51
                                <td>#if($es > 0)<span style="color:red;">+$es</span>#elseif($es < 0)<span style="color:green;">$es</span>#else<span>0</span>#end</td>
41
                                <td><input type="text" value="$model.getRequested_allocation()"
52
                                <td><input type="text" value="$model.getRequested_allocation()"
42
                                           class="reuested_allocation" disabled> <a role="button"> <i
53
                                           class="reuested_allocation" disabled> <a role="button"> <i
43
                                        class="fa fa-edit edit-allocation"></i></a></td>
54
                                        class="fa fa-edit edit-allocation"></i></a></td>
-
 
55
                                <td> $!model.getCreatedBy() </td>
-
 
56
                                <td> $!model.getApprovedBy() </td>
44
                                <td>
57
                                <td>
45
                                    <button class="btn btn-sm btn-success allocation-request-approve-reject"
58
                                    <button class="btn btn-sm btn-success allocation-request-approve-reject"
46
                                            data-id="$model.getId()" data-status="true">Approve
59
                                            data-id="$model.getId()" data-status="true">Approve
47
                                    </button>
60
                                    </button>
48
                                    /
61
                                    /
Line 67... Line 80...
67
                            <th>Partner Id</th>
80
                            <th>Partner Id</th>
68
                            <th>Partner Name</th>
81
                            <th>Partner Name</th>
69
                            <th>Catalog Id</th>
82
                            <th>Catalog Id</th>
70
                            <th>Model Number</th>
83
                            <th>Model Number</th>
71
                            <th>Brand</th>
84
                            <th>Brand</th>
-
 
85
                            <th>HID Qty</th>
-
 
86
                            <th>Bill/Act 5d</th>
-
 
87
                            <th>Current Qty</th>
-
 
88
                            <th>Excess/Short</th>
72
                            <th>Requested Allocation</th>
89
                            <th>Requested Qty</th>
-
 
90
                            <th>Requestor</th>
-
 
91
                            <th>Approver</th>
73
                            <th>Action</th>
92
                            <th>Action</th>
74
                        </tr>
93
                        </tr>
75
                        </thead>
94
                        </thead>
76
                        <tbody>
95
                        <tbody>
77
                            #foreach($model in $approvedRequestedHidAllocations)
96
                            #foreach($model in $approvedRequestedHidAllocations)
Line 80... Line 99...
80
                                <td> $userMap.get($model.getFofoId()).getName()
99
                                <td> $userMap.get($model.getFofoId()).getName()
81
                                    - $fofoStoreMap.get($model.getFofoId()).getCode() </td>
100
                                    - $fofoStoreMap.get($model.getFofoId()).getCode() </td>
82
                                <td> $model.getCatalogId() </td>
101
                                <td> $model.getCatalogId() </td>
83
                                <td> $model.getModelNumber() </td>
102
                                <td> $model.getModelNumber() </td>
84
                                <td> $model.getBrand() </td>
103
                                <td> $model.getBrand() </td>
-
 
104
                                <td> $hidQtyMap.get($model.getId()) </td>
-
 
105
                                <td> $billActMap.get($model.getId()) </td>
-
 
106
                                <td> $currentQtyMap.get($model.getId()) </td>
-
 
107
                                #set($es = $excessShortMap.get($model.getId()))
-
 
108
                                <td>#if($es > 0)<span style="color:red;">+$es</span>#elseif($es < 0)<span style="color:green;">$es</span>#else<span>0</span>#end</td>
85
                                <td><input type="text" value="$model.getRequested_allocation()"
109
                                <td><input type="text" value="$model.getRequested_allocation()"
86
                                           class="reuested_allocation" disabled> <a role="button"> <i
110
                                           class="reuested_allocation" disabled> <a role="button"> <i
87
                                        class="fa fa-edit edit-allocation"></i></a></td>
111
                                        class="fa fa-edit edit-allocation"></i></a></td>
-
 
112
                                <td> $!model.getCreatedBy() </td>
-
 
113
                                <td> $!model.getApprovedBy() </td>
88
                                <td>
114
                                <td>
89
                                    <button class="btn btn-sm btn-danger allocation-request-approve-reject"
115
                                    <button class="btn btn-sm btn-danger allocation-request-approve-reject"
90
                                            data-id="$model.getId()" data-status="false">Reject
116
                                            data-id="$model.getId()" data-status="false">Reject
91
                                    </button>
117
                                    </button>
92
                                    <button class="btn btn-sm btn-info allocation-request-edit"
118
                                    <button class="btn btn-sm btn-info allocation-request-edit"