Subversion Repositories SmartDukaan

Rev

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

Rev 12884 Rev 12885
Line 44... Line 44...
44
                    userSms.attempts = userSms.attempts
44
                    userSms.attempts = userSms.attempts
45
                    userSms.createdTimestamp = userSms.createdTimestamp
45
                    userSms.createdTimestamp = userSms.createdTimestamp
46
                    userSms.smsText = userSms.smsText
46
                    userSms.smsText = userSms.smsText
47
                    userSms.status = userSms.status
47
                    userSms.status = userSms.status
48
                    userSms.type = userSms.type
48
                    userSms.type = userSms.type
49
                    userSms.responseId = response_str_vals[1]
49
                    userSms.responseId = response_str_vals[0]
50
                    userSms.responseText = response_str_vals[2]
50
                    userSms.responseText = response_str_vals[1]
51
                    userSms.deliveryStatus = SmsDeliveryStatus.SENT_TO_OPERATOR
51
                    userSms.deliveryStatus = SmsDeliveryStatus.SENT_TO_OPERATOR
52
                    listSmsSentToOperator.append(userSms)
52
                    listSmsSentToOperator.append(userSms)
53
            except Exception as e:
53
            except Exception as e:
54
                print sys.exc_info()[0]
54
                print sys.exc_info()[0]
55
                print e
55
                print e
Line 127... Line 127...
127
                    sms.createdTimestamp = userSms.createdTimestamp
127
                    sms.createdTimestamp = userSms.createdTimestamp
128
                    sms.smsText = userSms.smsText
128
                    sms.smsText = userSms.smsText
129
                    sms.status = SmsStatus.DELIVERED
129
                    sms.status = SmsStatus.DELIVERED
130
                    sms.type = userSms.type
130
                    sms.type = userSms.type
131
                    sms.responseId = del_response_vals[1]
131
                    sms.responseId = del_response_vals[1]
132
                    sms.responseText = "Status Code: " +del_response_vals[7][:-2]+" Status: "+ del_response_vals[5]
132
                    sms.responseText = "Status Code: " +del_response_vals[7]+" Status: "+ del_response_vals[5]
133
                    sms.deliveryStatus = SmsDeliveryStatus.GOT_STATUS_CODE
133
                    sms.deliveryStatus = SmsDeliveryStatus.GOT_STATUS_CODE
134
                    listSmsMarkedAsSent.append(sms)
134
                    listSmsMarkedAsSent.append(sms)
135
                    
135
                    
136
                elif del_response_vals[7] in ('4', '6', '100' ):
136
                elif del_response_vals[7] in ('4', '6', '100' ):
137
                    sms = UserSms()
137
                    sms = UserSms()
Line 142... Line 142...
142
                    sms.createdTimestamp = userSms.createdTimestamp
142
                    sms.createdTimestamp = userSms.createdTimestamp
143
                    sms.smsText = userSms.smsText
143
                    sms.smsText = userSms.smsText
144
                    sms.status = SmsStatus.UNDELIVERED
144
                    sms.status = SmsStatus.UNDELIVERED
145
                    sms.type = userSms.type
145
                    sms.type = userSms.type
146
                    sms.responseId = del_response_vals[1]
146
                    sms.responseId = del_response_vals[1]
147
                    sms.responseText = "Status Code: " +del_response_vals[7][:-2]+" Status: "+ del_response_vals[5]
147
                    sms.responseText = "Status Code: " +del_response_vals[7]+" Status: "+ del_response_vals[5]
148
                    sms.deliveryStatus = SmsDeliveryStatus.GOT_STATUS_CODE
148
                    sms.deliveryStatus = SmsDeliveryStatus.GOT_STATUS_CODE
149
                    listSmsMarkedAsSent.append(sms)
149
                    listSmsMarkedAsSent.append(sms)
150
                    
150
                    
151
                elif del_response_vals[7] in ('1', '7'):
151
                elif del_response_vals[7] in ('1', '7'):
152
                    sms = UserSms()
152
                    sms = UserSms()
Line 157... Line 157...
157
                    sms.createdTimestamp = userSms.createdTimestamp
157
                    sms.createdTimestamp = userSms.createdTimestamp
158
                    sms.smsText = userSms.smsText
158
                    sms.smsText = userSms.smsText
159
                    sms.status = SmsStatus.INVALID_NUMBER
159
                    sms.status = SmsStatus.INVALID_NUMBER
160
                    sms.type = userSms.type
160
                    sms.type = userSms.type
161
                    sms.responseId = del_response_vals[1]
161
                    sms.responseId = del_response_vals[1]
162
                    sms.responseText = "Status Code: " +del_response_vals[7][:-2]+" Status: "+ del_response_vals[5]
162
                    sms.responseText = "Status Code: " +del_response_vals[7]+" Status: "+ del_response_vals[5]
163
                    sms.deliveryStatus = SmsDeliveryStatus.GOT_STATUS_CODE
163
                    sms.deliveryStatus = SmsDeliveryStatus.GOT_STATUS_CODE
164
                    listSmsMarkedAsSent.append(sms)
164
                    listSmsMarkedAsSent.append(sms)
165
                
165
                
166
                elif del_response_vals[7] == '2':
166
                elif del_response_vals[7] == '2':
167
                    sms = UserSms()
167
                    sms = UserSms()
Line 172... Line 172...
172
                    sms.createdTimestamp = userSms.createdTimestamp
172
                    sms.createdTimestamp = userSms.createdTimestamp
173
                    sms.smsText = userSms.smsText
173
                    sms.smsText = userSms.smsText
174
                    sms.status = SmsStatus.USER_ABSENT
174
                    sms.status = SmsStatus.USER_ABSENT
175
                    sms.type = userSms.type
175
                    sms.type = userSms.type
176
                    sms.responseId = del_response_vals[1]
176
                    sms.responseId = del_response_vals[1]
177
                    sms.responseText = "Status Code: " +del_response_vals[7][:-2]+" Status: "+ del_response_vals[5]
177
                    sms.responseText = "Status Code: " +del_response_vals[7]+" Status: "+ del_response_vals[5]
178
                    sms.deliveryStatus = SmsDeliveryStatus.GOT_STATUS_CODE
178
                    sms.deliveryStatus = SmsDeliveryStatus.GOT_STATUS_CODE
179
                    listSmsMarkedAsRetry.append(sms)
179
                    listSmsMarkedAsRetry.append(sms)
180
                
180
                
181
                elif del_response_vals[7] == '3':
181
                elif del_response_vals[7] == '3':
182
                    sms = UserSms()
182
                    sms = UserSms()
Line 191... Line 191...
191
                    sms.responseId = del_response_vals[1]
191
                    sms.responseId = del_response_vals[1]
192
                    sms.responseText = "Status Code: " +del_response_vals[7][:-2]+" Status: "+ del_response_vals[5]
192
                    sms.responseText = "Status Code: " +del_response_vals[7][:-2]+" Status: "+ del_response_vals[5]
193
                    sms.deliveryStatus = SmsDeliveryStatus.GOT_STATUS_CODE
193
                    sms.deliveryStatus = SmsDeliveryStatus.GOT_STATUS_CODE
194
                    listSmsMarkedAsRetry.append(sms)
194
                    listSmsMarkedAsRetry.append(sms)
195
                    
195
                    
196
                elif del_response_vals[7][:-2] == '5':
196
                elif del_response_vals[7] == '5':
197
                    sms = UserSms()
197
                    sms = UserSms()
198
                    sms.id= userSms.id
198
                    sms.id= userSms.id
199
                    sms.user_id = userSms.user_id
199
                    sms.user_id = userSms.user_id
200
                    sms.mobileNumber = userSms.mobileNumber
200
                    sms.mobileNumber = userSms.mobileNumber
201
                    sms.attempts = userSms.attempts
201
                    sms.attempts = userSms.attempts
202
                    sms.createdTimestamp = userSms.createdTimestamp
202
                    sms.createdTimestamp = userSms.createdTimestamp
203
                    sms.smsText = userSms.smsText
203
                    sms.smsText = userSms.smsText
204
                    sms.status = SmsStatus.SERVICE_ERROR
204
                    sms.status = SmsStatus.SERVICE_ERROR
205
                    sms.type = userSms.type
205
                    sms.type = userSms.type
206
                    sms.responseId = del_response_vals[1]
206
                    sms.responseId = del_response_vals[1]
207
                    sms.responseText = "Status Code: " +del_response_vals[7][:-2]+" Status: "+ del_response_vals[5]
207
                    sms.responseText = "Status Code: " +del_response_vals[7]+" Status: "+ del_response_vals[5]
208
                    sms.deliveryStatus = SmsDeliveryStatus.GOT_STATUS_CODE
208
                    sms.deliveryStatus = SmsDeliveryStatus.GOT_STATUS_CODE
209
                    listSmsMarkedAsRetry.append(sms)
209
                    listSmsMarkedAsRetry.append(sms)
210
                
210
                
211
                elif del_response_vals[7][:-2] == '9':
211
                elif del_response_vals[7] == '9':
212
                    sms = UserSms()
212
                    sms = UserSms()
213
                    sms.id= userSms.id
213
                    sms.id= userSms.id
214
                    sms.user_id = userSms.user_id
214
                    sms.user_id = userSms.user_id
215
                    sms.mobileNumber = userSms.mobileNumber
215
                    sms.mobileNumber = userSms.mobileNumber
216
                    sms.attempts = userSms.attempts
216
                    sms.attempts = userSms.attempts
217
                    sms.createdTimestamp = userSms.createdTimestamp
217
                    sms.createdTimestamp = userSms.createdTimestamp
218
                    sms.smsText = userSms.smsText
218
                    sms.smsText = userSms.smsText
219
                    sms.status = SmsStatus.NDLC_FAIL
219
                    sms.status = SmsStatus.NDLC_FAIL
220
                    sms.type = userSms.type
220
                    sms.type = userSms.type
221
                    sms.responseId = del_response_vals[1]
221
                    sms.responseId = del_response_vals[1]
222
                    sms.responseText = "Status Code: " +del_response_vals[7][:-2]+" Status: "+ del_response_vals[5]
222
                    sms.responseText = "Status Code: " +del_response_vals[7]+" Status: "+ del_response_vals[5]
223
                    sms.deliveryStatus = SmsDeliveryStatus.GOT_STATUS_CODE
223
                    sms.deliveryStatus = SmsDeliveryStatus.GOT_STATUS_CODE
224
                    listSmsMarkedAsSent.append(sms)
224
                    listSmsMarkedAsSent.append(sms)
225
                    
225
                    
226
            elif "No message submitted with MessageID" in del_response_str:
226
            elif "No message submitted with MessageID" in del_response_str:
227
                sms = UserSms()
227
                sms = UserSms()
Line 232... Line 232...
232
                sms.createdTimestamp = userSms.createdTimestamp
232
                sms.createdTimestamp = userSms.createdTimestamp
233
                sms.smsText = userSms.smsText
233
                sms.smsText = userSms.smsText
234
                sms.status = SmsStatus.UNDELIVERED
234
                sms.status = SmsStatus.UNDELIVERED
235
                sms.type = userSms.type
235
                sms.type = userSms.type
236
                sms.responseId = del_response_vals[1]
236
                sms.responseId = del_response_vals[1]
237
                sms.responseText = "Status Code: " +del_response_vals[7][:-2]+" Status: "+ del_response_vals[5]
237
                sms.responseText = "Status Code: " +del_response_vals[7]+" Status: "+ del_response_vals[5]
238
                sms.deliveryStatus = SmsDeliveryStatus.GOT_STATUS_CODE
238
                sms.deliveryStatus = SmsDeliveryStatus.GOT_STATUS_CODE
239
                listSmsMarkedAsSent.append(sms)
239
                listSmsMarkedAsSent.append(sms)
240
            
240
            
241
            else:
241
            else:
242
                sms = UserSms()
242
                sms = UserSms()
Line 247... Line 247...
247
                sms.createdTimestamp = userSms.createdTimestamp
247
                sms.createdTimestamp = userSms.createdTimestamp
248
                sms.smsText = userSms.smsText
248
                sms.smsText = userSms.smsText
249
                sms.status = SmsStatus.UNDELIVERED
249
                sms.status = SmsStatus.UNDELIVERED
250
                sms.type = userSms.type
250
                sms.type = userSms.type
251
                sms.responseId = del_response_vals[1]
251
                sms.responseId = del_response_vals[1]
252
                sms.responseText = "Status Code: " +del_response_vals[7][:-2]+" Status: "+ del_response_vals[5]
252
                sms.responseText = "Status Code: " +del_response_vals[7]+" Status: "+ del_response_vals[5]
253
                sms.deliveryStatus = SmsDeliveryStatus.GOT_STATUS_CODE
253
                sms.deliveryStatus = SmsDeliveryStatus.GOT_STATUS_CODE
254
                listSmsMarkedAsSent.append(sms)
254
                listSmsMarkedAsSent.append(sms)
255
            
255
            
256
        if len(listSmsMarkedAsSubmittedToSmsc) > 0:
256
        if len(listSmsMarkedAsSubmittedToSmsc) > 0:
257
            if not helper_client.isAlive() :
257
            if not helper_client.isAlive() :