Subversion Repositories SmartDukaan

Rev

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

Rev 35592 Rev 35594
Line 146... Line 146...
146 
                        <th>Category</th>
 146 
                        <th>Category</th>
147 
                        <th>SubCategory</th>
 147 
                        <th>SubCategory</th>
148 
                        <th>Message</th>
 148 
                        <th>Message</th>
149 
                        <th>Created By</th>
 149 
                        <th>Created By</th>
150 
                        <th>Created TimeStamp</th>
 150 
                        <th>Created TimeStamp</th>
- 
 
 151 
                        #if($isCrmUser)
- 
 
 152 
                            <th>Assign</th>
- 
 
 153 
                        #end
151 
                        #if($roleType)
 154 
                        #if($roleType)
152 
                            <th>Action</th>
 155 
                            <th>Action</th>
153 
                        #else
 156 
                        #else
154 
                            <th>Action</th>
 157 
                            <th>Action</th>
155 
                        #end
 158 
                        #end
Line 159... Line 162...
159 
                        #if($tickets.size()>0)
 162 
                        #if($tickets.size()>0)
160 
                            #foreach($ticket in $tickets)
 163 
                            #foreach($ticket in $tickets)
161 
                            <tr>
 164 
                            <tr>
162 
                                <td>$ticket.getId()</td>
 165 
                                <td>$ticket.getId()</td>
163 
                                #if($roleType)
 166 
                                #if($roleType)
164 
                                    <td>$fofoIdsAndCustomRetailer.get($ticket.getFofoId()).getBusinessName()</td>
 167 
                                    <td><a href="#" class="partner-link" data-fofoid="$ticket.getFofoId()">$fofoIdsAndCustomRetailer.get($ticket.getFofoId()).getBusinessName()</a></td>
165 
                                #end
 168 
                                #end
166 
                                <td>$subCategoryIdAndCategoryMap.get($ticket.getSubCategoryId()).getName()</td>
 169 
                                <td>$subCategoryIdAndCategoryMap.get($ticket.getSubCategoryId()).getName()</td>
167 
 
 170 
 
168 
                                <td><a href="#" data-toggle="modal" data-target="#myModal"
 171 
                                <td><a href="#" data-toggle="modal" data-target="#myModal"
169 
                                       data-ticketid="$ticket.getId()" data-internal="true" data-role="$roleType"
 172 
                                       data-ticketid="$ticket.getId()" data-internal="true" data-role="$roleType"
Line 177... Line 180...
177 
                                #else
 180 
                                #else
178 
                                    <td>Partner</td>
 181 
                                    <td>Partner</td>
179 
                                #end
 182 
                                #end
180 
 
 183 
 
181 
                                <td>$ticket.getFormattedCreateTimestamp()</td>
 184 
                                <td>$ticket.getFormattedCreateTimestamp()</td>
- 
 
 185 
                                #if($isCrmUser)
- 
 
 186 
                                    #if($ticket.getCloseTimestamp())
- 
 
 187 
                                        <td><button class="btn btn-primary edit-ticket" data-ticketid1="$ticket.getId()" disabled>Edit</button></td>
- 
 
 188 
                                    #else
- 
 
 189 
                                        <td><button class="btn btn-primary edit-ticket" data-ticketid1="$ticket.getId()">Edit</button></td>
- 
 
 190 
                                    #end
- 
 
 191 
                                #end
182 
                                #if($roleType)
 192 
                                #if($roleType)
183 
                                    #if($ticket.getCloseTimestamp())
 193 
                                    #if($ticket.getCloseTimestamp())
184 
                                        <td>$ticket.getFormattedCloseTimestamp()</td>
 194 
                                        <td>$ticket.getFormattedCloseTimestamp()</td>
185 
                                    #else
 195 
                                    #else
186 
                                        #if($ticket.getLastActivity()=="RESOLVED")
 196 
                                        #if($ticket.getLastActivity()=="RESOLVED")
Line 188... Line 198...
188 
                                        #else
 198 
                                        #else
189 
                                            ## Only CRM users can mark tickets as resolved
 199 
                                            ## Only CRM users can mark tickets as resolved
190 
                                            #if($isCrmUser)
 200 
                                            #if($isCrmUser)
191 
                                                <td>
 201 
                                                <td>
192 
                                                    <button class="btn btn-primary ticket-last-activity"
 202 
                                                    <button class="btn btn-primary ticket-last-activity"
193 
                                                            data-ticketid="$ticket.getId()" data-activity="$resolved">
 203 
                                                            data-ticketid="$ticket.getId()" data-activity="$resolved"
- 
 
 204 
                                                            data-partnername="$fofoIdsAndCustomRetailer.get($ticket.getFofoId()).getBusinessName()">
194 
                                                        Resolved
 205 
                                                        Resolved
195 
                                                    </button>
 206 
                                                    </button>
196 
                                                </td>
 207 
                                                </td>
197 
                                            #else
 208 
                                            #else
198 
                                                <td><span class="label label-warning">Pending Resolution</span></td>
 209 
                                                <td><span class="label label-warning">Pending Resolution</span></td>
Line 235... Line 246...
235 
</section>
 246 
</section>
236 
<div id="ticket-details-container" style="background:white;background-color:white;">
 247 
<div id="ticket-details-container" style="background:white;background-color:white;">
237 
</div>
 248 
</div>
238 
#set($showFileUpload = true)
 249 
#set($showFileUpload = true)
239 
#parse("activity-modal.vm")
 250 
#parse("activity-modal.vm")
- 
 
 251 
 
- 
 
 252 
## Edit ticket modal for CRM users to assign tickets
- 
 
 253 
#if($isCrmUser)
- 
 
 254 
<div class="edit-container">
- 
 
 255 
    <div class="modal fade text-center" id="theModal">
- 
 
 256 
        <div class="modal-dialog">
- 
 
 257 
            <div class="modal-content">
- 
 
 258 
            </div>
- 
 
 259 
        </div>
- 
 
 260 
    </div>
- 
 
 261 
</div>
- 
 
 262 
#end